Anthony Calosa
|
27345a4a1b
|
Merge remote-tracking branch 'core/master'
|
2022-02-20 17:48:04 +08:00 |
|
Anthony Calosa
|
08f1aef7ac
|
add loading screen for new game
|
2022-02-20 17:40:19 +08:00 |
|
tool4EvEr
|
ca240ce8c3
|
Fix AI not playing mandatory spell
|
2022-02-20 10:35:33 +01:00 |
|
Michael Kamensky
|
c9c7b3aac7
|
Merge branch 'reconfigureWithoutStatic' into 'master'
Reconfigure: use unattach command instead of Static Ability on Card
See merge request core-developers/forge!6265
|
2022-02-20 09:25:03 +00:00 |
|
Anthony Calosa
|
a1650c84cc
|
Fix mouse touchup controls and added loading transition
|
2022-02-20 17:24:13 +08:00 |
|
Hans Mackowiak
|
403e758456
|
Reconfigure: use unattach command instead of Static Ability on Card
|
2022-02-20 10:12:30 +01:00 |
|
Anthony Calosa
|
66722d0302
|
Added Touchpad for Android Adventure
- It's easier to move around on android adventure version using touchpad
|
2022-02-20 16:48:32 +08:00 |
|
Anthony Calosa
|
68470d3f87
|
Merge remote-tracking branch 'core/master'
|
2022-02-20 13:28:17 +08:00 |
|
Anthony Calosa
|
39ef5b5f5c
|
update gamehud controls
|
2022-02-20 13:05:11 +08:00 |
|
Michael Kamensky
|
bfa425516d
|
Merge branch 'blockedby' into 'master'
blockedThisTurn: switch to LKI list
See merge request core-developers/forge!6256
|
2022-02-20 04:21:17 +00:00 |
|
Michael Kamensky
|
67af4655e7
|
Merge branch 'nec_kaima' into 'master'
NEC: Kaima, the Fractured Calm and support
See merge request core-developers/forge!6264
|
2022-02-20 04:20:13 +00:00 |
|
Tim Mocny
|
95d8faf41d
|
NEC: Kaima, the Fractured Calm and support
|
2022-02-20 04:20:12 +00:00 |
|
Michael Kamensky
|
3540661c4d
|
Merge branch 'compleated' into 'master'
NEO Compleated Reminder Text
See merge request core-developers/forge!6246
|
2022-02-20 04:19:22 +00:00 |
|
Tim Mocny
|
baae05dfe2
|
NEO Compleated Reminder Text
|
2022-02-20 04:19:16 +00:00 |
|
Michael Kamensky
|
35f523383a
|
Merge branch 'freshmaster' into 'master'
Tested card scripts for NEO (2022-02-16/18)
See merge request core-developers/forge!6243
|
2022-02-20 04:18:58 +00:00 |
|
Michael Kamensky
|
d235cb1b8c
|
Merge branch 'disco' into 'master'
NEO: Discover the Impossible and support (and StackDescription improvements)
See merge request core-developers/forge!6231
|
2022-02-20 04:18:48 +00:00 |
|
Tim Mocny
|
a2a5fda9af
|
NEO: Discover the Impossible and support (and StackDescription improvements)
|
2022-02-20 04:18:43 +00:00 |
|
Michael Kamensky
|
869b7ecceb
|
Merge branch 'typo' into 'master'
Tidy up a few cards
See merge request core-developers/forge!6247
|
2022-02-20 04:18:31 +00:00 |
|
Tim Mocny
|
b26c38cc83
|
Tidy up a few cards
|
2022-02-20 04:18:29 +00:00 |
|
Michael Kamensky
|
161da49650
|
Merge branch 'aihints' into 'master'
DeckHints: extend Type
See merge request core-developers/forge!6263
|
2022-02-20 04:17:58 +00:00 |
|
Anthony Calosa
|
448130e21a
|
Update World for android
- reuse the map image until the background generator is compatible with android..
|
2022-02-20 10:18:46 +08:00 |
|
Renato Santos
|
4f12e9f235
|
Update forge-gui/res/cardsfolder/upcoming/suit_up.txt
|
2022-02-20 01:38:18 +00:00 |
|
Anthony Calosa
|
8d7cb99f45
|
update hud_mobile
|
2022-02-20 08:37:34 +08:00 |
|
Anthony Calosa
|
d1d3b04fa0
|
Merge remote-tracking branch 'core/master'
|
2022-02-20 06:58:55 +08:00 |
|
Anthony Calosa
|
aeb90f55c6
|
fix gamehud touch
|
2022-02-20 06:53:02 +08:00 |
|
Renato Santos
|
dc1bfb507a
|
Update forge-gui/res/cardsfolder/upcoming/norika_yamazaki_the_poet.txt
|
2022-02-19 22:31:05 +00:00 |
|
Renato Santos
|
5bec28df7e
|
Update forge-gui/res/cardsfolder/upcoming/bearer_of_memory.txt
|
2022-02-19 21:39:04 +00:00 |
|
tool4EvEr
|
4c4e7c7723
|
Performance cleanup
|
2022-02-19 20:18:31 +01:00 |
|
tool4EvEr
|
797e9a3b66
|
DeckHints: extend Type
|
2022-02-19 20:18:13 +01:00 |
|
Michael Kamensky
|
8c126e3fa4
|
Merge branch 'TRT-master-patch-37300' into 'master'
Update forge-gui/res/cardsfolder/s/skyclave_apparition.txt
See merge request core-developers/forge!6262
|
2022-02-19 18:07:16 +00:00 |
|
Anthony Calosa
|
bb46101ced
|
Merge remote-tracking branch 'core/master'
|
2022-02-19 21:25:25 +08:00 |
|
Anthony Calosa
|
bcf63fc27e
|
add hud_mobile.json
|
2022-02-19 21:24:37 +08:00 |
|
Anthony Calosa
|
c6947464fa
|
update
|
2022-02-19 21:24:07 +08:00 |
|
Bug Hunter
|
d3a146ae9c
|
Update forge-gui/res/cardsfolder/s/skyclave_apparition.txt
|
2022-02-19 11:45:16 +00:00 |
|
Michael Kamensky
|
267e071956
|
Merge branch 'aegar' into 'master'
receivedDamageFromThisTurn: use LKI
Closes #1
See merge request core-developers/forge!6253
|
2022-02-19 11:38:13 +00:00 |
|
Bug Hunter
|
d886ae876d
|
receivedDamageFromThisTurn: use LKI
|
2022-02-19 11:38:10 +00:00 |
|
Michael Kamensky
|
e97b992b9a
|
Merge branch 'neo_17' into 'master'
NEO – 18 Feb
See merge request core-developers/forge!6258
|
2022-02-19 11:37:15 +00:00 |
|
Tim Mocny
|
164da1f77f
|
NEO – 18 Feb
|
2022-02-19 11:37:13 +00:00 |
|
Bug Hunter
|
af49902fbd
|
Merge branch 'testfix' into 'master'
Fix test
See merge request core-developers/forge!6261
|
2022-02-19 10:51:58 +00:00 |
|
tool4EvEr
|
549045994b
|
Fix test
|
2022-02-19 11:51:19 +01:00 |
|
Anthony Calosa
|
70f8eb59a7
|
replace Vector2 with GridPoint2 (originally Point - awt)
|
2022-02-19 15:43:58 +08:00 |
|
Anthony Calosa
|
926c5730e2
|
update magnified stack
|
2022-02-19 13:35:03 +08:00 |
|
Anthony Calosa
|
3f32720599
|
Merge remote-tracking branch 'core/master'
|
2022-02-19 13:34:00 +08:00 |
|
Anthony Calosa
|
4796520e53
|
fix Startup path and missing textures (Linux and maybe others)
|
2022-02-19 13:18:28 +08:00 |
|
Michael Kamensky
|
f4ac0eff75
|
Merge branch 'strike' into 'master'
capital S Strike in scripts, lowercase s strike in descriptions/detail
See merge request core-developers/forge!6259
|
2022-02-19 04:24:53 +00:00 |
|
Tim Mocny
|
429e8e715c
|
capital S Strike in scripts, lowercase s strike in descriptions/detail
|
2022-02-19 04:24:52 +00:00 |
|
Michael Kamensky
|
d57d39754f
|
Merge branch 'neo_march' into 'master'
NEO: March cycle
Closes #2077
See merge request core-developers/forge!6133
|
2022-02-19 04:24:21 +00:00 |
|
Tim Mocny
|
dc949b1a89
|
NEO: March cycle
|
2022-02-19 04:24:16 +00:00 |
|
Michael Kamensky
|
6eff8a0a7c
|
Merge branch 'reveal_fixes' into 'master'
DiscardEffect: don't reveal to all if effect is just look
See merge request core-developers/forge!6257
|
2022-02-19 04:23:40 +00:00 |
|
Michael Kamensky
|
934107a531
|
Merge branch 'fix' into 'master'
fix some bad Graveyard targeting
See merge request core-developers/forge!6260
|
2022-02-19 04:22:33 +00:00 |
|