Michael Kamensky
|
2b2d30278f
|
Merge branch 'johnwilliams7-master-patch-72279' into 'master'
Update Secret Lair Drop Series.txt
See merge request core-developers/forge!6274
|
2022-02-21 05:06:41 +00:00 |
|
Anthony Calosa
|
1d1d753b51
|
add additional check for touchpad allowed bounds
mark card magnifier as experimantal since it gets stuck on certain os/setup
|
2022-02-21 11:15:23 +08:00 |
|
Anthony Calosa
|
a55e0e8f0d
|
make touchpad auto follow
|
2022-02-21 08:45:30 +08:00 |
|
Anthony Calosa
|
3f07e65ead
|
fix gamehud world map
- lock gamehud map controls inside the map stage (not world stage).
|
2022-02-21 07:39:56 +08:00 |
|
Anthony Calosa
|
e01953af0d
|
fix player keeps moving
|
2022-02-21 07:34:38 +08:00 |
|
Anthony Calosa
|
42f244d109
|
cache cursors
|
2022-02-21 07:30:22 +08:00 |
|
John Williams
|
d960248638
|
Update Secret Lair Drop Series.txt
|
2022-02-20 23:30:01 +00:00 |
|
Anthony Calosa
|
88365c2ff3
|
Merge remote-tracking branch 'core/master'
|
2022-02-21 06:59:09 +08:00 |
|
Anthony Calosa
|
0bfaad5a5a
|
unused import
|
2022-02-21 06:58:27 +08:00 |
|
Anthony Calosa
|
06a8daf02c
|
fix loading transition
|
2022-02-21 06:56:34 +08:00 |
|
Michael Kamensky
|
29f4b04ced
|
Merge branch 'sd' into 'master'
some StackDescription tweaking
See merge request core-developers/forge!6271
|
2022-02-20 20:21:35 +00:00 |
|
Tim Mocny
|
df2ada6f31
|
some StackDescription tweaking
|
2022-02-20 20:21:34 +00:00 |
|
Michael Kamensky
|
9686b14dbc
|
Merge branch 'revealhand' into 'master'
RevealHandEffect: fix not revealing to all players
See merge request core-developers/forge!6269
|
2022-02-20 20:21:22 +00:00 |
|
tool4EvEr
|
5e7cf52a7a
|
Also check supertype for Type$Legendary/Snow
|
2022-02-20 17:55:26 +01:00 |
|
Anthony Calosa
|
13bb30a50d
|
Merge remote-tracking branch 'origin/master'
|
2022-02-20 23:35:36 +08:00 |
|
Anthony Calosa
|
0d5230b282
|
update
|
2022-02-20 23:35:01 +08:00 |
|
Anthony Calosa
|
945067ade7
|
Update GameHUD.java
|
2022-02-20 15:30:50 +00:00 |
|
Michael Kamensky
|
1fda46dde4
|
Merge branch 'copyNonCreatureSetPT' into 'master'
getCloneStates: copying a non Creature can't set PT
See merge request core-developers/forge!6270
|
2022-02-20 15:27:05 +00:00 |
|
tool4EvEr
|
26e1c4bf88
|
Add todos
|
2022-02-20 16:12:00 +01:00 |
|
Hans Mackowiak
|
b808b76164
|
getCloneStates: copying a non Creature can't set PT
|
2022-02-20 15:38:30 +01:00 |
|
tool4EvEr
|
d0fc07ce7d
|
RevealHandEffect: fix not revealing to all players
|
2022-02-20 15:15:10 +01:00 |
|
Michael Kamensky
|
0b7e0a3b6e
|
Merge branch 'aifix' into 'master'
Fix AI not playing mandatory spell
See merge request core-developers/forge!6266
|
2022-02-20 12:47:20 +00:00 |
|
Anthony Calosa
|
342f97d80d
|
try to return to saveload scene if it fails to load old/corrupt saves
|
2022-02-20 19:03:51 +08:00 |
|
Anthony Calosa
|
f33669946e
|
Merge remote-tracking branch 'core/master'
|
2022-02-20 19:00:28 +08:00 |
|
Anthony Calosa
|
198603b6c1
|
Merge branch 'kevlahnota-master-patch-48398' into 'master'
fix for AI generated decks
Closes #2105
See merge request core-developers/forge!6267
|
2022-02-20 10:59:20 +00:00 |
|
Anthony Calosa
|
2788c7ae43
|
fix for AI generated decks
closes #2105
|
2022-02-20 10:58:29 +00:00 |
|
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 |
|