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

56126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renato Santos
914237e850 Update forge-gui/res/cardsfolder/w/wildest_dreams.txt 2022-02-23 13:49:07 +00:00
Renato Santos
9ebc32c5ee Update forge-gui/res/cardsfolder/upcoming/mirror_box.txt 2022-02-23 13:22:59 +00:00
Anthony Calosa
802f9837bd update settings check box and back button 2022-02-23 21:22:07 +08:00
Renato Santos
db8e2e7c6f Update forge-gui/res/cardsfolder/upcoming/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt 2022-02-23 13:18:28 +00:00
Renato Santos
cce2f711d8 Update forge-gui/res/cardsfolder/upcoming/rampant_rejuvenator.txt 2022-02-23 13:12:21 +00:00
Anthony Calosa
aa0fca7b68 update new game, save load and settings 2022-02-23 16:09:55 +08:00
Anthony Calosa
dc4eed4b08 Revert "Brawl deck included for testing purposes" 
This reverts commit b54cd071b6.
 2022-02-23 14:06:30 +08:00
Anthony Calosa
3e3d6fd0cd Merge remote-tracking branch 'core/brawl' 2022-02-23 14:06:16 +08:00
Anthony Calosa
3d8648f7d8 update start menu 2022-02-23 14:00:48 +08:00
Anthony Calosa
2936380bb8 update player name when loading save and starting match 
- todo update some mobile layout
 2022-02-23 13:31:51 +08:00
Michael Kamensky
a70e75f04e Merge branch 'myojin' into 'master' 
myojin_of_seeing_winds.txt etbCounter

See merge request core-developers/forge!6288
 2022-02-23 04:20:08 +00:00
Northmoc
ffdc4bf1ce myojin_of_seeing_winds.txt etbCounter 2022-02-22 21:06:35 -05:00
Anthony Calosa
edb6aff2d6 Merge remote-tracking branch 'core/master' 2022-02-23 08:02:34 +08:00
Anthony Calosa
d7dcc2ae21 update viewport and hud button bounds 2022-02-23 08:00:14 +08:00
Anthony Calosa
6f15f7c618 Merge branch 'neo_draft' into 'master' 
NEO draft update

See merge request core-developers/forge!6285
 2022-02-22 23:31:13 +00:00
paul_snoops
9480bab6e8 dfc 2022-02-22 18:57:21 +00:00
Michael Kamensky
1d8367c27e Merge branch 'twosat-master-patch-07360' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!6284
 2022-02-22 18:56:13 +00:00
paul_snoops
20f6e0fa68 NEO Draft Update 2022-02-22 16:13:50 +00:00
paul_snoops
15145e8b28 NEO Draft Update 2022-02-22 16:13:32 +00:00
Andreas Bendel
ef790504ac Update de-DE.properties 
translated the new GUI options
 2022-02-22 15:24:24 +00:00
Paul Hammerton
889fce2e39 Merge branch 'neo_nec_tokens' into 'master' 
NEO and NEC tokens in edition files

See merge request core-developers/forge!6283
 2022-02-22 12:56:00 +00:00
paul_snoops
61c49a2589 NEO and NEC tokens in edition files 2022-02-22 12:54:09 +00:00
Michael Kamensky
c45ee59387 Merge branch 'stackDescs' into 'master' 
some more getStackDescription improvements

See merge request core-developers/forge!6281
 2022-02-22 09:48:59 +00:00
Tim Mocny
deb9744b38 some more getStackDescription improvements 2022-02-22 09:48:51 +00:00
Anthony Calosa
460475bb2a Merge branch 'master' into 'master' 
unused imports

See merge request core-developers/forge!6282
 2022-02-22 07:05:51 +00:00
Anthony Calosa
e594a1ba86 unused imports 2022-02-22 15:00:47 +08:00
Anthony Calosa
7e8406d0ed Merge branch 'master' into 'master' 
update touch controls for adventure rewards

See merge request core-developers/forge!6278
 2022-02-22 06:54:58 +00:00
Anthony Calosa
a799f3919c Merge remote-tracking branch 'core/master' 2022-02-22 14:49:30 +08:00
Anthony Calosa
10c28ff2c3 align save/load layout 2022-02-22 14:42:25 +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
Michael Kamensky
fea1a3b9dd Merge branch 'nec_21' into 'master' 
NEC – 21 Feb

See merge request core-developers/forge!6280
 2022-02-22 04:05:24 +00:00
Tim Mocny
d638b50910 NEC – 21 Feb 2022-02-22 04:05:21 +00:00
Anthony Calosa
68ecc56a4e update TransitionScreen 
- to match selected theme and logo
 2022-02-22 09:36:29 +08:00
Anthony Calosa
82a8732c87 make altzonetabs for adventure mode 
- todo add reveal zone
 2022-02-22 07:12:27 +08:00
Anthony Calosa
6d6dfb9845 Merge remote-tracking branch 'core/master' 2022-02-22 06:59:48 +08:00
Anthony Calosa
2faddd3824 use cropped border image for shop and reward cards 2022-02-22 05:56:03 +08:00
Anthony Calosa
f080a71300 update holdtooltip 2022-02-22 05:44:12 +08: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
Michael Kamensky
eec89828fc Merge branch 'nec_20' into 'master' 
NEC – 20 Feb

See merge request core-developers/forge!6272
 2022-02-21 13:48:45 +00:00
Tim Mocny
784ef07f70 NEC – 20 Feb 2022-02-21 13:48:34 +00:00
Anthony Calosa
b73c4dfeea updated tooltip code 
-todo set correct x, y and scale
 2022-02-21 20:22:41 +08:00
Bug Hunter
00a2ea3cfc Merge branch 'TRT-master-patch-81123' into 'master' 
Update forge-gui/res/cardsfolder/d/doomfall.txt

See merge request core-developers/forge!6279
 2022-02-21 09:43:59 +00:00
Bug Hunter
2934669c45 Update forge-gui/res/cardsfolder/d/doomfall.txt 2022-02-21 09:43:10 +00:00
Anthony Calosa
dc3d6b96e6 Merge remote-tracking branch 'core/master' 2022-02-21 16:19:03 +08:00
Anthony Calosa
6d6998ae92 update touch controls for adventure rewards 
- simulate hover for rewards cards / shop cards on touchdown
 2022-02-21 16:05:32 +08: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