external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,703 Commits 31 Branches 187 Tags
c0b76016f1880ee4daeb40c20c5e92d8bd44703f
Commit Graph

40703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
2c2104dfe6 Merge branch 'deckimport' into 'master' 
DeckRecognizer: Recognize split card names with single slash

See merge request core-developers/forge!1304
 2019-01-25 04:53:36 +00:00
Evan Murawski
4661a19982 DeckRecognizer: Recognize split card names with single slash 2019-01-25 04:53:36 +00:00
Hans Mackowiak
9778f9e3a0 Teysa and Gitrog fixes 2019-01-24 21:26:17 +01:00
Hanmac
b6019c6308 GameSimulatorTest: second test for Teysa 2019-01-24 07:45:36 +01:00
Hans Mackowiak
7006c548a5 GameSimulatorTest: Teysa Karlov and Xathrid Necromancer 2019-01-24 07:45:36 +01:00
Hans Mackowiak
2eae26cefb TriggerHandler: Only real die can look back 
Rework Panharmonicon
 2019-01-24 07:43:14 +01:00
Michael Kamensky
ccd1117762 Merge branch 'riotDouble' into 'master' 
Riot: Make Riot Enchantment look into the future

See merge request core-developers/forge!1303
 2019-01-24 06:42:11 +00:00
Hanmac
1917871b98 GameSimulatorTest: assert check for DoubleRiot 2019-01-24 07:28:14 +01:00
Hanmac
96e6111400 Riot: Make Riot Enchantment look into the future 2019-01-24 07:27:22 +01:00
Michael Kamensky
f8d360f25f Merge branch 'master' into 'master' 
Restore AI SVars for a couple cards.

See merge request core-developers/forge!1310
 2019-01-24 05:38:38 +00:00
Agetian
5901c6b66b - Restore AI SVars. 2019-01-24 08:38:11 +03:00
Michael Kamensky
b9782f9790 Merge branch 'master' into 'master' 
Integrate Schnautzr's token updates and fix merge conflicts.

See merge request core-developers/forge!1309
 2019-01-24 05:37:17 +00:00
Agetian
74c69f0d37 - Integrate Schnautzr's token updates and fix merge conflicts. 2019-01-24 08:36:35 +03:00
Michael Kamensky
5a81cdc40d Merge branch 'master' into 'master' 
Added more AI SVars for RNA, fixed Dross Scorpion trigger description. Labeled some buggy RNA scripts.

See merge request core-developers/forge!1308
 2019-01-24 05:28:34 +00:00
Agetian
7ebe97f802 - Added TODO labels. 2019-01-24 08:27:54 +03:00
Agetian
956ab8e96e - Added more AI SVars for RNA. 
- Added some comments for the needed script fixes.
- Fixed Dross Scorpion trigger description.
 2019-01-24 08:08:52 +03:00
Rob Schnautz
b821ec7af5 Add token scripts and download URLs. 2019-01-24 04:57:54 +00:00
Chris H
6a92f68602 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-01-23 22:23:47 -05:00
Sol
d0c5bcf053 Merge branch 'patch-2' into 'master' 
Update Ravnica Allegiance.txt

See merge request core-developers/forge!1306
 2019-01-24 02:55:00 +00:00
Sol
4069b603c2 Update Ravnica Allegiance.txt 2019-01-24 02:54:49 +00:00
Sol
0813f9bc66 Merge branch 'more-rna' into 'master' 
More rna

See merge request core-developers/forge!1305
 2019-01-24 02:52:52 +00:00
Sol
0687fc2a31 More rna 2019-01-24 02:52:52 +00:00
Chris H
3f52a8c4f5 Merge remote-tracking branch 'origin/master' 2019-01-23 21:10:33 -05:00
Sol
82e276c661 Merge branch 'more-rna' into 'master' 
RNA Templates

See merge request core-developers/forge!1291
 2019-01-24 01:48:54 +00:00
Michael Kamensky
195fe58dcb Merge branch 'master' into 'master' 
fix bug in min number of cards to select in digs

See merge request core-developers/forge!1302
 2019-01-23 09:38:00 +00:00
Peter F. Patel-Schneider
afd1070850 fix bug in min number of cards to select in digs 2019-01-23 03:42:45 -05:00
Chris H
8580d585df Fix Mirror March 2019-01-22 21:42:46 -05:00
maustin
090d6ad9fb Merge branch 'more-rna' of https://git.cardforge.org/friarsol/forge into rnabuild 2019-01-22 06:47:12 +00:00
Michael Kamensky
8ed1ad4afc Merge branch 'master' into 'master' 
remember old location and size of pop-up card list window

See merge request core-developers/forge!1300
 2019-01-22 04:18:38 +00:00
Chris H
bc854f4d42 RNA Blockdata 2019-01-21 22:23:45 -05:00
Chris H
d8585fd925 Kaya 2019-01-21 22:23:15 -05:00
Chris H
5ae5fef43e Fix more splits 2019-01-21 21:54:51 -05:00
Chris H
48a0ac6039 missing split for Depose//Deploy 2019-01-21 21:53:26 -05:00
Chris H
57a3462623 Cleanup weird Light up the Stage 2019-01-21 21:18:22 -05:00
Chris H
929b5fbcfe Fix some more broken cards 2019-01-21 21:08:36 -05:00
Chris H
56fda56807 Fixes 2019-01-21 21:08:35 -05:00
Chris H
872defd992 Fix Bedazzle 2019-01-21 21:08:30 -05:00
Chris H
e78202e432 Incubation // Incongruity 2019-01-21 21:08:28 -05:00
Chris H
657d85530a Repudiate//replicate 2019-01-21 21:08:27 -05:00
Chris H
a6e0f9b472 Warrant/Warden 2019-01-21 21:08:25 -05:00
Chris H
86abb0d1d5 Fixing more broken RNA cards 2019-01-21 21:08:24 -05:00
Chris H
28a5bd109e Move broken to upcoming 2019-01-21 21:08:22 -05:00
Chris H
b357096da2 Depost deploy 2019-01-21 21:08:21 -05:00
Chris H
d1d1df27bc Consecrate Consume 2019-01-21 21:08:20 -05:00
Chris H
d7ebafe883 Collision Colossus 2019-01-21 21:08:19 -05:00
Chris H
f09130eb86 Carnival Carnage 2019-01-21 21:08:18 -05:00
Chris H
50e6a06478 Fix split cards 2019-01-21 21:08:17 -05:00
Chris H
65fc4a4371 RNA Templates 2019-01-21 21:08:16 -05:00
churrufli
84ef513489 New 5 Gauntlet Contest - Starting Magic Core Set 2019 Welcome Decks 2019-01-22 00:35:42 +01:00
Peter F. Patel-Schneider
67ca319674 remove debugging print in manipulateCardList 2019-01-21 18:10:30 -05:00