kevlahnota
|
8568498b69
|
Merge pull request #6412 from kevlahnota/master2
display locked room, fix nonrotated card panels
|
2024-10-23 05:49:21 +08:00 |
|
kevlahnota
|
051ec47ff6
|
Merge pull request #6234 from Ayora29/ok_shortcut
gui-desktop : add keyboard shortcut to press OK/Yes button
|
2024-10-23 05:48:04 +08:00 |
|
kevlahnota
|
99b0c96bfd
|
Merge pull request #6392 from CollinJ/master
Fix the SpellSmith missing some cards.
|
2024-10-23 05:47:16 +08:00 |
|
tool4ever
|
4f3dc5891a
|
Update attack_in_the_box.txt
Closes #6416
|
2024-10-22 21:16:31 +00:00 |
|
Chris H
|
2bab2f6c2b
|
Merge branch 'master' into ok_shortcut
|
2024-10-22 15:40:18 -04:00 |
|
CollinJ
|
a02a0a25fc
|
Merge branch 'master' into master
|
2024-10-22 10:12:12 -07:00 |
|
Paul Hammerton
|
dd33f9a28a
|
Merge pull request #6414 from paulsnoops/22bar
Ban Leyline of Resonance in Arena Standard archive
|
2024-10-22 16:53:08 +01:00 |
|
Paul Hammerton
|
65f72b25ed
|
Ban Leyline of Resonance in Arena Standard archive
|
2024-10-22 16:48:34 +01:00 |
|
Anthony Calosa
|
310f0ea352
|
incorporate emptyroom
|
2024-10-22 23:28:49 +08:00 |
|
Anthony Calosa
|
f7f9943436
|
update code as suggested
|
2024-10-22 23:05:47 +08:00 |
|
Anthony Calosa
|
b9a06e14a4
|
update better fix and replace rotate transform to spiral image (so it will not conflict with the existing rotate transform)
|
2024-10-22 22:36:05 +08:00 |
|
Anthony Calosa
|
f2cb01677e
|
Merge branch 'master' into master2
|
2024-10-22 21:50:53 +08:00 |
|
Anthony Calosa
|
1b3e3f7f7c
|
display locked room, fix nonrotated card panels
|
2024-10-22 21:38:23 +08:00 |
|
Agetian
|
84965594d0
|
Further improvement to PeekAndRevealAi (fix AI paying 0 for X) (#6410)
* - Add puzzle PS_DSK2.
* - Fix PeekAndRevealAi not paying the X mana cost.
* - Further improvement to PeekAndRevelAi.
|
2024-10-22 14:07:13 +03:00 |
|
Paul Hammerton
|
9014e282cb
|
Merge pull request #6409 from paulsnoops/edition-updates
Edition updates: FDN, PW24
|
2024-10-22 11:16:47 +01:00 |
|
Paul Hammerton
|
890c5f0b0d
|
Merge pull request #6407 from Ayora29/fix_token_names
Fix tokens things
|
2024-10-22 11:11:59 +01:00 |
|
Paul Hammerton
|
e05d0de220
|
Edition updates: FDN, PW24
|
2024-10-22 11:11:30 +01:00 |
|
tool4ever
|
031cd4176d
|
Fix logic for Henzie (#6402)
|
2024-10-22 10:14:43 +02:00 |
|
fanch
|
18b22279df
|
Fix tokens things
|
2024-10-22 09:59:33 +02:00 |
|
tool4ever
|
9dd712c18c
|
Update experimental_lab_staff_room.txt
|
2024-10-22 07:51:45 +02:00 |
|
kevlahnota
|
32b209b47b
|
Merge pull request #6405 from kevlahnota/master2
update manifest
|
2024-10-22 11:47:03 +08:00 |
|
Anthony Calosa
|
c5a01eb5d1
|
update manifest
|
2024-10-22 11:34:06 +08:00 |
|
kevlahnota
|
d231af2cad
|
Merge pull request #6404 from kevlahnota/master2
Fix NPE, add manifest entries to jar
|
2024-10-22 10:59:28 +08:00 |
|
Anthony Calosa
|
bfca273ca6
|
Merge branch 'master' into master2
|
2024-10-22 10:58:54 +08:00 |
|
Anthony Calosa
|
5a84c9c4f4
|
prevent NPE
|
2024-10-22 10:36:57 +08:00 |
|
Anthony Calosa
|
2aa6d9a6e6
|
add manifest entries to forge desktop/mobile jar
allow launching the jar without launcher if possible
|
2024-10-22 10:18:07 +08:00 |
|
Chris H
|
1536868d61
|
Fix snaps (#6403)
* Update snapshots-pc.yml
* Update snapshots-pc.yml
* Update snapshots-pc.yml
|
2024-10-21 21:55:05 -04:00 |
|
Anthony Calosa
|
1ab6d82f69
|
Merge branch 'master' into master2
# Conflicts:
# .github/workflows/snapshots-pc.yml
|
2024-10-22 06:49:11 +08:00 |
|
Anthony Calosa
|
5305050546
|
update snapshot-pc workflow
|
2024-10-22 06:25:05 +08:00 |
|
Anthony Calosa
|
13f0cda7f6
|
update snapshot-android workflow
|
2024-10-22 06:14:09 +08:00 |
|
kevlahnota
|
1a815b4ed7
|
Merge pull request #6401 from Card-Forge/kevlahnota-patch-3
Update AudioClip.java
|
2024-10-22 00:21:46 +08:00 |
|
kevlahnota
|
b4bffe93f1
|
Update AudioClip.java
Surround audio clip with try catch, seems accessing audio in lwjgl3 produce invalidid, could be thread problem.
|
2024-10-22 00:15:27 +08:00 |
|
Hans Mackowiak
|
7a34369c5e
|
Merge branch 'master' into code-cleanup
|
2024-10-21 17:57:21 +02:00 |
|
Anthony Calosa
|
21a738e616
|
delete version.txt if res folder is incomplete to allow redownload
|
2024-10-21 11:16:55 -04:00 |
|
Anthony Calosa
|
993578d695
|
try to fix permission check
|
2024-10-21 11:16:55 -04:00 |
|
Anthony Calosa
|
0d06258edb
|
add info on permission
|
2024-10-21 11:16:55 -04:00 |
|
Anthony Calosa
|
ec9209ceb6
|
update permission, include shell script to archive
|
2024-10-21 11:16:55 -04:00 |
|
Anthony Calosa
|
9a36808611
|
pretty print xml
|
2024-10-21 11:16:55 -04:00 |
|
Anthony Calosa
|
fbf26efc60
|
update installer, restore the tar.bz2 archive along with the installer and try to grant permission on the shell executables.
|
2024-10-21 11:16:55 -04:00 |
|
Anthony Calosa
|
4273420da5
|
delete version.txt if res folder is incomplete to allow redownload
|
2024-10-21 22:53:56 +08:00 |
|
Anthony Calosa
|
91cfd1ff3a
|
try to fix permission check
|
2024-10-21 21:56:23 +08:00 |
|
Anthony Calosa
|
05ce94d36f
|
add info on permission
|
2024-10-21 20:43:54 +08:00 |
|
Anthony Calosa
|
f3aa3c53ed
|
update permission, include shell script to archive
|
2024-10-21 20:35:24 +08:00 |
|
Anthony Calosa
|
6e9febdfc7
|
pretty print xml
|
2024-10-21 19:41:07 +08:00 |
|
Anthony Calosa
|
995336a764
|
update installer, restore the tar.bz2 archive along with the installer and try to grant permission on the shell executables.
|
2024-10-21 19:35:23 +08:00 |
|
kevlahnota
|
2814207390
|
Merge pull request #6399 from Card-Forge/kevlahnota-patch-2
Update snapshots-pc.yml
|
2024-10-21 18:14:18 +08:00 |
|
kevlahnota
|
a47d4e6a6c
|
Update snapshots-pc.yml
|
2024-10-21 18:13:49 +08:00 |
|
Agetian
|
41c64b282a
|
Fix AI paying 0 for PeekAndRevealAi (#6396)
* - Add puzzle PS_DSK2.
* - Fix PeekAndRevealAi not paying the X mana cost.
|
2024-10-21 12:33:47 +03:00 |
|
Anthony Calosa
|
e9fa2a5fea
|
remove adventure-mac command (-XstartOnFirstThread isn't needed anymore to start on Mac)
|
2024-10-21 15:26:30 +08:00 |
|
Anthony Calosa
|
ca5b0683d1
|
update version code, remove redundant CURRENT_VERSION
|
2024-10-21 15:01:39 +08:00 |
|