external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,395 Commits 32 Branches 187 Tags
f44c6ac1a529e498be985b1184b7b95f95c1735c
Commit Graph

41395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hanmac
0c2cfdce34 TokenInfo: fix if script is null 2019-02-23 13:47:40 +01:00
Michael Kamensky
ea2b61cf5b Merge branch 'fix-ai-attack-token-round2' into 'master' 
Fix ai attack token round2

See merge request core-developers/forge!1414
 2019-02-23 05:07:11 +00:00
Chris H
ffda74101f Actually fix the crash in TokenAI.spawnToken for Attacking tokens 2019-02-22 21:50:35 -05:00
Chris H
08f47d58a1 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-22 19:55:26 -05:00
churrufli
f87f6bdebe undo translation in AddBasicLandsDialog.java 2019-02-22 17:35:37 +01:00
churrufli
2e70ab329e undo translation in AddBasicLandsDialog.java 2019-02-22 17:26:44 +01:00
churrufli
73749f28da Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-22 17:23:31 +01:00
churrufli
f7134f0a54 Translating hard-coded text to res en-US.properties 2019-02-22 16:53:57 +01:00
churrufli
231b2da573 Translating hard-coded text to res en-US.properties 2019-02-22 15:28:02 +01:00
churrufli
bf5c319bfe Merge remote-tracking branch 'origin/master' 2019-02-22 15:11:44 +01:00
churrufli
d781b6ba61 Translating hard-coded text to res en-US.properties 2019-02-22 15:10:54 +01:00
Michael Kamensky
98282acc60 Merge branch 'forums-bug-fix-attach-ai' into 'master' 
Fix the thing Sol told me to

See merge request core-developers/forge!1412
 2019-02-22 13:06:33 +00:00
Sol
d2917f0e43 Merge branch '850-untilyournextturn-incorrectly-ends-during-your-next-cleanup-phase' into 'master' 
Resolve "UntilYourNextTurn incorrectly ends during your next cleanup phase"

Closes #850

See merge request core-developers/forge!1409
 2019-02-22 12:58:14 +00:00
swordshine
919aecd9a1 Merge branch 'timmermac-sting-easy' into 'master' 
Add Sting deck by timmermac

See merge request core-developers/forge!1345
 2019-02-22 12:39:32 +00:00
swordshine
3c17b22a95 Merge branch 'cherry-pick-7d6a2618' into 'master' 
Make sure Token AI loads TokenScript params before doing things with hte token

See merge request core-developers/forge!1411
 2019-02-22 12:38:20 +00:00
Churrufli
da9373a0df Merge branch 'master' into 'master' 
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1410
 2019-02-22 06:51:50 +00:00
Churrufli
3631b8be75 Update en-US.properties 2019-02-22 06:46:32 +00:00
KrazyTheFox
63ec3aae87 Fix the thing Sol told me to 2019-02-21 23:48:38 -05:00
Chris H
46670d50f3 Make sure Token AI loads TokenScript params before doing things with hte token 
(cherry picked from commit 7d6a26184b4f852442730237826c94a16d739e5b)
 2019-02-22 04:19:55 +00:00
KrazyTheFox
1416b668a3 Add Sting deck description 2019-02-21 21:12:38 -05:00
Krazy
893cc3b08f Merge branch 'eclipse-cleanup' into 'master' 
Eclipse cleanup

Closes #844

See merge request core-developers/forge!1399
 2019-02-22 02:09:05 +00:00
churrufli
25858f625b Translating hard-coded text to res en-US.properties 2019-02-22 00:30:48 +01:00
Hanmac
9e6d9e8e30 PumpEffect: fixed Until Parameter for Player 2019-02-21 16:19:12 +01:00
Michael Kamensky
1244ac89fd Merge branch 'master' into 'master' 
Added puzzle PS_RNA4 - Possibility Storm: Ravnica Allegiance 04

See merge request core-developers/forge!1407
 2019-02-20 05:01:53 +00:00
Agetian
facf22c092 - Added puzzle PS_RNA4. 2019-02-20 08:01:02 +03:00
Michael Kamensky
d1895ef97e Merge branch 'patch-1' into 'master' 
Add m19 gift pack to Standard formats

See merge request core-developers/forge!1403
 2019-02-20 03:50:43 +00:00
Michael Kamensky
0575cd98d9 Merge branch 'patch-2' into 'master' 
Fix NPE in QuestController.java

See merge request core-developers/forge!1406
 2019-02-20 03:50:32 +00:00
Sol
2f466834f9 Update QuestController.java 2019-02-20 01:56:13 +00:00
Sol
3282ccf6b1 Fix NPE in QuestController.java 2019-02-20 01:49:59 +00:00
Sol
6ae7cddcb9 Merge branch 'master' into 'master' 
fix crash when showing uninitialized zone

See merge request core-developers/forge!1405
 2019-02-19 16:10:52 +00:00
Peter F. Patel-Schneider
0d79a84b9f tiny optimization 2019-02-19 10:51:41 -05:00
Peter F. Patel-Schneider
6fcb996938 fix crash when showing uninitialized zone 2019-02-19 08:10:09 -05:00
Sol
27651313a7 Update Modern.txt 2019-02-19 00:33:57 +00:00
Sol
9d762b5740 Merge branch 'master' into 'master' 
Update consecrate_consume.txt

See merge request core-developers/forge!1404
 2019-02-19 00:32:24 +00:00
T.J. Tillman
e51afbc21c Update consecrate_consume.txt 2019-02-19 00:06:21 +00:00
Chris H
0ca3378901 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-18 13:52:06 -05:00
Sol
b544718140 Merge branch 'master' into 'master' 
Use PeekAndReveal for Sunbird's Invocation

Closes #841

See merge request core-developers/forge!1395
 2019-02-18 16:47:42 +00:00
Sol
dc4b65593e Update Brawl.txt 2019-02-18 16:00:23 +00:00
Sol
5f5b34478d Update Standard.txt 2019-02-18 15:59:02 +00:00
Sol
64e7aa902b Update M19 Gift Pack.txt 2019-02-18 15:58:32 +00:00
tehdiplomat
f6f36b75d9 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-17 22:43:39 -05:00
Chris H
99b761082e Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-17 21:33:58 -05:00
Sol
29d917d8f5 Merge branch 'master' into 'master' 
preparing android build

See merge request core-developers/forge!1402
 2019-02-17 23:52:10 +00:00
Jamin W. Collins
63abdd6d00 preparing android build 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2019-02-17 14:09:54 -07:00
Blacksmith
e4d41001db Clear out release files in preparation for next release 2019-02-17 19:56:08 +00:00
Blacksmith
4ed17e1e16 [maven-release-plugin] prepare for next development iteration 2019-02-17 19:51:17 +00:00
Blacksmith
a70136c98c [maven-release-plugin] prepare release forge-1.6.21 forge-1.6.21 2019-02-17 19:51:13 +00:00
Blacksmith
e42f3f3369 Update README.txt for release 2019-02-17 19:48:59 +00:00
Hans Mackowiak
6fc53b8fe4 Merge branch 'fix-token-images' into 'master' 
Fix token images

See merge request core-developers/forge!1401
 2019-02-16 14:04:45 +00:00
Sol
557be177d8 Fix token images 2019-02-16 14:04:45 +00:00