external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,124 Commits 32 Branches 187 Tags
03c1a0e6f08b8d74f68860b9c91b51fbb5808acd
Commit Graph

4652 Commits

Author SHA1 Message Date
Jetz
b35981218a Merge branch 'master' into code-cleanup 
# Conflicts:
#	forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
 2024-09-26 10:21:19 -04:00
Jetz
6a04fcd500 Guava migration - Remove migration scaffold 2024-09-26 09:36:50 -04:00
Anthony Calosa
56400d4444 JAVA17 Update 2024-09-26 11:52:42 +08:00
Jetz
0278f5817b Guava migration - Create IterableUtil to house iterable helper methods dependent on Java predicates 2024-09-25 09:26:41 -04:00
Jetz
05d58c2fce Guava migration - Add StreamUtils.random collectors 2024-09-22 14:47:57 -04:00
Jetz
c91334029a Guava migration - Refactor edition type checks 2024-09-19 09:20:02 -04:00
Anthony Calosa
9fc93847b3 Merge branch 'master' into master2 2024-09-16 13:52:07 +08:00
kevlahnota
cb325996c9 prevent NPE 2024-09-16 13:34:48 +08:00
Jetz
8189f134eb Merge branch 'master' into code-cleanup 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiAttackController.java
#	forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
#	forge-core/src/main/java/forge/item/IPaperCard.java
#	forge-game/src/main/java/forge/game/ForgeScript.java
#	forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
#	forge-game/src/main/java/forge/game/card/CardState.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
#	forge-game/src/main/java/forge/game/trigger/Trigger.java
 2024-09-15 18:11:24 -04:00
Jetz
76aa19622e Guava migration - Replace select usages of Iterables.filter 2024-09-15 17:16:24 -04:00
Anthony Calosa
f442189868 update SplashScreen 2024-09-12 20:06:58 +08:00
Anthony Calosa
09b5ee8ac5 update android builds to SDK 29, use Java 11 2024-09-08 20:44:23 +08:00
Jetz
efe55efa43 Guava migration - Inline Iterables.isEmpty (Collection overload) 2024-09-06 19:57:22 -04:00
Jetz
4c8a94b18a Guava migration - Inline Predicates.compose 2024-09-06 19:50:14 -04:00
Jetz
6e3726ee79 Guava migration - Remove unused imports 2024-09-06 19:23:54 -04:00
Jetz
734bcec8bf Guava migration - Helper method for composing CardRules into PaperCards 2024-09-06 19:17:28 -04:00
Jetz
85f80bb5f1 Guava migration - Explode Predicate "Presets" subclasses 2024-09-06 18:10:24 -04:00
Jetz
0bf04c2fc8 Guava migration - Add common helper predicates 2024-09-06 09:24:32 -04:00
Jetz
b37f8725ba Guava migration - Inline Predicates.and 2024-09-03 20:22:45 -04:00
Jetz
78bc9fd04e Guava migration - Inline Predicates.not 2024-09-03 09:41:07 -04:00
Anthony Calosa
bfaaed2738 increase badge fb resolution 2024-09-03 19:23:26 +08:00
Anthony Calosa
df04f1b1b1 add defeat badge, prevent console toggle when controls are frozen 2024-09-03 10:10:16 +08:00
Anthony Calosa
b785f5042e update location info 2024-09-03 08:56:58 +08:00
Anthony Calosa
13968ffb08 update preview info 2024-09-03 08:30:36 +08:00
Anthony Calosa
b80ac34189 fix autosell refresh, update SaveLoadScene 2024-09-03 08:18:40 +08:00
Jetz
77ba9f1728 Guava migration - Inline Predicates.alwaysTrue 2024-09-02 20:00:38 -04:00
Jetz
16c0fa1095 Guava migration - Fix lingering build errors 2024-09-02 19:51:21 -04:00
Jetz
6a87768647 Guava migration - Migrate Suppliers 2024-09-02 18:03:26 -04:00
Jetz
8702e299cd Guava migration - Migrate Functions 2024-09-02 17:40:41 -04:00
Jetz
9765279166 Guava migration - Migrate Predicates 2024-09-02 17:08:25 -04:00
Jetz
4d6292802f Guava migration - Migrate static libraries 2024-09-02 14:52:42 -04:00
Jetz
b46c1deeb4 Guava migration - Preliminary 2024-09-02 12:03:59 -04:00
Anthony Calosa
f59ebf64e9 update adventure defeat penalty 
- random armor crack (unusable)
- add difficulty indicator in load game preview (red - insane, gold - hard, green - normal, cyan - easy)
 2024-09-02 21:38:19 +08:00
Anthony Calosa
9aecf60ac7 fix freeze 2024-09-01 20:37:19 +08:00
Anthony Calosa
00ab0bf50b Disable labels 
-todo distinction
 2024-09-01 12:06:37 +08:00
Anthony Calosa
cdbc3cfab7 update AdventureDeckEditor 
- show Shop prices, show Auto Sell / No Sell card label
 2024-09-01 07:12:53 +08:00
Anthony Calosa
5978b3ef16 fix noSell cardreward 2024-08-30 09:47:16 +08:00
Anthony Calosa
e184fb20b9 update touchcancelled 2024-08-30 06:15:09 +08:00
Anthony Calosa
b1e6e6fd3d update button 2024-08-29 23:09:27 +08:00
Anthony Calosa
4e68ac3807 add autosell toggle for rewards 2024-08-29 22:31:07 +08:00
Anthony Calosa
f5ab73d32d update player death transition 2024-08-29 19:26:40 +08:00
kevlahnota
6a2f185b08 remove uncommited changes 2024-08-29 15:42:17 +08:00
Anthony Calosa
977c11ced0 retrict menu and movement on player defeat dialog 2024-08-29 14:45:54 +08:00
Anthony Calosa
a3f8b0aca2 fix overlapping dialog, fix player position 2024-08-29 11:24:50 +08:00
Anthony Calosa
14c14b880d update message 2024-08-29 10:40:26 +08:00
Anthony Calosa
24d4899cde add resetPlayerLocation on defeat 2024-08-28 21:54:48 +08:00
kevlahnota
53084f43c3 Merge pull request #5991 from Jetz72/fixes20240825 
Translation support for functional variants
 2024-08-27 12:43:35 +08:00
Anthony Calosa
2442883501 adjust blur divisor 2024-08-26 20:27:47 +08:00
Anthony Calosa
c212c41a30 update avatar listener single tap/click set translucency, double tap/click set hud visibility 2024-08-26 20:00:17 +08:00
Anthony Calosa
284a4daf88 update actor groupings 2024-08-26 17:28:24 +08:00