Northmoc
8efa2234d5
YDSK: gilded_ambusher.txt
2024-11-22 17:01:04 -05:00
Anthony Calosa
0b9fb9f379
Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT
2024-11-22 19:13:37 +08:00
Anthony Calosa
78e587b32b
handle exception
2024-11-22 19:13:15 +08:00
kevlahnota
8486dbbd02
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-22 16:08:21 +08:00
Anthony Calosa
69fef79105
refactor timeout
2024-11-22 16:06:37 +08:00
kevlahnota
2a499d7390
Merge pull request #6605 from kevlahnota/master2
...
Fix crash on Splashscreen
2024-11-22 15:55:31 +08:00
Anthony Calosa
66045c0c0a
..
2024-11-22 15:45:44 +08:00
Anthony Calosa
7c3354cf70
Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT
2024-11-22 12:46:26 +08:00
kevlahnota
f918ae5978
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-22 12:46:13 +08:00
Anthony Calosa
afb062e770
revert ManaPool
...
remove ManaPoolTest for concurrency
refactor timeout for chooseSpellAbilityToPlayFromList
2024-11-22 12:44:51 +08:00
kevlahnota
c773e39b52
Merge pull request #6602 from Card-Forge/kevlahnota-patch-2
...
prevent NPE
2024-11-22 11:57:14 +08:00
Chris H
03b87003ef
Update remove-stale-branches.yml
2024-11-21 22:28:13 -05:00
Chris H
4436a83cc5
Update remove-stale-branches.yml
2024-11-21 22:28:13 -05:00
Chris H
2bf67e931e
Update remove-stale-branches.yml
2024-11-21 22:16:18 -05:00
kevlahnota
f01d03e706
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-22 06:13:37 +08:00
kevlahnota
29ce2e01fd
Update ImageView.java
2024-11-22 06:04:25 +08:00
kevlahnota
6f59c0d2ce
prevent NPE
2024-11-22 05:58:49 +08:00
tool4ever
5fa9f5b50e
Fix Kentaro ( #6600 )
2024-11-21 16:58:13 +00:00
Anthony Calosa
3d42da96d4
add persistentmana check
2024-11-21 16:10:20 +08:00
Anthony Calosa
259247c842
update ManaMultiMap clear
...
update ManaPoolTest
2024-11-21 14:37:32 +08:00
Anthony Calosa
dda5afe704
refactor ManaPool
...
move custom multimap implementation for floating mana since this only covers small section
2024-11-21 13:33:52 +08:00
kevlahnota
27740be1cd
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-21 13:03:58 +08:00
Chris H
0bc4e5d7b9
Restore flatten and version for now
2024-11-20 20:48:21 -05:00
GitHub Actions
c95afd86d8
[maven-release-plugin] prepare for next development iteration
2024-11-20 20:48:21 -05:00
GitHub Actions
ac37ee1947
[maven-release-plugin] prepare release forge-2.0.00
2024-11-20 20:48:21 -05:00
Chris H
0553eb58ef
Temporarily remove flatten to get a release out
2024-11-20 20:48:21 -05:00
Anthony Calosa
e23b3b90b4
Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT
2024-11-20 22:02:43 +08:00
Anthony Calosa
81777761f5
add ManaPoolTest
2024-11-20 22:02:25 +08:00
kevlahnota
12ae996190
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-19 22:42:20 +08:00
Anthony Calosa
065f6b9273
Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT
2024-11-19 22:33:07 +08:00
Anthony Calosa
0854fbb947
update FCollection
...
Replace copyonwritearray to a custom implementation for concurrent modification exception. A little bit slower but supports iterator operations.
Added FCollectionTest
2024-11-19 22:32:37 +08:00
Hans Mackowiak
d165aba624
Update tyvar_the_pummeler.txt
...
Closes #6594
2024-11-19 11:37:22 +01:00
kevlahnota
39fc1415aa
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-19 05:49:27 +08:00
Chris H
0cfc7c2545
Update snapshot-both-pc-android.yml
2024-11-18 15:11:58 -05:00
kevlahnota
6d49bc7e53
Merge pull request #6593 from kevlahnota/master2
...
fix layout params
2024-11-18 16:28:22 +08:00
Anthony Calosa
fdfabfd5cf
fix layout
2024-11-18 15:55:52 +08:00
kevlahnota
974e8b0760
update xstream, netty
...
fix dependabot vulnerability
2024-11-18 15:17:38 +08:00
kevlahnota
cbe48d0892
Update VPlayerPanel.java
...
should display error for null icons on VPlayerPanel Infotab. If pointer is still null then the icon seems to be disposed (probably on android) or just deliberately missing.
2024-11-18 15:09:10 +08:00
0nderzeeboot
8d230c774c
Update cephalid_inkmage.txt ( #6590 )
...
Fixed wrong condition for threshold check.
2024-11-18 09:36:57 +03:00
kevlahnota
b9ac48e861
Merge pull request #6592 from kevlahnota/master2
...
set navigation bar color
2024-11-18 12:43:12 +08:00
Anthony Calosa
a1d1e2b335
set navigation bar color
...
add note to edge-to-edge enforcement on android 15
2024-11-18 12:41:58 +08:00
kevlahnota
a6f1b3ac02
Merge pull request #6591 from kevlahnota/master2
...
try to prevent Splashscreen crash on Linux
2024-11-18 11:28:55 +08:00
Anthony Calosa
f48cf951db
..
2024-11-18 11:23:00 +08:00
0nderzeeboot
9093c77e72
Update arahbo_the_first_fang.txt ( #6589 )
2024-11-17 23:44:00 +00:00
kevlahnota
f5e024bf63
Update ItemManager.java
...
it seems this is controlled via preference and would fail the logic for the view index
2024-11-18 06:11:42 +08:00
kevlahnota
b8a2903617
NPE prevention
...
- closes #6588
2024-11-18 05:11:48 +08:00
Chris H
24182e337a
Update rune_sealed_wall.txt ( #6587 )
2024-11-17 21:02:06 +00:00
Hans Mackowiak
73940c584e
ColorSet: use Stream to map ManaSymbol
2024-11-17 10:48:27 +01:00
kevlahnota
c9e733ecbd
Update ImageView.java
...
isempty missing in streambuffer on android
2024-11-17 14:26:08 +08:00
kevlahnota
f6d4e322a8
Merge pull request #6583 from kevlahnota/master2
...
try to optout on Edge-to-Edge for android 15
2024-11-17 12:16:16 +08:00
