Commit Graph

62212 Commits

Author SHA1 Message Date
George
fba9c3ad2e Merge remote-tracking branch 'origin/master' 2023-01-06 11:37:22 +02:00
George
0032d35be0 Correct the update of POIChanges for bought cards from shops 2023-01-06 11:33:09 +02:00
Paul Hammerton
9e15abee84 Merge pull request #2207 from paulsnoops/PH21_update
Edition update: PH21
2023-01-06 09:14:23 +00:00
paulsnoops
70a062afd3 Edition update: PH21 2023-01-06 09:08:00 +00:00
Paul Hammerton
48e9c676e9 Merge pull request #2206 from paulsnoops/update_formats
Formats update: Add DMR
2023-01-06 08:52:33 +00:00
paulsnoops
0bc50c313c Formats update: Add DMR 2023-01-06 08:49:04 +00:00
Anthony Calosa
a91be00f40 Merge pull request #2203 from HassanSky81/master
Do not clear POI changes after reload
2023-01-06 15:58:39 +08:00
sky81
ef14fb934a Do not clear POI changes after reload 2023-01-06 09:07:04 +02:00
Anthony Calosa
41cd6935a8 Merge pull request #2202 from tool4ever/discardedthisturn
Fix DiscardedThisTurn
2023-01-06 13:28:06 +08:00
TRT
b1df2d1008 Fix DiscardedThisTurn 2023-01-05 16:10:50 +01:00
Anthony Calosa
40dbdec31c Merge pull request #2199 from tool4ever/canthappen
ReplacementLayer.CantHappen
2023-01-05 16:53:00 +08:00
Anthony Calosa
05be9bebb2 Merge pull request #2201 from kevlahnota/newmaster2
ValidCard$ Self to ValidCard$ Card.Self
2023-01-05 12:33:50 +08:00
Anthony Calosa
b72d8aea04 Merge pull request #2200 from invalidCards/scd-precons
Add SCD precons
2023-01-05 12:33:35 +08:00
Anthony Calosa
58eb11ec56 ValidCard$ Self to ValidCard$ Card.Self
fixes Moonshae Pixie
2023-01-05 12:25:39 +08:00
tool4EvEr
50966d3f7a Morph fix 2023-01-04 22:43:17 +01:00
invalidCards
838fa0cc1f Add SCD precons 2023-01-04 22:34:45 +01:00
tool4EvEr
8986a025e7 Also remove controller 2023-01-04 22:25:04 +01:00
tool4EvEr
e8704e3c5e Fix auras losing all previous traits when they can't ETB 2023-01-04 22:16:02 +01:00
tool4EvEr
a51582237a Stonehewer Giant fix when it can't ETB 2023-01-04 20:49:06 +01:00
tool4EvEr
58a917e667 Store timestamp to be safe 2023-01-04 20:33:35 +01:00
tool4EvEr
96037f9388 Fix cards 2023-01-04 20:29:55 +01:00
TRT
414fb3fcef Improve cleanup when card can't ETB 2023-01-04 16:15:16 +01:00
TRT
0250c9ca0b Fix missing LKI for Startled Awake 2023-01-04 16:14:34 +01:00
TRT
c7feb44214 Fix "can't happen" applied with other replacements 2023-01-04 16:13:26 +01:00
tool4ever
359a97462e Few fixes (#2198)
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-01-04 08:04:17 +03:00
Paul Hammerton
75d79cab5e Merge pull request #2195 from JohnWilliams77/patch-70
Update Secret Lair Drop Series.txt
2023-01-02 14:58:38 +00:00
JohnWilliams77
6dadf396c1 Update Secret Lair Drop Series.txt 2023-01-02 09:52:10 +00:00
Anthony Calosa
de7092aab8 Merge pull request #2194 from kevlahnota/newmaster2
fix copying deck to clipboard
2023-01-02 15:57:06 +08:00
Anthony Calosa
944933fd12 fix copying deck to clipboard 2023-01-02 15:55:31 +08:00
Anthony Calosa
616c234574 Merge pull request #2192 from tool4ever/loyaltyact
Fix NumLoyaltyAct counting limit and additional wrong together
2023-01-02 09:03:19 +08:00
Anthony Calosa
776c7873af Update CardDetailUtil.java
fix facedown typeline status
2023-01-01 21:18:34 +08:00
tool4EvEr
e63ba22630 Fix NumLoyaltyAct counting limit and additional wrong together 2022-12-31 10:48:06 +01:00
Paul Hammerton
fa433ce94e Merge pull request #2191 from JohnWilliams77/patch-69
Update Secret Lair Drop Series.txt
2022-12-30 18:20:54 +00:00
Northmoc
f67f5636e0 ONE: Green Sun's Twilight and support (#2175) 2022-12-30 17:48:09 +00:00
tool4ever
a2d93861cf Script fixes (#2189)
* Update captain_rex_nebula.txt

* Update pirated_copy.txt

* Update face_of_divinity.txt

* Fix Primal Amulet transforming if counter gets replaced
2022-12-30 17:47:56 +00:00
JohnWilliams77
c3dcd36458 Update Secret Lair Drop Series.txt 2022-12-30 12:44:01 +00:00
JohnWilliams77
6bc950c508 Update Secret Lair Drop Series.txt 2022-12-30 09:15:46 +00:00
Anthony Calosa
7e7f36d1f0 Merge pull request #2186 from kevlahnota/newmaster2
fix Adventure cards in exile lose "may be cast" when rewinding casting
2022-12-29 10:18:51 +08:00
Anthony Calosa
4f365848e1 update 2022-12-29 10:11:48 +08:00
Anthony Calosa
dc17e44289 Merge pull request #2139 from asvitkine/cleanup_lobby_ui3
Clean up lobby code and fix a deck deselect bug.
2022-12-29 09:46:00 +08:00
Anthony Calosa
952950b8db Merge pull request #2184 from pakoito/patch-2
Fix language bundle log string
2022-12-29 09:44:57 +08:00
Anthony Calosa
fb4239196f Merge branch 'master' into newmaster2 2022-12-29 09:44:26 +08:00
Anthony Calosa
21f9223981 fix Adventure cards in exile lose "may be cast" when rewinding casting
- closes #2176
2022-12-29 09:34:05 +08:00
tool4ever
24e32e7af6 Clean up (#2185) 2022-12-28 21:45:53 +00:00
asvitkine
d6af6aa68f Fix deck re-randomization on new game. 2022-12-28 14:04:15 -07:00
Paco
64a980b156 Fix loading bundle string 2022-12-28 20:59:53 +00:00
asvitkine
88308ecd5c Support export/import states with arbitrary players. (#2168)
* Support export/import states with arbitrary players.

Previously, the dump/setup game state dev options were only able to handle a 2-player human vs. AI game. This PR expands the functionality to support any number of players and ignores the type of player (naming them p0,p1,...,pN). The previous names of ai and human are supported for backwards compatibility.
2022-12-28 14:56:16 +00:00
Anthony Calosa
e20d40a435 Merge pull request #2137 from JohnWilliams77/patch-66
SLX Variants
2022-12-28 22:38:25 +08:00
Anthony Calosa
def1c53bda Merge pull request #2161 from HassanSky81/master
Correct the update of POIChanges for bought cards from shops
2022-12-28 22:36:22 +08:00
asvitkine
b0d5d952e8 Add "ask simulated ai" dev option. (#2180)
* Add "ask simulated ai" dev option.

Also moves the setup/dump game state options at the end of the list, as they're different from the other ones and shouldn't just be in the middle.

Also makes the code a bit more concise for the different mouse listeners.

* Fix comment location.
2022-12-28 10:02:47 +00:00