Michael Kamensky
|
22bf12f07b
|
Merge branch 'miscfix' into 'master'
ControlGain Lose fix
See merge request core-developers/forge!6379
|
2022-03-11 10:28:32 +00:00 |
|
Bug Hunter
|
01f397db9f
|
Merge branch 'TRT-master-patch-26275' into 'master'
Update forge-gui/res/cardsfolder/p/puffer_extract.txt
See merge request core-developers/forge!6386
|
2022-03-11 08:09:17 +00:00 |
|
Bug Hunter
|
66198604ab
|
Update forge-gui/res/cardsfolder/p/puffer_extract.txt
|
2022-03-11 08:08:48 +00:00 |
|
Anthony Calosa
|
931a1e91cd
|
Merge branch 'kevlahnota-master-patch-61149' into 'master'
unused imports
See merge request core-developers/forge!6385
|
2022-03-11 04:55:17 +00:00 |
|
Anthony Calosa
|
5315c90d24
|
unused imports
|
2022-03-11 04:55:00 +00:00 |
|
Anthony Calosa
|
a640b2bb3a
|
Merge branch 'master' into 'master'
[Adventure] Add Gold Indicator
See merge request core-developers/forge!6384
|
2022-03-11 04:50:42 +00:00 |
|
Anthony Calosa
|
4c518fad73
|
[Adventure] Add Gold Indicator
|
2022-03-11 12:49:12 +08:00 |
|
Anthony Calosa
|
74a2d247bc
|
Merge branch 'master' into 'master'
switch check
See merge request core-developers/forge!6383
|
2022-03-10 20:07:50 +00:00 |
|
Anthony Calosa
|
2272d7f648
|
switch check
|
2022-03-11 04:06:30 +08:00 |
|
Anthony Calosa
|
1d5b80b376
|
Merge branch 'master' into 'master'
fix netplay
See merge request core-developers/forge!6382
|
2022-03-10 18:47:40 +00:00 |
|
Anthony Calosa
|
020a21e189
|
fix netplay
|
2022-03-11 02:46:15 +08:00 |
|
Anthony Calosa
|
100ccc0bdb
|
Merge branch 'master' into 'master'
update use titlebg
See merge request core-developers/forge!6381
|
2022-03-10 17:15:51 +00:00 |
|
Anthony Calosa
|
6b4b3bce46
|
Merge branch 'fix_oni_cult_anvil' into 'master'
Fix: Oni-Cult Anvil's triggered ability
See merge request core-developers/forge!6378
|
2022-03-10 17:13:58 +00:00 |
|
Anthony Calosa
|
5a11de43d6
|
update use titlebg
|
2022-03-11 01:12:57 +08:00 |
|
Anthony Calosa
|
96c51e6a28
|
Merge branch 'master' into 'master'
[Mobile] update SplashScreen
See merge request core-developers/forge!6380
|
2022-03-10 17:05:56 +00:00 |
|
tool4EvEr
|
bd888f9382
|
ETB replacement fix
|
2022-03-10 17:58:01 +01:00 |
|
tool4EvEr
|
054fca64fb
|
Update effects
|
2022-03-10 17:47:44 +01:00 |
|
Anthony Calosa
|
eec2da8f00
|
[Mobile] update SplashScreen
|
2022-03-11 00:26:48 +08:00 |
|
tool4EvEr
|
7d6aa6f006
|
Clean up
|
2022-03-10 17:16:57 +01:00 |
|
tool4EvEr
|
f02703a8cb
|
Fix for Master Thief
|
2022-03-10 17:10:54 +01:00 |
|
tool4EvEr
|
c93624fa29
|
Guardian Beast
|
2022-03-10 17:10:33 +01:00 |
|
pfirpfel
|
eb4c5ee3f0
|
Fix: Oni-Cult Anvil's triggered ability triggers only during its controller's turn
|
2022-03-10 15:19:23 +01:00 |
|
Bug Hunter
|
27d25eb1c9
|
Merge branch 'cleanup' into 'master'
Some clean up fix
See merge request core-developers/forge!6377
|
2022-03-10 07:27:26 +00:00 |
|
tool4EvEr
|
94d0802528
|
Some clean up fix
|
2022-03-10 08:26:21 +01:00 |
|
Michael Kamensky
|
1217c61736
|
Merge branch 'dennick' into 'master'
Update cards
See merge request core-developers/forge!6376
|
2022-03-09 16:53:01 +00:00 |
|
Hans Mackowiak
|
cd3546c2cb
|
Update SplashScreen
|
2022-03-09 13:17:07 +00:00 |
|
TRT
|
7b86c7cfac
|
Update cards
|
2022-03-09 09:56:08 +01:00 |
|
Michael Kamensky
|
dc038e8bc6
|
Merge branch 'textchange' into 'master'
applyTextChangeEffects: fix replacing Self
See merge request core-developers/forge!6372
|
2022-03-09 03:19:55 +00:00 |
|
Michael Kamensky
|
dcf240eb61
|
Merge branch 'randomcleanup' into 'master'
Random cleanup
See merge request core-developers/forge!6373
|
2022-03-09 03:19:33 +00:00 |
|
Bug Hunter
|
5218191821
|
Random cleanup
|
2022-03-09 03:19:31 +00:00 |
|
Michael Kamensky
|
3261406b9c
|
Merge branch 'sideboard' into 'master'
Fix Sideboard filter
See merge request core-developers/forge!6374
|
2022-03-09 03:19:05 +00:00 |
|
Michael Kamensky
|
c2cdd4135e
|
Merge branch 'Shorikai' into 'master'
Fix for Shorikai
See merge request core-developers/forge!6375
|
2022-03-09 03:18:50 +00:00 |
|
tool4EvEr
|
132ff7ed21
|
Clean up
|
2022-03-08 23:36:37 +01:00 |
|
tool4EvEr
|
8e34d7dd74
|
Fix for Shorikai
|
2022-03-08 21:26:58 +01:00 |
|
tool4EvEr
|
9aadb72005
|
Fix Sideboard filter
|
2022-03-08 20:08:49 +01:00 |
|
TRT
|
58197e7daa
|
applyTextChangeEffects: fix replacing Self
|
2022-03-08 13:40:45 +01:00 |
|
Michael Kamensky
|
1c68fcb7c4
|
Merge branch 'explo' into 'master'
Fix Explosive Singularity not being castable when no untapped creature
See merge request core-developers/forge!6370
|
2022-03-08 11:16:29 +00:00 |
|
Anthony Calosa
|
39c456c204
|
Merge branch 'master' into 'master'
Revert path for Android
See merge request core-developers/forge!6371
|
2022-03-08 10:04:37 +00:00 |
|
Anthony Calosa
|
9b543986f1
|
Revert path for Android
- on newer API it can't access the texture except text...
|
2022-03-08 18:03:09 +08:00 |
|
TRT
|
fda2b9ef7d
|
Fix Explosive Singularity not being castable when no untapped creature
|
2022-03-08 09:37:07 +01:00 |
|
Hans Mackowiak
|
38787b1539
|
Merge branch 'master' into '1111-dismantle-rework'
# Conflicts:
# forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
|
2022-03-08 08:18:34 +00:00 |
|
Hans Mackowiak
|
d283b03e69
|
CounterPutEffect: make counterType support , seperator
|
2022-03-08 07:32:44 +01:00 |
|
Anthony Calosa
|
4634bdf50a
|
Merge branch 'master' into 'master'
cleanup
See merge request core-developers/forge!6369
|
2022-03-08 06:03:44 +00:00 |
|
Anthony Calosa
|
f6f8ecf011
|
cleanup
|
2022-03-08 14:00:19 +08:00 |
|
Michael Kamensky
|
245931d83b
|
Merge branch 'master' into 'master'
[Mobile] Update netcode, fix swapped players
See merge request core-developers/forge!6368
|
2022-03-08 04:45:33 +00:00 |
|
Michael Kamensky
|
5ae515760b
|
Merge branch 'twosat-master-patch-73013' into 'master'
Update de-DE.properties
See merge request core-developers/forge!6367
|
2022-03-08 04:45:00 +00:00 |
|
Michael Kamensky
|
01a9f0e684
|
Merge branch 'rampCheck' into 'master'
ManaEffectAi: check for untap effects to increase ramping
See merge request core-developers/forge!6365
|
2022-03-08 04:44:35 +00:00 |
|
Bug Hunter
|
4b2ecc34d3
|
ManaEffectAi: check for untap effects to increase ramping
|
2022-03-08 04:44:33 +00:00 |
|
Michael Kamensky
|
7ea9870e5b
|
Merge branch 'net_decks' into 'master'
New Current Metagame Categories
See merge request core-developers/forge!6364
|
2022-03-08 04:44:08 +00:00 |
|
Anthony Calosa
|
e176a4791d
|
remove extra field
|
2022-03-08 10:45:48 +08:00 |
|