external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,085 Commits 32 Branches 187 Tags
27478966bc0b0832ca6fae77cb33fc6c35e313cc
Commit Graph

50085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
b0e1630fc5 Merge branch 'tokens' into 'master' 
update some token lists

See merge request core-developers/forge!4566
 2021-04-21 17:52:24 +00:00
tool4EvEr
50ffd7b4a9 Support scrolling when Popup has too many entries 2021-04-21 19:37:05 +02:00
Northmoc
e4e75a5f73 update some token lists 2021-04-21 13:18:27 -04:00
Northmoc
7da4381d38 update some token lists 2021-04-21 13:18:27 -04:00
Hans Mackowiak
ef8076b626 GameEntityCounterTable: fix NPE and filterToRemove 2021-04-21 17:35:41 +02:00
Bug Hunter
ab5f5c1ce9 Merge branch 'yarok' into 'master' 
Yarok: Fix staticability check

See merge request core-developers/forge!4565
 2021-04-21 15:26:05 +00:00
tool4EvEr
6d442b12a0 Yarok: Fix staticability check 2021-04-21 17:25:42 +02:00
Sol
0019f83e33 Merge branch 'breena' into 'master' 
Fix Breena Trigger

See merge request core-developers/forge!4560
 2021-04-21 14:13:20 +00:00
Hans Mackowiak
f3011b1790 Merge branch 'fixMana' into 'master' 
Fix mana conversion checking wrong card from hand

See merge request core-developers/forge!4561
 2021-04-21 04:36:17 +00:00
Hans Mackowiak
ea79f84b71 Merge branch 'fixyarok' into 'master' 
Fix Yarok

See merge request core-developers/forge!4562
 2021-04-21 04:35:53 +00:00
tool4EvEr
040d6929dc Fix Yarok 2021-04-20 23:15:32 +02:00
tool4EvEr
2fe9c38fff Fix mana conversion checking wrong card from hand 2021-04-20 20:21:39 +02:00
tool4EvEr
256b54b6b5 Fix Breena Trigger 2021-04-20 19:01:57 +02:00
Michael Kamensky
062ad5d92f Merge branch 'esix_fractal_bloom' into 'master' 
Add Esix, Fractal Bloom and necessary supports

See merge request core-developers/forge!4557
 2021-04-20 16:44:22 +00:00
Michael Kamensky
5806ef248f Merge branch 'ee' into 'master' 
Last STX card! elemental_expressionist.txt

See merge request core-developers/forge!4554
 2021-04-20 16:44:04 +00:00
Michael Kamensky
257fcf1b3d Merge branch 'elspeth' into 'master' 
AI: Fix Elspeth Conquers Death

See merge request core-developers/forge!4552
 2021-04-20 16:43:47 +00:00
tool4EvEr
284db016a0 Rework ceaseToExist 2021-04-20 18:28:01 +02:00
tool4EvEr
5e2898f0ae Improve Counter check 2021-04-20 17:29:20 +02:00
Northmoc
207408ae20 elemental_expressionist.txt 2021-04-20 08:59:54 -04:00
Bug Hunter
2843ca9b49 Merge branch 'TRT-master-patch-20042' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/detention_vortex.txt

See merge request core-developers/forge!4558
 2021-04-20 12:05:08 +00:00
Bug Hunter
efc09d8a3f Update forge-gui/res/cardsfolder/upcoming/detention_vortex.txt 2021-04-20 12:03:43 +00:00
Lyu Zong-Hong
e6714bf45e Add Esix, Fractal Bloom and necessary supports 2021-04-20 20:47:22 +09:00
Michael Kamensky
8049e2c322 Merge branch 'update_japanese_translation' into 'master' 
Update Japanese Card Translation

See merge request core-developers/forge!4556
 2021-04-20 11:45:46 +00:00
Lyu Zong-Hong
fdb0db2d41 Update Japanese Card Translation 2021-04-20 19:54:12 +09:00
Michael Kamensky
7465031d44 Merge branch 'fixTriggerCardState' into 'master' 
TriggerHandler: fix setting CardState for Trigger

See merge request core-developers/forge!4555
 2021-04-20 07:17:09 +00:00
Hans Mackowiak
15eb3a421d TriggerHandler: fix setting CardState for Trigger 2021-04-20 08:45:48 +02:00
Michael Kamensky
ec52a07fe9 Merge branch 'clone' into 'master' 
Temporary clones: restore Remembered/Imprinted

Closes #1792

See merge request core-developers/forge!4490
 2021-04-20 04:00:42 +00:00
Bug Hunter
b7a475cc0a Temporary clones: restore Remembered/Imprinted 2021-04-20 04:00:41 +00:00
Michael Kamensky
aed022d099 Merge branch 'master' into 'master' 
[Mobile] Update LibGDX to 1.10.0, Update Mobile Dev to LWJGL3

See merge request core-developers/forge!4548
 2021-04-20 03:59:15 +00:00
Michael Kamensky
86b37e7df0 Merge branch 'chaos' into 'master' 
Chaos Warp: Fix wrong target

See merge request core-developers/forge!4551
 2021-04-20 03:58:15 +00:00
Michael Kamensky
09e9b46efd Merge branch 'cleanup' into 'master' 
Fixes - 19 Apr

See merge request core-developers/forge!4553
 2021-04-20 03:58:06 +00:00
Hans Mackowiak
90b685c15d Merge branch 'causeRemoval' into 'master' 
remove AbilityUtils.getCause

See merge request core-developers/forge!4550
 2021-04-20 00:01:50 +00:00
Northmoc
daedffc0da specter_of_the_fens.txt add Flying! 2021-04-19 15:53:25 -04:00
Northmoc
c489f88f77 brainstorm.txt cleanup Descs 2021-04-19 15:50:55 -04:00
tool4EvEr
33779bb6cf AI: Fix Elspeth Conquers Death 2021-04-19 19:56:13 +02:00
tool4EvEr
660806fb7c Fix wrong target 2021-04-19 19:31:46 +02:00
Hans Mackowiak
40a52ed00b remove AbilityUtils.getCause 2021-04-19 18:12:16 +02:00
Michael Kamensky
c216498198 Merge branch 'master' into 'master' 
Update cards translations

See merge request core-developers/forge!4540
 2021-04-19 13:52:31 +00:00
Michael Kamensky
547c887c0b Merge branch 'master' into 'master' 
Add a NPE guard to ChooseGenericEffectAi

See merge request core-developers/forge!4549
 2021-04-19 13:51:41 +00:00
Michael Kamensky
dfe23da44d - Add a NPE guard to ChooseGenericEffectAi 2021-04-19 16:51:00 +03:00
Anthony Calosa
a5e8b88e32 [Mobile] Update LibGDX to 1.10.0, Update Mobile Dev to LWJGL3 
refer here for LibGDX Migration/Changes: https://libgdx.com/news/2021/04/the-ultimate-migration-guide
 2021-04-19 21:41:34 +08:00
Hans Mackowiak
539c94f36f fix descendants path 2021-04-19 15:02:40 +02:00
Churrufli
fce5ae0498 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-04-19 13:09:01 +02:00
Hans Mackowiak
8fbf96098e CountersPutAi: fix NPE in Polukranos 2021-04-19 13:08:19 +02:00
Hans Mackowiak
c8b43fa8ab Kwain: fix Ability Description 2021-04-19 13:08:19 +02:00
Michael Kamensky
9f305347a8 Merge branch 'PolukranosLogicFix' into 'master' 
CountersPutAi: fix NPE in Polukranos

See merge request core-developers/forge!4547
 2021-04-19 10:37:47 +00:00
Hans Mackowiak
94d826d2a4 CountersPutAi: fix NPE in Polukranos 2021-04-19 10:37:23 +00:00
Hans Mackowiak
118cf70e40 Kwain: fix Ability Description 2021-04-19 10:21:43 +02:00
Bug Hunter
895d8d594b Bishop of Binding: Update script 2021-04-19 09:07:44 +02:00
tool4EvEr
60ce467859 Fix wrong activator 2021-04-19 09:07:44 +02:00