Commit Graph

70055 Commits

Author SHA1 Message Date
Anthony Calosa
46c502942b Merge branch 'master' into master2 2024-11-05 15:41:25 +08:00
Anthony Calosa
5d057837ff reuse headerLabel as marker for loot 2024-11-05 15:32:30 +08:00
Chris H
a71f57de3a Foundations new set things 2024-11-04 22:11:42 -05:00
Chris H
0e5303b84e Migrate upcoming 2024-11-04 21:39:55 -05:00
Paul Hammerton
bc6d78c376 Merge pull request #6511 from paulsnoops/combine-ue-into-da1
Combine Unknown Event editions into DA1
2024-11-04 19:01:16 +00:00
kevlahnota
fde2cd4538 Merge pull request #6529 from Card-Forge/kevlahnota-patch-1
Update QuestDataIO.java
2024-11-04 19:59:18 +08:00
tool4ever
41a3b24aef Fix Windfall (#6530) 2024-11-04 11:27:51 +01:00
kevlahnota
d8b86eb606 Update QuestDataIO.java
add EnumMap converter
2024-11-04 12:30:52 +08:00
tool4ever
fe259dafd2 Update fleeting_reflection.txt
Closes #6525
2024-11-03 15:46:11 +00:00
kevlahnota
fc1ba62078 Merge pull request #6523 from kevlahnota/master2
refactor HeroListData, update CoverScreen
2024-11-03 21:29:06 +08:00
Anthony Calosa
87d242028f refactor HeroListData, update CoverScreen
- remove redundant autosave
2024-11-03 21:24:20 +08:00
tool4ever
3e49ec6c88 Fix unattach logic (#6522) 2024-11-03 09:14:17 +00:00
Michael Lo
ecce3ab139 Add info about plotted cards into the game log (#6516) 2024-11-03 08:55:56 +00:00
Paul Hammerton
4fd6b3eff5 Merge pull request #6521 from paulsnoops/fdn-formats
Format updates for FDN & J25
2024-11-03 08:27:28 +00:00
Paul Hammerton
fb4dd87339 fdc_leg_vin 2024-11-03 08:23:58 +00:00
Paul Hammerton
c050d04881 j25_historic 2024-11-03 08:21:54 +00:00
Paul Hammerton
2a9960ca2b Add FDN & J25 to formats 2024-11-03 08:18:32 +00:00
kevlahnota
b179366bdd Merge pull request #6520 from kevlahnota/master2
update VCardDisplayArea, VZoneDisplay
2024-11-03 15:40:05 +08:00
Anthony Calosa
2d85fd845e update teleport animation 2024-11-03 15:27:30 +08:00
Anthony Calosa
5e326ef91a Merge branch 'master' into master2 2024-11-03 13:22:57 +08:00
Anthony Calosa
74f9d05b08 update NPE prevention 2024-11-03 12:14:43 +08:00
Anthony Calosa
4a1bbdc3ba update VZoneDisplay 2024-11-03 10:15:29 +08:00
Anthony Calosa
0ddf5b25d7 refactor VCardDisplayArea, prevent NPE 2024-11-03 10:07:14 +08:00
Chris H
2e7d4e3848 Return false instead of throw if an illegal draft choice is made 2024-11-02 21:57:37 -04:00
kevlahnota
09a1e6ecaf Merge pull request #6517 from kevlahnota/master2
add missing translation, minor speedup generating map
2024-11-03 06:27:51 +08:00
Anthony Calosa
68a5cb6c82 Merge branch 'master' into master2 2024-11-03 06:10:58 +08:00
Anthony Calosa
b01a155aa1 add missing 2024-11-03 06:04:45 +08:00
Fulgur14
9a7a8d7719 Update slinza_the_spiked_stampede.txt (#6515) 2024-11-02 22:01:56 +00:00
Anthony Calosa
c6aecafe6b add missing translation, minor speedup generating map 2024-11-03 05:58:28 +08:00
Agetian
343f09157d - Improve AI for Scry when X payment is necessary. (#6506) 2024-11-02 17:52:57 +03:00
Paul Hammerton
bdcf8ecb87 Merge pull request #6512 from paulsnoops/fix-strix-lookout
Fix Strix Lookout
2024-11-02 12:00:38 +00:00
Paul Hammerton
5ab34cf068 Combine Unknown Event editions into DA1 2024-11-02 11:59:45 +00:00
Paul Hammerton
ac935b92f6 Fix Strix Lookout 2024-11-02 11:55:27 +00:00
kevlahnota
6a12c12473 Merge pull request #6510 from kevlahnota/master2
fix newgame/newgame plus entering spawn point
2024-11-02 19:50:00 +08:00
Anthony Calosa
fa74a3b01c fix newgame/newgame plus entering spawn point 2024-11-02 19:45:01 +08:00
Paul Hammerton
58aacb07a8 Merge pull request #6509 from paulsnoops/edition-updates
Edition updates: FDN
2024-11-02 10:20:12 +00:00
Paul Hammerton
db940973c3 Edition updates: FDN 2024-11-02 10:15:46 +00:00
Fulgur14
9017c82f3e Final baker's dozen of FDN cards (#6507) 2024-11-02 08:31:41 +00:00
kevlahnota
6e961ac64e Merge pull request #6508 from kevlahnota/master2
fix infinite collision on Worldstage
2024-11-02 15:15:33 +08:00
Anthony Calosa
55d945857a fix format 2024-11-02 14:23:29 +08:00
Anthony Calosa
660a16a772 fix infinite collision on Worldstage
- closes #6485
2024-11-02 14:20:36 +08:00
Eli
396163a3de Added script text for Squad Rallier and Stab cards. (#6503)
* Added script text for Squad Rallier and Stab cards.

* Corrected script on Squad Rallier card; removed pump.
2024-11-02 07:22:17 +03:00
kevlahnota
097573d62d Merge pull request #6504 from kevlahnota/master2
move key indicators
2024-11-02 11:12:36 +08:00
Anthony Calosa
8d9f17fbac move key indicators 2024-11-02 11:08:30 +08:00
Fulgur14
a07db9168b Another dozen of FDN cards, nearing the end (#6502) 2024-11-01 21:16:47 +00:00
Paul Hammerton
aafa3a9b9f Merge pull request #6501 from paulsnoops/fix-hungry-ghoul
Fix Hungry Ghoul
2024-11-01 17:48:56 +00:00
Paul Hammerton
670c34a2c2 Fix Hungry Ghoul 2024-11-01 17:45:12 +00:00
Paul Hammerton
24b7373888 Merge pull request #6500 from paulsnoops/edition-updates
Edition updates: FDN, J25, PLTC
2024-11-01 17:34:03 +00:00
Paul Hammerton
6f344b729a Edition updates: FDN, J25, PLTC 2024-11-01 17:30:50 +00:00
Chris H
473a65f9ba Fix crash when a player dies with a card on the stack 2024-11-01 12:44:47 -04:00