external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,606 Commits 31 Branches 187 Tags
57b4135f95d24f3d0875a8cd293d6baf8f8d653b
Commit Graph

12793 Commits

Author SHA1 Message Date
Hans Mackowiak
379f9699e8 Player Human: fix chooseSingleEntityForEffect 2020-05-29 09:12:08 +02:00
Hans Mackowiak
8e0c1f4fe3 Update shredded_sails.txt 2020-05-28 07:15:42 +00:00
Hans Mackowiak
d7293c7830 Update boot_nipper.txt 2020-05-27 19:29:36 +00:00
Sol
817b8bf15b Merge branch 'gameCacheGone' into 'master' 
PlayerControllerHuman: remove gameCache entirely, always ask Game for Card by ID

See merge request core-developers/forge!2837
 2020-05-27 02:18:30 +00:00
Sol
26694ffa5c Merge branch 'counterStringType' into 'master' 
CounterType: use String inside CounterType to handle KeywordCounter

See merge request core-developers/forge!2798
 2020-05-27 00:17:28 +00:00
Hans Mackowiak
6fde7149a4 - Basic support for CountersMoveAi (e.g. The Ozolith) so at least it doesn't crash, needs improvement. 2020-05-27 00:17:28 +00:00
Hans Mackowiak
815b2bc4aa PlayerControllerHuman: remove gameCache entirely, always ask Game for Card by ID 2020-05-26 23:21:44 +02:00
Tim Mocny
3a2c66df0b Cultivate and such UI update 2020-05-26 01:34:11 +00:00
Hans Mackowiak
955a16f1e0 Update ongoing_investigation.txt 2020-05-24 16:09:04 +00:00
Michael Kamensky
1ced1058c9 Merge branch 'gameCacheRework' into 'master' 
Human Play: try to remove usage of game.getCard

See merge request core-developers/forge!2804
 2020-05-24 11:02:52 +00:00
Hans Mackowiak
ea26f6c689 Human Play: try to remove usage of game.getCard 2020-05-24 11:02:51 +00:00
Tim Mocny
3165c57b0e Update liliana_dreadhorde_general.txt 2020-05-22 12:48:43 +00:00
Tim Mocny
215cd20b90 typo precognition_field.txt 2020-05-21 23:50:45 +00:00
Michael Kamensky
c0578fb246 Merge branch 'synchronize-activator-rd2' into 'master' 
Synchronize activator Round 2

See merge request core-developers/forge!2825
 2020-05-21 05:14:13 +00:00
Hans Mackowiak
0489a2ba83 Update tireless_tracker fix TrigInvestigate 2020-05-21 00:45:09 +00:00
Hans Mackowiak
d86aa31ab8 DigMultipleEffect: add extra ChosenZone to select N from the Chosen 2020-05-20 16:35:23 +00:00
friarsol
7a6409c11c Synchronize activator Round 2 2020-05-19 21:54:47 -04:00
swordshine
b7b2c88916 Merge branch 'jegantha' into 'master' 
Jegantha

See merge request core-developers/forge!2802
 2020-05-20 00:49:58 +00:00
Northmoc
0ed4670cfb Vintage.txt Lurrus fix 2020-05-19 09:03:25 -04:00
Sol
2af1895e26 Revert "Merge branch 'synchronize-activator-restriction' into 'master'" 
This reverts merge request !2821
 2020-05-19 11:45:47 +00:00
Michael Kamensky
b9d5326c30 Merge branch 'tokenCopyInvestigateRework' into 'master' 
Effects: Effects that create Tokens now use common base class

Closes #1379 and #1350

See merge request core-developers/forge!2816
 2020-05-19 03:46:43 +00:00
Hans Mackowiak
0af1085f79 Effects: Effects that create Tokens now use common base class 2020-05-19 03:46:43 +00:00
swordshine
c793065cae Merge branch 'synchronize-activator-restriction' into 'master' 
Synchronize activator restriction

See merge request core-developers/forge!2821
 2020-05-19 01:11:22 +00:00
Tim Mocny
df2932bec5 18 May 2020 bans 2020-05-19 01:08:37 +00:00
friarsol
b7fb854389 Fix Personal Incarnation activator missing owner 2020-05-18 20:42:03 -04:00
Sol
74b3ecd8ce Quest menu update 2020-05-18 03:29:30 +00:00
friarsol
45b1b3f38b Convert all Activator Restrictions to a combined key/value 2020-05-17 23:16:52 -04:00
Agetian
0516693eec - IKO and C20 initial AI hints. 2020-05-17 20:49:03 +03:00
Andreas Bendel
a0e2de0aec Update de-DE.properties 
more than 100 new lines tranlated
 2020-05-13 22:10:41 +00:00
Tim Mocny
b17c4a188c Add IKO to Brawl 2020-05-12 16:58:48 +00:00
swordshine
df9b462353 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!2803
 2020-05-12 06:28:10 +00:00
Sol
c4a1f22584 Merge branch 'newBranch' into 'master' 
Fix CardArtCache,LoadingCache Dispose Textures

See merge request core-developers/forge!2805
 2020-05-11 15:23:08 +00:00
swordshine
369a366b4f Merge branch 'master' into 'master' 
translate some text

See merge request core-developers/forge!2502
 2020-05-11 10:57:49 +00:00
Anthony Calosa
bcb626872f Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-05-11 11:13:38 +08:00
Anthony Calosa
deb0d7e2f1 Fix CardArtCache,LoadingCache Dispose Textures 2020-05-11 10:22:13 +08:00
Sol
75ab38836e Update combine_guildmage.txt 2020-05-11 01:48:06 +00:00
Andreas Bendel
68cece62c3 Update de-DE.properties 
Typo fixes
 2020-05-10 21:34:10 +00:00
rory
51e945df72 Merge branch 'master' into jegantha 2020-05-10 11:39:14 -07:00
rory
4eb21594b4 Jegantha, the Wellspring 2020-05-10 11:34:07 -07:00
CCTV-1
b66eb6266d translate Companion choose dialog,update translations,update chinese characters. 2020-05-10 16:40:24 +08:00
CCTV-1
e0b61e7453 Merge remote-tracking branch 'upstream/master' 2020-05-10 16:36:25 +08:00
Michael Kamensky
7018beab62 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!2789
 2020-05-10 05:28:35 +00:00
Tim Mocny
f6d6e45fed Fixes 2020-05-10 03:11:28 +00:00
Tim Mocny
83774d57df yannik_scavenging_sentinel.txt fixes 2020-05-09 16:57:45 +00:00
Tim Mocny
ab6d856880 Historic updates 2020-05-09 04:07:31 +00:00
Sol
538430009b Merge branch 'patch' into 'master' 
Update Companion cards

See merge request core-developers/forge!2793
 2020-05-09 01:06:50 +00:00
Tim Mocny
e4c0a3e6b3 Some recent set support 2020-05-09 00:56:07 +00:00
swordshine
447453977d Update scripts 2020-05-08 22:52:10 +08:00
swordshine
085c9f0042 Add Umori, the Collector 2020-05-08 21:58:28 +08:00
swordshine
ed4be69c93 Update Gyruda 2020-05-08 21:56:39 +08:00