external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,485 Commits 32 Branches 187 Tags
1a1057f56fbcbb0cac6c209dc699fc7ead39160c
Commit Graph

49485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
1f52270944 Merge branch 'nofity' into 'master' 
Spelling error

See merge request core-developers/forge!4147
 2021-03-08 05:15:27 +00:00
Adam Pantel
726163dc97 Spelling error 2021-03-07 23:42:13 -05:00
Michael Kamensky
5625c9ae28 Merge branch 'improve-edition-tracking' into 'master' 
Improve editions for tracking scripts

See merge request core-developers/forge!4144
 2021-03-08 04:16:40 +00:00
Michael Kamensky
0969645033 Merge branch 'card-fixes' into 'master' 
Card fixes

Closes #1763

See merge request core-developers/forge!4142
 2021-03-08 04:15:31 +00:00
Michael Kamensky
f349da99d8 Merge branch 'unset-cards' into 'master' 
[Un-cards] Minigame cards

See merge request core-developers/forge!4141
 2021-03-08 04:11:19 +00:00
Michael Kamensky
37b66bf074 Merge branch 'master' into 'master' 
[Un-cards] Kharis & The Beholder

See merge request core-developers/forge!4140
 2021-03-08 04:10:37 +00:00
Michael Kamensky
e82cb57465 Merge branch 'master' into 'master' 
fix missing simplified chinese translations

See merge request core-developers/forge!4145
 2021-03-08 04:09:58 +00:00
Adam Pantel
e45ed35a79 Fix cloned Zaxara 2021-03-07 22:56:54 -05:00
Adam Pantel
3c70759ab1 Card fixes 2021-03-07 22:56:54 -05:00
CCTV-1
c517d8712d fix missing simplified chinese translations 2021-03-08 11:47:28 +08:00
friarsol
21f2395089 Improve editions for tracking scripts 2021-03-07 22:29:17 -05:00
Anthony Calosa
ac3ff9e966 Merge branch 'master' into 'master' 
[Mobile] Fix selected deck on activate

See merge request core-developers/forge!4143
 2021-03-08 03:23:43 +00:00
Anthony Calosa
0d35f4806e [Mobile] Fix AI selected decks on activate 2021-03-08 11:21:54 +08:00
Anthony Calosa
6c0f63039e [Mobile] Revert deck chooser activation 2021-03-08 10:37:13 +08:00
Adam Pantel
aa866eb42f Add notifications to minigame cards 2021-03-07 19:07:05 -05:00
Adam Pantel
dcda2ade1d [Un-cards] Minigame cards 2021-03-07 17:26:36 -05:00
Lykrast
1928759ff9 Fix 11 result misread 2021-03-07 22:18:47 +00:00
Lykrast
d467e7b7f4 Kharis & The Beholder 2021-03-07 21:51:06 +00:00
Michael Kamensky
f97c3e06ad Merge branch 'master' into 'master' 
Fix a variety of Roll Dice card- and AI-related issues, improve AI for AF RollDice

See merge request core-developers/forge!4138
 2021-03-07 17:08:33 +00:00
Michael Kamensky
2eefa72494 - Fix a variety of issues with "Roll dice" silver-bordered cards 
- Add some additional AI to RollDiceAi
- Fix NeedsToPlay(Var) not being properly enforced for lands
- Minor other tweaks/fixes.
 2021-03-07 20:07:05 +03:00
Michael Kamensky
60f79e90a7 Merge branch 'master' into 'master' 
Added an AI hint for Jirina Kudro

See merge request core-developers/forge!4137
 2021-03-07 14:41:08 +00:00
Michael Kamensky
1da63ef83e - Added an AI hint for Jirina Kudro 2021-03-07 17:40:37 +03:00
Hythonia
a13d8ec83b Reap Intellect 2021-03-07 15:25:32 +01:00
Hythonia
ecff4f02a3 Miscellaneous fixes and adjustments 2021-03-07 15:22:09 +01:00
Bug Hunter
a8c01b4487 Merge branch 'fixhead' into 'master' 
Fix Elite Headhunter cost

See merge request core-developers/forge!4134
 2021-03-07 10:10:53 +00:00
tool4EvEr
f466fd690b Fix Elite Headhunter cost 2021-03-07 11:10:32 +01:00
Anthony Calosa
3a3c8230c0 Merge branch 'kevlahnota-master-patch-09449' into 'master' 
fix Time Spiral Remastered promo

See merge request core-developers/forge!4133
 2021-03-07 09:52:57 +00:00
Anthony Calosa
e8046e0483 fix Time Spiral Remastered promo 2021-03-07 09:52:37 +00:00
Michael Kamensky
882ab0c24b Merge branch 'unicode_deck_name' into 'master' 
support unicode deck name

See merge request core-developers/forge!2472
 2021-03-07 05:43:27 +00:00
Michael Kamensky
137b10f361 Merge branch 'remove-reference' into 'master' 
Remove References$ from everything

See merge request core-developers/forge!4031
 2021-03-07 05:41:04 +00:00
Adam Pantel
fd44c9745d Remove References$ from scripts 2021-03-07 00:39:14 -05:00
Adam Pantel
fdd5aa936f Remove code for References$ 2021-03-07 00:36:03 -05:00
Michael Kamensky
3335e17803 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.39.001

See merge request core-developers/forge!4131
 2021-03-07 05:15:14 +00:00
Michael Kamensky
7d47cf2a06 - Preparing Forge for Android publish 1.6.39.001 [incremental]. 2021-03-07 08:12:56 +03:00
Michael Kamensky
22b45fff9a Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-03-07 08:12:06 +03:00
Michael Kamensky
cbc0051f8a [maven-release-plugin] prepare for next development iteration 2021-03-07 08:00:39 +03:00
Michael Kamensky
0437e9354b [maven-release-plugin] prepare release forge-1.6.39 forge-1.6.39 2021-03-07 08:00:30 +03:00
Michael Kamensky
668e2834bc Merge branch 'master' into 'master' 
Prepare for release

See merge request core-developers/forge!4130
 2021-03-07 04:48:09 +00:00
Michael Kamensky
4ca125e0b6 - Fix unused imports. 2021-03-07 07:46:22 +03:00
Michael Kamensky
73a6d65118 - Update ANNOUNCEMENTS.txt 
- Rename a method in ChangeZoneAi
 2021-03-07 07:42:48 +03:00
Michael Kamensky
8cff34e488 Merge branch 'unset-cards' into 'master' 
[Un-cards] DeckLimit keyword + Cardboard Carapace

See merge request core-developers/forge!4127
 2021-03-07 04:34:27 +00:00
Michael Kamensky
1efda3f97b Merge branch 'pcel' into 'master' 
[Un-cards] PCEL

See merge request core-developers/forge!4129
 2021-03-07 04:33:06 +00:00
Michael Kamensky
04e25abdc6 Update shichifukujin_dragon.txt 2021-03-07 04:32:33 +00:00
Michael Kamensky
8d025dffbf Update robot_chicken.txt [AI hint] 2021-03-07 04:31:38 +00:00
Michael Kamensky
df17c3a31b Merge branch 'master' into 'master' 
[Desktop] update ImageView for Decks

See merge request core-developers/forge!4128
 2021-03-07 04:28:46 +00:00
Michael Kamensky
4148742624 Merge branch 'Williams-master-patch-25386' into 'master' 
Time Spiral Remastered

See merge request core-developers/forge!4126
 2021-03-07 04:17:07 +00:00
Adam Pantel
41cae28145 [Un-cards] PCEL 2021-03-06 23:16:58 -05:00
Anthony Calosa
e73f117037 [Desktop] update ImageView for Decks 2021-03-07 08:39:12 +08:00
John
92ca4f2dc6 Update Time Spiral Remastered.txt 2021-03-06 21:21:18 +00:00
Adam Pantel
acb21b2a28 [Un-cards] DeckLimit keyword + Cardboard Carapace 2021-03-06 16:16:07 -05:00