Commit Graph

69394 Commits

Author SHA1 Message Date
kevlahnota
f01d03e706 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-22 06:13:37 +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
Anthony Calosa
cca1468a85 try to optout on Edge-to-Edge for android 15 2024-11-17 12:12:58 +08:00
kevlahnota
c603bfb818 try to use immersive mode on android 13 and above 2024-11-17 11:07:44 +08:00
Anthony Calosa
619130b519 remove unused import 2024-11-17 08:07:07 +08:00
Anthony Calosa
5dc84a68c4 remove threadsafeIterable
The original purpose which is to create a copy of linkedlist to iterate to avoid concurrent modification, but we use copyonwritearray design and it is already thread safe and iteration while modification is handled internally.
2024-11-17 08:00:29 +08:00
kevlahnota
f6d2d420bb use anymatch 2024-11-17 07:14:33 +08:00
kevlahnota
6c847e00a2 refactor AiCardMemory 2024-11-17 06:49:50 +08:00
kevlahnota
f72ab6f22a use removeall
the fcollection will check if removing from set is successful, it will also remove the element from the list
2024-11-17 00:45:27 +08:00
kevlahnota
12613328fe Update PlayEffect.java 2024-11-17 00:37:22 +08:00
kevlahnota
54266e8914 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 20:27:05 +08:00
Anthony Calosa
f46e22cc54 minor cleanup 2024-11-16 20:13:17 +08:00
kevlahnota
cb645670d4 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 19:50:55 +08:00
Anthony Calosa
5597d0bf31 fix arrows drawing out of bounds 2024-11-16 19:50:09 +08:00
kevlahnota
0247acbd49 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 18:52:12 +08:00
Anthony Calosa
95e3304948 add coloridversion check 2024-11-16 18:24:22 +08:00
kevlahnota
5ebaeacb92 Merge pull request #6570 from Card-Forge/CrypticSpire
add support for Cryptic Spire
2024-11-16 17:18:43 +08:00
kevlahnota
b5f96ab8e2 Merge branch 'master' into CrypticSpire 2024-11-16 17:14:51 +08:00