external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,534 Commits 34 Branches 187 Tags
257dbc6b51aaf96edb38796bfa08d0e81257a658
Commit Graph

59534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
ffe451246c Merge pull request #1287 from kevlahnota/master 
fix black texture on card list view
 2022-08-07 22:20:53 +08:00
Anthony Calosa
7cea9c3973 fix black texture on adventure mode list view 
- needs to clear card art cache when unloading card textures
- minor speedup on startup on selector adventure settings
 2022-08-07 22:14:58 +08:00
Anthony Calosa
7803a54857 Update frost_bite.txt 2022-08-07 21:05:19 +08:00
Simisays
b77464622b YSNC Loose in the Park (#1265) 
* Create loose_in_the_park.txt

Card script for the card Loose in the Park from New Capenna Alchemy
https://scryfall.com/card/ysnc/14/loose-in-the-park

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt

* Update loose_in_the_park.txt
 2022-08-07 08:08:27 +03:00
Anthony Calosa
d584b4195d Merge branch 'master' into newmaster 2022-08-07 07:42:10 +08:00
Anthony Calosa
acd06a2d94 Merge pull request #1285 from tool4ever/viewPT 
CardView: display expected P/T for unanimated vehicles
 2022-08-07 07:39:18 +08:00
tool4EvEr
f3949a7177 display expected P/T for unanimated vehicles 2022-08-07 00:17:29 +02:00
Grimm
f9be819925 Adventure 
removed debug log
  adjusted some terrain
 2022-08-06 22:40:26 +02:00
Grimm
f45555686e changed road algo 
added WaveFunctionCollapse to create biome structures
changed world generation.
added overworld collision for enemies.
 2022-08-06 21:46:54 +02:00
Grimm
7dd79768e4 adventure Editor rework 2022-08-06 21:46:54 +02:00
Anthony Calosa
6ae171f7fc fix dual choices and alternate view on confirm action 2022-08-06 21:45:57 +02:00
Grimm
bc16d30ce5 Merge remote-tracking branch 'origin/adventure' into adventure 
# Conflicts:
#	forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java
#	forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java
#	forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java
#	forge-adventure/src/main/java/forge/adventure/editor/SwingAtlas.java
#	forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java
#	forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java
#	forge-gui-mobile/src/forge/adventure/data/BiomeData.java
#	forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
#	forge-gui-mobile/src/forge/adventure/data/WorldData.java
#	forge-gui-mobile/src/forge/adventure/util/RewardActor.java
#	forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
#	forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
#	forge-gui-mobile/src/forge/adventure/world/World.java
#	forge-gui/res/adventure/Shandalar/world/green.json
#	forge-gui/res/adventure/Shandalar/world/tilesets/forest.png
 2022-08-06 21:11:56 +02:00
Grimm
f6bec79a28 changed road algo 
added WaveFunctionCollapse to create biome structures
changed world generation.
added overworld collision for enemies.
 2022-08-06 21:10:18 +02:00
Anthony Calosa
235d357844 Merge branch 'master' into newmaster 2022-08-07 00:13:12 +08:00
Anthony Calosa
4d9c357962 Merge pull request #1278 from kevlahnota/master 
fix dual choices and alternate view on confirm action
 2022-08-06 21:16:54 +08:00
Anthony Calosa
d963a3e13c Merge branch 'master' into newmaster 2022-08-06 13:02:15 +08:00
Anthony Calosa
4cdf7829c2 fix dual choices and alternate view on confirm action 2022-08-06 12:32:43 +08:00
Grimm
03aac93b26 Merge branch 'master' of https://github.com/TrueFuFLeaderG/forge into adventure 
 Conflicts:
	forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java
	forge-adventure/src/main/java/forge/adventure/editor/PointOfInterestEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java
	forge-adventure/src/main/java/forge/adventure/editor/StructureEditor.java
	forge-adventure/src/main/java/forge/adventure/editor/SwingAtlasPreview.java
	forge-adventure/src/main/java/forge/adventure/editor/WorldEditor.java
	forge-gui-mobile/src/forge/adventure/data/BiomeData.java
	forge-gui-mobile/src/forge/adventure/data/BiomeStructureData.java
	forge-gui-mobile/src/forge/adventure/data/WorldData.java
	forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
	forge-gui-mobile/src/forge/adventure/world/BiomeStructure.java
	forge-gui-mobile/src/forge/adventure/world/BiomeTexture.java
	forge-gui-mobile/src/forge/adventure/world/World.java
	forge-gui/res/adventure/Shandalar/world/green.json
 2022-08-05 22:47:31 +02:00
Grimm
605c232dea wavefunction collapse first integration 2022-08-05 22:41:05 +02:00
Grimm
cdd72d138b AdventureEditor: added editors 2022-08-05 22:41:05 +02:00
Grimm
93ac9fd7fe adventure Editor rework 2022-08-05 18:14:51 +02:00
Anthony Calosa
d2338261fd Merge pull request #1276 from kevlahnota/master 
try to fix bug getting default font not correctly setting the scale to 1
 2022-08-05 20:58:05 +08:00
Anthony Calosa
4e2435ebf7 try to fix bug getting default font not correctly setting the scale to 1 2022-08-05 20:50:01 +08:00
Paul Hammerton
c069941f85 Merge pull request #1275 from Card-Forge/kevlahnota-patch-3 
Create altar_of_bhaal_bone_offering.txt
 2022-08-05 10:47:59 +01:00
Anthony Calosa
eed64fd84e Create altar_of_bhaal_bone_offering.txt 2022-08-05 17:44:00 +08:00
Anthony Calosa
205973858f Merge pull request #1272 from kevlahnota/master 
landscape and portrait settings for reward/shop card display/tooltips
 2022-08-05 16:37:47 +08:00
Anthony Calosa
6b0847159d unused import 2022-08-05 14:23:01 +08:00
Anthony Calosa
d15cf79598 cleanup 2022-08-05 14:17:22 +08:00
Anthony Calosa
99222e6fa5 landscape and portrait settings for reward/shop card display/tooltips 
- user can adjust the values seperately for landscape or portrait mode
 2022-08-05 14:12:22 +08:00
Suthro
f595978575 HBG: 6 card scripts (#1267) 
* HBG: Calim, Djinn Emperor + 2 cards

HBG: Add scripts for Calim, Oyaminartok, and You Line Up the Shot.

- Calim, Djinn Emperor
- Oyaminartok, Polar Werebear
- You Line Up the Shot

* HBG: 6 cards

HBG: Add scripts for six HBG alchemy cards

- Chaos Balor
- Craving of Yeenoghu
- Grave Choice
- Hook Horror
- Patriar's Humiliation
- Seek New Knowledge

* HBG: Signature Spells + 2 cards

HBG: Add scripts for 3 HBG alchemy cards

- Signature Spells
- Sune's Intervention
- Uthgardt Fury
 2022-08-05 07:20:37 +03:00
Suthro
a633687acf Merge branch 'master' of https://github.com/Suthro/forge_scripttesting 2022-08-04 21:59:05 -05:00
Suthro
671254c3ef HBG: Signature Spells + 2 cards 
HBG: Add scripts for 3 HBG alchemy cards

- Signature Spells
- Sune's Intervention
- Uthgardt Fury
 2022-08-04 21:59:02 -05:00
Anthony Calosa
1759a94cdc remove duplicate setting 2022-08-05 10:46:44 +08:00
Anthony Calosa
e718bd7050 Merge pull request #1271 from kevlahnota/master 
setting for card display/tooltip on adventure rewards/shops
 2022-08-05 10:32:15 +08:00
Anthony Calosa
745d71745e setting for card display/tooltip on adventure rewards/shops 
- add support for various display aspect ratio
 2022-08-05 10:26:32 +08:00
Anthony Calosa
f04b34e137 Merge pull request #1270 from kevlahnota/master 
minor adjustments on tooltips
 2022-08-05 06:50:18 +08:00
Anthony Calosa
f8b5736866 Merge pull request #1268 from Simisays/master 
YSNC Syndicate Recruiter
 2022-08-05 06:48:22 +08:00
Anthony Calosa
efc5002bb7 minor adjustments on tooltips 2022-08-05 06:46:02 +08:00
Anthony Calosa
68eadd65b3 Merge pull request #1266 from tool4ever/fewfixes 
Fix PT update before turning into creature
 2022-08-05 06:24:18 +08:00
tool4EvEr
caad3bff44 Fix logic from refactoring 2022-08-04 23:04:35 +02:00
tool4EvEr
e75c456524 Extort fix 2022-08-04 21:23:16 +02:00
Simisays
2566029996 Merge pull request #2 from Simisays/Simisays-patch-2 
YSNC Syndicate Recruiter
 2022-08-04 21:12:44 +02:00
Simisays
189149eb90 Create syndicate_recruiter.txt 2022-08-04 21:09:18 +02:00
Suthro
c6807f1b14 Merge branch 'Card-Forge:master' into master 2022-08-04 13:51:05 -05:00
Suthro
02480233a9 Merge branch 'master' of https://github.com/Suthro/forge_scripttesting 2022-08-04 13:50:49 -05:00
Suthro
3c2769dcd5 HBG: 6 cards 
HBG: Add scripts for six HBG alchemy cards

- Chaos Balor
- Craving of Yeenoghu
- Grave Choice
- Hook Horror
- Patriar's Humiliation
- Seek New Knowledge
 2022-08-04 13:50:46 -05:00
Paul Hammerton
91c389318f Merge pull request #1261 from Simisays/Simisays-patch-1 
[YSNC] Spelldrain Assassin
 2022-08-04 18:37:04 +01:00
tool4EvEr
f1fb414ebe Fix targeting abilities 2022-08-04 19:29:22 +02:00
Simisays
b6868be9cc Update spelldrain_assassin.txt 2022-08-04 19:28:54 +02:00
tool4EvEr
ca30c31975 View fix 2022-08-04 19:28:45 +02:00