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
48,730 Commits 32 Branches 187 Tags
9f5931509ce0c7c06ebf628fa36574dd9c8b207c
Commit Graph

48730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
19d88abee0 Merge branch 'removeRememberMap' into 'master' 
Remove RememberMap, use EnteredSinceYourLastTurn instead

See merge request core-developers/forge!4201
 2021-03-15 13:07:58 +00:00
Hans Mackowiak
350fed6d77 Remove RememberMap, use EnteredSinceYourLastTurn instead 2021-03-15 13:39:34 +01:00
Michael Kamensky
f0b197e76d Merge branch 'improve_xitax_method' into 'master' 
Improve convertByXitaxMethod

Closes #1754

See merge request core-developers/forge!4200
 2021-03-15 05:17:55 +00:00
Anthony Calosa
9451a73f1e Improve convertByXitaxMethod 2021-03-15 11:46:29 +08:00
Michael Kamensky
a9a6e2b4d2 Merge branch 'quest-pool-nonpromo' into 'master' 
Exclude promos from Quest Mode starting pool and random reward pool

See merge request core-developers/forge!4196
 2021-03-15 03:37:26 +00:00
Michael Kamensky
203447e2b4 Merge branch 'master' into 'master' 
SVar:UntapMe

See merge request core-developers/forge!4198
 2021-03-14 10:57:11 +00:00
Hythonia
404e0bc453 Steel Overseer too 2021-03-14 11:56:15 +01:00
Hythonia
4688779358 UntapAi modifications 2021-03-14 11:50:40 +01:00
Michael Kamensky
4a85fdc87d Merge branch 'master' into 'master' 
Ikoria land fix

See merge request core-developers/forge!4197
 2021-03-14 08:37:02 +00:00
Hythonia
174ecd4de6 Update Ikoria Lair of Behemoths.txt 2021-03-14 07:24:35 +00:00
Michael Kamensky
147a85e0e5 - Clarification and announcement. 2021-03-14 09:55:18 +03:00
Michael Kamensky
1cd7e4e234 - An option to exclude promos from quest reward pool 2021-03-14 09:53:10 +03:00
Michael Kamensky
5cbc578a9c - Exclude promos from Quest Mode starting pool and random reward pool 2021-03-14 09:08:37 +03:00
Michael Kamensky
48784d267a Merge branch 'replace_begin_turn' into 'master' 
Re-implement skip turn using replacement effect

See merge request core-developers/forge!4191
 2021-03-14 04:53:55 +00:00
Alumi
c5ad28a65e Re-implement skip turn using replacement effect 2021-03-14 04:53:55 +00:00
Anthony Calosa
68ecf41511 [Mobile] add Experimental Rollback Phase 2021-03-14 11:57:20 +08:00
Hans Mackowiak
84aaccc3da CountersPutEffect: fixes ChoiceAmount when it can be Zero 2021-03-13 21:39:35 +01:00
Michael Kamensky
ccdb9090b5 Merge branch 'master' into 'master' 
Added announcements for the new Planar Conquest updates.

See merge request core-developers/forge!4194
 2021-03-13 17:34:14 +00:00
Michael Kamensky
fc324a1328 - Added announcements for the new Planar Conquest updates. 2021-03-13 20:33:43 +03:00
Michael Kamensky
1c4d97ed9b Merge branch 'unstable-plane' into 'master' 
Planar Conquest updates, Ikoria plane

See merge request core-developers/forge!4044
 2021-03-13 17:27:14 +00:00
Michael Kamensky
33b9de3fcc - Initial commit for Ikoria plane files. 
- Added C19 to Eldraine.
 2021-03-13 17:27:14 +00:00
Michael Kamensky
c6a0a1a886 Merge branch 'conditions' into 'master' 
Fix ConditionLifeTotal

See merge request core-developers/forge!4192
 2021-03-13 17:26:53 +00:00
Michael Kamensky
5ea7e13237 Merge branch 'SacrificeAllDelay' into 'master' 
SacrificeAllEffect: check timestamp for LKI objects

Closes #1032

See merge request core-developers/forge!4190
 2021-03-13 11:29:43 +00:00
tool4EvEr
e661b9c0b0 Fix ConditionLifeTotal 2021-03-13 11:52:12 +01:00
Hans Mackowiak
174836a57f SacrificeAllEffect: check timestamp for LKI objects 2021-03-13 10:39:59 +01:00
Michael Kamensky
a2e27f40c9 Merge branch 'fix_text_renderer' into 'master' 
[Mobile] Fix TextRenderer bug when hiding reminder texts

See merge request core-developers/forge!4189
 2021-03-13 06:05:56 +00:00
Lyu Zong-Hong
7e150fcfc4 Fix TextRenderer bug when hiding reminder texts 2021-03-13 12:50:00 +09:00
Michael Kamensky
72e0fb9137 Merge branch 'costdreams' into 'master' 
Fix Devastating Dreams Cost

See merge request core-developers/forge!4187
 2021-03-13 03:39:40 +00:00
Michael Kamensky
50e332c982 Merge branch 'update_japanese_translation' into 'master' 
Update Japanese Translations

See merge request core-developers/forge!4188
 2021-03-13 03:39:23 +00:00