external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,609 Commits 31 Branches 187 Tags
e4a0ce916519e44b58ad97d7bf17f06b0d23017c
Commit Graph

48609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
61fd54f82e Merge branch 'drawAI' into 'master' 
DrawAI: spend more life when Aggro

See merge request core-developers/forge!4220
 2021-03-19 16:11:26 +00:00
Anthony Calosa
41b9bd3e06 Support loading Custom Cards & Editions from User Folder 2021-03-20 00:01:15 +08:00
tool4EvEr
799c24728f Draw more cards when Aggro AI 2021-03-19 15:40:17 +01:00
Michael Kamensky
ef3e91e8a8 Merge branch 'fix_scheme_trigger' into 'master' 
Fix scheme triggers are registered twice issue.

See merge request core-developers/forge!4216
 2021-03-19 07:10:55 +00:00
Michael Kamensky
a5254be74a Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4217
 2021-03-19 07:10:48 +00:00
CCTV-1
4bb7b2f5fc update simplified chinese translation 2021-03-19 10:35:41 +08:00
Lyu Zong-Hong
6b4878776d Fix scheme triggers are registered twice issue. 2021-03-19 11:01:14 +09:00
Michael Kamensky
3d9daa91e0 Merge branch 'kefnet' into 'master' 
God-Eternal Kefnet: Fix NPE

See merge request core-developers/forge!4215
 2021-03-18 19:16:23 +00:00
tool4EvEr
0ac2c06dd1 Fix NPE 2021-03-18 19:27:27 +01:00
Hans Mackowiak
0d81961325 AbilityUtils: don't crash when CardTrait is null 2021-03-18 13:37:05 +01:00
Anthony Calosa
0501ac9735 update imports 2021-03-18 17:24:44 +08:00
Anthony Calosa
f71e31c3a8 Merge remote-tracking branch 'core/master' into rollback_Phase_dev 
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
#	forge-gui-mobile/src/forge/screens/match/MatchController.java
#	forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
#	forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
 2021-03-18 17:19:08 +08:00
Michael Kamensky
fc5557a137 Merge branch 'refactor_add_phase' into 'master' 
Refactor AddPhase effect and add World at War

Closes #1606

See merge request core-developers/forge!4214
 2021-03-18 05:01:17 +00:00
Michael Kamensky
058cdb6c3b Merge branch 'karn' into 'master' 
RestartGameEffect: refactor resets

See merge request core-developers/forge!4208
 2021-03-18 05:01:12 +00:00
Bug Hunter
19a8c821fe RestartGameEffect: refactor resets 2021-03-18 05:01:12 +00:00
Lyu Zong-Hong
69c17586aa Refactor AddPhase effect and add World at War 2021-03-18 13:26:15 +09:00
Anthony Calosa
4d133a1966 Merge branch 'kevlahnota-master-patch-40940' into 'master' 
update achievements images list

See merge request core-developers/forge!4213
 2021-03-17 22:22:55 +00:00
Anthony Calosa
1d874760f1 cleanup 2021-03-17 22:19:36 +00:00
Anthony Calosa
9c59ed75be Update achievement-images.txt 
- planeswalker achievements updated up to kaldheim
 2021-03-17 22:18:49 +00:00
Hans Mackowiak
d0e0b11186 better alias for XStream IO 2021-03-17 19:20:56 +01:00
Hans Mackowiak
9dca989b76 fixes QuestIO and GauntletIO 2021-03-17 18:27:56 +01:00
Leandro Doctors
b0a2095d5b Merge branch 'fix-hannac' into 'master' 
fixup! add forge.quest.data.QuestData to fix old quests

See merge request core-developers/forge!4212
 2021-03-17 17:05:31 +00:00
Leandro Doctors
539d4c5939 fixup! fixup! add forge.quest.data.QuestData to fix old quests 2021-03-17 14:04:44 -03:00
Leandro Doctors
3199c74abe Merge branch 'fix-hannac' into 'master' 
fixup! add forge.quest.data.QuestData to fix old quests

See merge request core-developers/forge!4211
 2021-03-17 17:01:29 +00:00
Leandro Doctors
aecd600367 fixup! add forge.quest.data.QuestData to fix old quests 2021-03-17 14:00:37 -03:00
Hans Mackowiak
412e77bdde add forge.quest.data.QuestData to fix old quests 2021-03-17 17:23:10 +01:00
Leandro Doctors
032fa452c4 Merge branch 'fix-4106' into 'master' 
Fix 4106

See merge request core-developers/forge!4210
 2021-03-17 14:54:46 +00:00
Leandro Doctors
0978162bf5 Organize imports 2021-03-17 11:52:50 -03:00
Leandro Doctors
f3fd57c014 fixup! Merge branch 'reorganize-forge-gui' into 'master' 2021-03-17 11:50:26 -03:00
Leandro Doctors
0a29d6794b Merge branch 'reorganize-forge-gui' into 'master' 
Reorganize "forge-gui*" projects

This is just a first iteration. Eventually, it will be easier to only leave in "forge-gui" GUI-related classes, with the rest moved into a new "forge-common" or something like that.

Before this MR, all packages within "forge-gui" were at the same hierarchical level. Then, there was no straightforward way to realize which package was more closely related to which other one(s).

In this first iteration, I simply grouped them based on their collaborations:

I did three commits:

1) refactor: group local instance-related packages

  I moved the following packages into forge.localinstance:
  - achievements,
  - assets,
  - properties

2) refactor: group game modes-related packages

  I moved the following packages into forge.gamemodes:
  - gauntlet,
  - limited,
  - match,
  - net,
  - planarconquest,
  - puzzle,
  - quest,
  - tournament

3) refactor: group gui-related packages

  I moved the following packages into forge.gui:
  - card,
  - control,
  - download,
  - error,
  - events,
  - interfaces
  - util

In every step, I also moved some classes that were definitely into one of those groups. Of course, there are still many classes that should be split:  I  plan to do this later on.

See merge request core-developers/forge!4106
 2021-03-17 14:21:09 +00:00
Leandro Doctors
fe76d8b934 refactor: group gui-related packages 
This is just a first step...
Probably there are many other classes that should be either completely
added here, or decomposed and partially added here.
 2021-03-17 11:18:16 -03:00
Leandro Doctors
92110c1931 refactor: group game modes-related packages 2021-03-17 11:10:41 -03:00
Leandro Doctors
df64f5574d refactor: group local instance-related packages 
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
 2021-03-17 11:10:41 -03:00
Michael Kamensky
7027a38fa4 Merge branch 'refactor_skip_phase' into 'master' 
Refactor skip phase/step using replacement effect. Also add Fasting.

See merge request core-developers/forge!4205
 2021-03-17 05:43:32 +00:00
Alumi
b6b1ae852d Refactor skip phase/step using replacement effect. Also add Fasting. 2021-03-17 05:43:32 +00:00
Hans Mackowiak
10c9d153fc Merge branch 'token' into 'master' 
Fix ReplaceToken

See merge request core-developers/forge!4209
 2021-03-16 22:29:35 +00:00
tool4EvEr
c9bc9b6a57 Fix ReplaceToken 2021-03-16 21:02:12 +01:00
Anthony Calosa
121fafe8b5 Merge branch 'kevlahnota-master-patch-95506' into 'master' 
Update achievement-images.txt

See merge request core-developers/forge!4207
 2021-03-16 17:20:59 +00:00
Anthony Calosa
a807f11d27 Update achievement-images.txt 2021-03-16 17:20:19 +00:00
Anthony Calosa
966300780c Merge branch 'kevlahnota-master-patch-46440' into 'master' 
Update Drake Stone.txt

See merge request core-developers/forge!4206
 2021-03-16 12:22:50 +00:00
Anthony Calosa
0b7dd163b5 Update Drake Stone.txt 2021-03-16 12:22:38 +00:00
Hans Mackowiak
c1091253e1 Merge branch 'lastturnproperty' into 'master' 
EnteredSinceYourLastTurn: use controller of SA, not target

See merge request core-developers/forge!4204
 2021-03-16 06:26:57 +00:00
Michael Kamensky
ddab36038a Merge branch 'twosat-master-patch-11867' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4203
 2021-03-16 03:51:41 +00:00
tool4EvEr
89193429ab EnteredSinceYourLastTurn: use controller of SA, not target 2021-03-15 21:54:41 +01:00
Andreas Bendel
f6a3dd38bb Update de-DE.properties 
translated lblExcludePromosFromRewardPool
 2021-03-15 20:38:39 +00:00
Hans Mackowiak
6ad193a097 fix EnteredSinceYourLastTurn 2021-03-15 21:17:40 +01:00
Michael Kamensky
00cd5d2068 Merge branch 'validCardTraitBase' into 'master' 
isValid cardTraitBase

See merge request core-developers/forge!4202
 2021-03-15 18:22:24 +00:00
Hans Mackowiak
0dfe28a861 CardTraitBase: matchesValid as instance method, better use for isValid 
Conflicts:
	forge-gui/res/cardsfolder/d/day_of_the_dragons.txt
	forge-gui/res/cardsfolder/d/deputy_of_detention.txt
	forge-gui/res/cardsfolder/i/induced_amnesia.txt
	forge-gui/res/cardsfolder/l/living_lore.txt
	forge-gui/res/cardsfolder/p/phyrexian_devourer.txt
	forge-gui/res/cardsfolder/p/prototype_portal.txt
	forge-gui/res/cardsfolder/s/search_the_city.txt
	forge-gui/res/cardsfolder/s/skyclave_apparition.txt
	forge-gui/res/cardsfolder/s/soul_foundry.txt
	forge-gui/res/cardsfolder/s/strata_scythe.txt
	forge-gui/res/cardsfolder/s/sutured_ghoul.txt
 2021-03-15 18:22:24 +00:00
Michael Kamensky
f25d7246dc Merge branch 'UntilHostLeavesPlay' into 'master' 
ChangeZoneEffect: add UntilHostLeavesPlay to use GameCommand instead of StaticTrigger

See merge request core-developers/forge!4028
 2021-03-15 15:36:55 +00:00
Hans Mackowiak
34a813baeb ChangeZoneEffect: add UntilHostLeavesPlay to use GameCommand instead of StaticTrigger 2021-03-15 15:36:55 +00:00