Anthony Calosa
|
a799f3919c
|
Merge remote-tracking branch 'core/master'
|
2022-02-22 14:49:30 +08:00 |
|
Anthony Calosa
|
a0498d9727
|
fix format
|
2022-02-22 12:36:28 +08:00 |
|
Anthony Calosa
|
b6a6b4517c
|
update UIActor
- to set Label styles for font inside Table
|
2022-02-22 12:30:18 +08:00 |
|
Tim Mocny
|
d638b50910
|
NEC – 21 Feb
|
2022-02-22 04:05:21 +00:00 |
|
Hans Mackowiak
|
c863c2c2f1
|
Merge branch 'nec_im' into 'master'
NEC: Imposter Mech and support
See merge request core-developers/forge!6268
|
2022-02-21 14:37:58 +00:00 |
|
Tim Mocny
|
7023059337
|
NEC: Imposter Mech and support
|
2022-02-21 14:37:56 +00:00 |
|
Michael Kamensky
|
0b9b008d6b
|
Merge branch 'nec_unq' into 'master'
NEC: Unquenchable Fury and support
See merge request core-developers/forge!6273
|
2022-02-21 13:53:16 +00:00 |
|
Tim Mocny
|
7d92359df2
|
NEC: Unquenchable Fury and support
|
2022-02-21 13:53:14 +00:00 |
|
Tim Mocny
|
784ef07f70
|
NEC – 20 Feb
|
2022-02-21 13:48:34 +00:00 |
|
Bug Hunter
|
2934669c45
|
Update forge-gui/res/cardsfolder/d/doomfall.txt
|
2022-02-21 09:43:10 +00:00 |
|
Michael Kamensky
|
fde9672eb2
|
Merge branch 'mindlinkFix' into 'master'
TriggerBecomesCrewed: new Trigger for NEO Mechs
Closes #2086
See merge request core-developers/forge!6277
|
2022-02-21 07:27:38 +00:00 |
|
Hans Mackowiak
|
0585398372
|
TriggerBecomesCrewed: new Trigger for NEO Mechs
|
2022-02-21 08:22:31 +01:00 |
|
Anthony Calosa
|
46e7bc5fd0
|
Merge remote-tracking branch 'core/master'
|
2022-02-21 14:37:47 +08:00 |
|
Michael Kamensky
|
c99f09261d
|
Merge branch 'atsu' into 'master'
tidy up various cards
See merge request core-developers/forge!6276
|
2022-02-21 05:13:59 +00:00 |
|
Tim Mocny
|
6025d5df0d
|
tidy up various cards
|
2022-02-21 05:13:58 +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 |
|
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 |
|
tool4EvEr
|
d0fc07ce7d
|
RevealHandEffect: fix not revealing to all players
|
2022-02-20 15:15:10 +01:00 |
|
Anthony Calosa
|
f33669946e
|
Merge remote-tracking branch 'core/master'
|
2022-02-20 19:00:28 +08:00 |
|
Anthony Calosa
|
2788c7ae43
|
fix for AI generated decks
closes #2105
|
2022-02-20 10:58:29 +00: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 |
|
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 |
|
Tim Mocny
|
b26c38cc83
|
Tidy up a few cards
|
2022-02-20 04:18:29 +00: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 |
|
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 |
|
Bug Hunter
|
d3a146ae9c
|
Update forge-gui/res/cardsfolder/s/skyclave_apparition.txt
|
2022-02-19 11:45:16 +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 |
|
tool4EvEr
|
549045994b
|
Fix test
|
2022-02-19 11:51:19 +01:00 |
|
Anthony Calosa
|
3f32720599
|
Merge remote-tracking branch 'core/master'
|
2022-02-19 13:34:00 +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 |
|