external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,673 Commits 33 Branches 187 Tags
edabd66c9837f080ab52fe88ac76b05f5e627f85
Commit Graph

36673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
35245d5268 Cleaned up 3/4 player android code - ensured top to bottom turn order. 2018-03-16 08:24:51 +00:00
austinio7116
0781113fd9 Android 3/4 player working in landscape mode too 2018-03-15 20:36:04 +00:00
austinio7116
17e6c65652 Imrovements to layout of 3/4 player match view on android 2018-03-15 19:56:17 +00:00
austinio7116
2c15be8351 Alternative and better horizontal layout for 3/4 player games on Android 2018-03-15 12:00:48 +00:00
swordshine
fb3e5a68aa Merge branch 'patch' into 'master' 
DOM: Added some more Dominaria cards

See merge request core-developers/forge!294
 2018-03-15 06:22:33 +00:00
swordshine
ae17432ee3 Merge branch 'multi-select' into 'master' 
allow human players to make mass select, sometimes

See merge request core-developers/forge!293
 2018-03-15 06:21:43 +00:00
Jamin W. Collins
a564f49381 allow human players to make mass select, sometimes 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-14 20:32:25 -06:00
Misha Colbourne
e300bba4de Update rampaging_cyclops.txt 2018-03-15 02:29:35 +00:00
Misha Colbourne
23a5377e25 DOM: Added some more Dominaria cards 2018-03-15 02:19:55 +00:00
Misha Colbourne
ceaf19b9a1 DOM: Added some more Dominaria cards 2018-03-15 01:48:42 +00:00
Misha Colbourne
a144096ed3 DOM: Added some more Dominaria cards 2018-03-15 01:48:18 +00:00
swordshine
876083b085 Merge branch 'damageMap' into 'master' 
Damage map

See merge request core-developers/forge!252
 2018-03-15 01:00:20 +00:00
Misha Colbourne
7a4aa94b8b DOM: Added some more Dominaria cards 2018-03-15 00:14:19 +00:00
Misha Colbourne
f7e3497bd0 Merge branch 'patch' into 'master' 
Patch

See merge request OgreBattlecruiser/forge!1
 2018-03-15 00:08:51 +00:00
austinio7116
df61e5d9aa Update to android to support 3/4 player games 2018-03-14 23:05:07 +00:00
Misha Colbourne
d5872df7ed Fixed trigger description in vraskas_conquistador.txt 2018-03-14 22:48:28 +00:00
Misha Colbourne
dcecbd4e37 Update DeckFormat.java 2018-03-14 22:43:40 +00:00
Hanmac
9f7e02933f CostDamage: use spellAbility as cause 2018-03-14 07:15:04 +01:00
Hanmac
0b64ffb4c7 DamageMap: use cause for Lifelink part 2018-03-14 07:15:03 +01:00
Hanmac
51655cffe6 cards: remove PreventAllDamageBy 2018-03-14 07:15:03 +01:00
Hanmac
fffa4cf157 Card: move changed text and remove PreventAllDamageBy 2018-03-14 07:15:03 +01:00
Hanmac
c74b0a017b Damage: add Cause Param for damage deal, needed for Silhouette or Bronze Horse 2018-03-14 07:15:03 +01:00
Hanmac
70301e8e91 Blaze Commando: it is a DamageDoneOnce trigger 2018-03-14 07:15:03 +01:00
Hans Mackowiak
b88b0ec271 Master of Wild Hunt: add DamageMap 2018-03-14 07:15:03 +01:00
Hans Mackowiak
8ac13c0d6d RepeatEachEffect: reset damageMap after being used 2018-03-14 07:15:02 +01:00
Hanmac
79c43d7c9f cards: update cards with DamageMap 2018-03-14 07:15:02 +01:00
Hanmac
e9c02edfae DamageMap: use DamageMap for RepeatEach cards and similar 2018-03-14 07:15:02 +01:00
swordshine
47ea767348 Merge branch 'patch-2' into 'master' 
Fix filename - lyra_dawnbriger.txt to lyra_dawnbringer.txt

See merge request core-developers/forge!291
 2018-03-14 04:26:23 +00:00
Misha Colbourne
718762f0e0 Fix filename - lyra_dawnbriger.txt to lyra_dawnbringer.txt 2018-03-14 04:20:18 +00:00
swordshine
025da50f14 Merge branch 'patch' into 'master' 
DOM: Added some new Dominaria cards

See merge request core-developers/forge!290
 2018-03-14 04:17:50 +00:00
Misha Colbourne
d630e34249 Update lyra_dawnbriger.txt 2018-03-14 04:15:11 +00:00
Misha Colbourne
320b3cc885 Delete voltaic_servant.txt 2018-03-14 04:09:21 +00:00
Misha Colbourne
6d5d8efe1f Delete lyra_dawnbringer.txt 2018-03-14 04:08:13 +00:00
Misha Colbourne
e75bef451b Update territorial_allosaurus.txt 2018-03-14 03:34:51 +00:00
Misha Colbourne
12c84196f3 Update DeckFormat.java 2018-03-14 03:31:29 +00:00
Misha Colbourne
749b2ba7cb Update broken_bond.txt 2018-03-14 03:28:21 +00:00
Misha Colbourne
828e96fa90 Update baloth_gorger.txt 2018-03-14 03:24:50 +00:00
Misha Colbourne
c3643bb1e2 Update ancient_animus.txt 2018-03-14 03:21:21 +00:00
Misha Colbourne
59bb6d67a0 Update academy_journeymage.txt 2018-03-14 03:20:28 +00:00
Misha Colbourne
e11da6d01e DOM: Added some new Dominaria cards 2018-03-14 00:59:20 +00:00
Misha Colbourne
ea2764c5ba DOM: Added some new Dominaria cards 2018-03-14 00:35:30 +00:00
Misha Colbourne
120b3533bc DOM: Added some new Dominaria cards 2018-03-14 00:31:54 +00:00
swordshine
5e00a60eaa Merge branch 'patch' into 'master' 
- Added a few new cards

See merge request core-developers/forge!289
 2018-03-14 00:31:17 +00:00
Misha Colbourne
9d20ab4dad DOM: Added some new Dominaria cards 2018-03-14 00:17:12 +00:00
Misha Colbourne
b06b9ea379 DOM: Added some new Dominaria cards 2018-03-14 00:11:18 +00:00
Misha Colbourne
5bc415513b DOM: Added some new Dominaria cards 2018-03-13 23:50:04 +00:00
Misha Colbourne
9948fd4bf4 DOM: Added some new Dominaria cards 2018-03-13 23:29:04 +00:00
Misha Colbourne
ff66f3c8dd DOM: Added some new Dominaria cards 2018-03-13 23:15:22 +00:00
Misha Colbourne
f75f88435c DOM: Added some new Dominaria cards 2018-03-13 22:45:21 +00:00
Misha Colbourne
4efd0c96d1 DOM: Added some new Dominaria cards 2018-03-13 22:30:02 +00:00