external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,730 Commits 31 Branches 187 Tags
07db8e5a94e70d1e204bac56e630fde0b4e12097
Commit Graph

4425 Commits

Author SHA1 Message Date
Anthony Calosa
8fc3b45b12 quick fix for black texture 2024-10-15 10:55:56 +08:00
Jetz
6b93e628ac Merge branch 'master' into code-cleanup 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ComputerUtil.java
#	forge-core/src/main/java/forge/card/DeckHints.java
#	forge-game/src/main/java/forge/game/ability/AbilityFactory.java
#	forge-game/src/main/java/forge/game/cost/CostUntapType.java
#	forge-gui/src/main/java/forge/player/HumanCostDecision.java
 2024-10-14 22:36:07 -04:00
Jetz
31547c6bbb Merge branch 'master' into code-cleanup 
# Conflicts:
#	forge-game/src/main/java/forge/game/phase/PhaseHandler.java
 2024-10-14 22:20:44 -04:00
Meta
5b62a1ffb5 Fixed non-cards for rarity sorting 
import
 2024-10-14 21:56:30 -04:00
Chris H
0475f4bafa Manually update files that need to be updated 2024-10-14 21:53:45 -04:00
GitHub Actions
d366bf8ffc [maven-release-plugin] prepare for next development iteration 2024-10-14 21:53:45 -04:00
GitHub Actions
fa538bd5c9 [maven-release-plugin] prepare release forge-1.6.65 2024-10-14 21:53:45 -04:00
Anthony Calosa
abdff9bb15 update to SDK 35 (Android 15), update versionString 2024-10-09 21:25:29 +08:00
Anthony Calosa
644fa46681 Merge branch 'master' into master2 2024-10-09 16:44:29 +08:00
Anthony Calosa
708fed3350 update and unified version code property 2024-10-09 12:32:09 +08:00
Chris H
dd60a84f40 Add Spell Smith Insurance (reject smithing for 10% cost) 2024-10-08 09:07:15 -04:00
Anthony Calosa
f6f51b916a Merge branch 'master' into master2 2024-10-08 16:27:50 +08:00
Anthony Calosa
af3ceb3348 fix crash when card defined is missing or invalid 
these card should be replaced or create a custom card for adventure mode
Power Struggle, Necropolis of Azar
 2024-10-08 16:25:52 +08:00
Anthony Calosa
eada2c6d4f Merge branch 'master' into master2 2024-10-07 06:06:05 +08:00
Hans Mackowiak
80b30d9a6a Room: First Spell Part (#6044) 
* Room: First Spell 

----

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
Co-authored-by: TRT <>
Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
 2024-10-06 20:11:28 +02:00
Anthony Calosa
f4671133f3 add splashscreen for mobile-dev 2024-10-06 23:13:51 +08:00
Anthony Calosa
f14de828ea mobile new summoning sickness icon 2024-10-05 12:20:16 +08:00
Anthony Calosa
5ce506c5ab update ImageView 2024-10-04 19:19:30 +08:00
Anthony Calosa
deff16b8f4 Merge branch 'master' into master2 2024-10-04 14:40:42 +08:00
kevlahnota
fea8855e0e prevent NPE 2024-10-04 11:33:36 +08:00
Anthony Calosa
0cb589a905 update generated box display 2024-09-30 20:49:03 +08:00
Anthony Calosa
ea9aab7c4f mobile -> enable combat arrows on 2 player 2024-09-29 20:41:20 +08:00
Anthony Calosa
7594888f8e SKIN Update 2024-09-29 15:25:11 +08:00
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