external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,653 Commits 32 Branches 187 Tags
eb4b4a6adb6af358b6c7f11fcde35db59caba60c
Commit Graph

60653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
9b9304266d 5x 40K with Ravenous kw 2022-09-17 21:53:38 -05:00
Northmoc
634a6f2509 add Ravenous keyword 2022-09-17 21:53:00 -05:00
Grimm
a601ef5ec7 integrating TextraLabel into adventure ui 2022-09-18 03:10:57 +02:00
Northmoc
0b0037734c Merge pull request #1530 from Simisays/Warhammer-3 
40K 8 more + 2 tokens
 2022-09-17 19:50:36 -04:00
Northmoc
f726d1957f add Miracle keyword parsing for non instant/sorcery 2022-09-17 18:44:53 -05:00
Northmoc
9d3e9cd4a2 ultramarines_honour_guard.txt fix spelling 2022-09-17 18:39:18 -05:00
Northmoc
fa7b589b70 remaining Squad cards 2022-09-17 18:31:11 -05:00
Paul Hammerton
00f62e7e1a Merge pull request #1538 from paulsnoops/40k_edition_update 
40K finalised edition
 2022-09-17 22:48:36 +01:00
paulsnoops
b0886d3592 40K finalised edition 2022-09-17 22:44:45 +01:00
Simisays
12dd4b818e update 2022-09-17 22:21:52 +02:00
Simisays
ac04888f18 update 2022-09-17 22:10:10 +02:00
Simisays
7b25493fdf update 2022-09-17 20:13:24 +02:00
Simisays
7040cda9e9 update 2022-09-17 19:45:20 +02:00
Simisays
bc8ffad238 Update c_1_1_a_insect_flying.txt 2022-09-17 00:03:20 +02:00
Simisays
544ea77aea Update canoptek_scarab_swarm.txt 2022-09-16 23:30:54 +02:00
Simisays
40146038ef Update canoptek_scarab_swarm.txt 2022-09-16 23:27:59 +02:00
Simisays
be99787365 Rename c_1_1_insect_artifact_flying.txt to c_1_1_a_insect_flying.txt 2022-09-16 23:27:09 +02:00
Simisays
8f5cbf434c Update aspiring_champion.txt 2022-09-16 23:15:32 +02:00
Simisays
660e802a63 Update aspiring_champion.txt 2022-09-16 23:09:52 +02:00
Simisays
55cd685f54 Update canoptek_scarab_swarm.txt 2022-09-16 23:09:07 +02:00
Simisays
45b77e09d3 Update aspiring_champion.txt 2022-09-16 22:35:56 +02:00
Simisays
707e7ce6e7 Update c_1_1_insect_artifact_flying.txt 2022-09-16 22:12:27 +02:00
Simisays
65486e81f1 Update canoptek_tomb_sentinel.txt 2022-09-16 22:11:51 +02:00
Simisays
acbe1c89ff Update canoptek_spyder.txt 2022-09-16 22:11:14 +02:00
Simisays
1c78f799e2 Update canoptek_scarab_swarm.txt 2022-09-16 22:10:29 +02:00
Simisays
70e5409597 Update bloodthirster.txt 2022-09-16 22:09:41 +02:00
Simisays
caae27144e Update biotransference.txt 2022-09-16 22:09:02 +02:00
Simisays
10e83e0cc9 Update aspiring_champion.txt 2022-09-16 22:08:25 +02:00
Simisays
4aa33f8d53 update 2022-09-16 22:06:41 +02:00
Simisays
6156454f77 Create canoptek_spyder.txt 2022-09-16 21:34:17 +02:00
Simisays
c1ede1f43b update 2022-09-16 21:28:05 +02:00
Simisays
2e3632441f update 2022-09-16 20:59:12 +02:00
Simisays
9dc796b5dc update 2022-09-16 20:44:20 +02:00
Grimm
fbd888f290 Merge branch 'master' of https://github.com/Card-Forge/forge into adventure 
 Conflicts:
	forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
	forge-gui-mobile/src/forge/adventure/scene/HudScene.java
	forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java
	forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
	forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
	forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
	forge-gui-mobile/src/forge/adventure/scene/StartScene.java
	forge-gui-mobile/src/forge/adventure/scene/UIScene.java
	forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
	forge-gui-mobile/src/forge/adventure/stage/GameStage.java
	forge-gui-mobile/src/forge/adventure/stage/MapStage.java
	forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
 2022-09-16 18:35:47 +02:00
Grimm
0777d84325 Merge remote-tracking branch 'origin/adventure' into adventure 
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/world/World.java
#	forge-gui/res/adventure/Shandalar/world/tilesets/autotiles.png
#	forge-gui/res/adventure/Shandalar/world/tilesets/structures.png
 2022-09-16 18:14:39 +02:00
Grimm
5bae834f09 Render world map with more details 
Changed SpellSmithScene to not display empty edition and fixed edition filter.
 2022-09-16 18:13:13 +02:00
Paul Hammerton
6f64c7851d Merge pull request #1532 from paulsnoops/edition_updates 
Update editions, DMU rankings and TypeLists (for 40k)
 2022-09-16 08:19:28 +01:00
paulsnoops
904a98a1bf update dmu draft 2022-09-16 08:16:34 +01:00
paulsnoops
0dd2efe2f5 Update editions and TypeLists.txt 2022-09-16 08:09:13 +01:00
Simisays
91d227e910 Update tyranid_invasion.txt 2022-09-16 08:41:28 +02:00
Simisays
56272e3752 Update malanthrope.txt 2022-09-16 08:40:45 +02:00
Simisays
ab34e089ed Update lictor.txt 2022-09-16 08:40:32 +02:00
Anthony Calosa
a4bacaef52 Merge pull request #1527 from Northmoc/1520 
fixes for 40k cards
 2022-09-16 10:34:20 +08:00
Grimm
b61a48514e Render world map with more details 
Changed SpellSmithScene to not display empty edition and fixed edition filter.
 2022-09-16 02:28:43 +02:00
Northmoc
d7a51ece0e Squad keyword and vanguard_suppressor.txt 2022-09-15 20:15:56 -04:00
Simisays
1921c0861b Update winged_hive_tyrant.txt 2022-09-15 21:32:53 +02:00
Simisays
d2c9456bac Update lictor.txt 2022-09-15 21:23:09 +02:00
Simisays
ef4836ca10 Update keeper_of_secrets.txt 2022-09-15 21:22:28 +02:00
Simisays
ed915e3650 Update malanthrope.txt 2022-09-15 21:21:12 +02:00
Simisays
3c331ca854 update 2022-09-15 21:17:40 +02:00