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,509 Commits 33 Branches 187 Tags
057f5face3ee3f858e546b0e45aabce8f62cec7c
Commit Graph

36509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Misha Colbourne
789ed72689 DOM: Added some cards 2018-03-21 00:44:18 +00:00
Misha Colbourne
eebb1adbd8 DOM: Added some cards 2018-03-20 23:30:04 +00:00
Misha Colbourne
d4d75684b4 DOM: Added some cards 2018-03-20 23:03:14 +00:00
austinio7116
951a5dc978 Enabled team combo box on android now that multiplayer is possible, also attempted to prevent hanging on conceding in multiplayer games - only working on android so far 2018-03-20 21:53:06 +00:00
Michael Kamensky
7fab48ba9b Merge branch 'mobile-release' into 'master' 
Preparing Forge for Android publish 1.6.8.001 [incremental].

See merge request core-developers/forge!304
 2018-03-20 06:12:06 +00:00
Agetian
b2088e7cd2 - Preparing Forge for Android publish 1.6.8.001 [incremental]. 2018-03-20 09:10:54 +03:00
Blacksmith
04a39c34c6 Clear out release files in preparation for next release 2018-03-20 01:19:56 +00:00
Blacksmith
9e786bbdff [maven-release-plugin] prepare for next development iteration 2018-03-20 01:14:26 +00:00
Blacksmith
6e6af1c6c4 [maven-release-plugin] prepare release forge-1.6.8 forge-1.6.8 2018-03-20 01:14:23 +00:00
Blacksmith
394c048b21 Update README.txt for release 2018-03-20 01:12:53 +00:00
austinio7116
94e255b198 Fix for broken variants with new android multiplayer code 2018-03-19 12:52:49 +00:00
Michael Kamensky
8a41f8f476 Merge branch 'generated-stack-text' into 'master' 
improve the generated stack text for Brainstorm

Closes #350

See merge request core-developers/forge!303
 2018-03-19 06:04:58 +00:00
Sol
c680df8738 Merge branch 'multiplayer-platinum-angel' into 'master' 
Improve can't win/lose effects for multiplayer

Closes #170

See merge request core-developers/forge!302
 2018-03-18 21:26:19 +00:00
Jamin W. Collins
49f050655c improve the generated stack text for Brainstorm 
Fixes: core-developers/forge#350

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-18 15:21:15 -06:00
Jamin W. Collins
f270213bb7 Improve can't win/lose effects for multiplayer 
Fixes: core-developers/forge#170

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-18 13:38:49 -06:00
Michael Kamensky
6ed064eca6 Merge branch 'assorted-fixes' into 'master' 
Ethereal Armor: added a missing SVar reference.

See merge request core-developers/forge!301
 2018-03-18 17:18:17 +00:00
Agetian
d37f9a6ea1 - Ethereal Armor: added a missing SVar reference. 2018-03-18 20:16:28 +03:00
Michael Kamensky
ea7121f9d9 Merge branch 'newHexproof' into 'master' 
Hexproof: is now done as CantTarget

See merge request core-developers/forge!300
 2018-03-18 17:05:44 +00:00
Hanmac
9af8fddaf3 Hexproof: is now done as CantTarget with special shared handling 2018-03-18 15:31:19 +01:00
swordshine
b81fba82a5 Merge branch 'SellingLandsReplacement' into 'master' 
Selling lands fixes

See merge request core-developers/forge!273
 2018-03-18 09:17:52 +00:00
swordshine
fc220206d7 Merge branch 'patch' into 'master' 
DOM: Fixed some scripts

See merge request core-developers/forge!299
 2018-03-18 09:10:02 +00:00
swordshine
2686318c11 - DOM: Fixed some scripts 2018-03-18 17:08:47 +08:00
swordshine
869d32785d Merge branch 'cleanup-game-state' into 'master' 
Clean up GameState code

See merge request core-developers/forge!297
 2018-03-18 09:01:21 +00:00
swordshine
1e14373438 Merge branch 'patch' into 'master' 
DOM: Yet more new cards

See merge request core-developers/forge!298
 2018-03-18 08:55:03 +00:00
swordshine
e637874b85 Merge branch 'assorted-fixes' into 'master' 
Fixed Doomsday (the search effect was optional/arbitrary) and Stangg (the twin token was not exiled).

Closes #356 and #359

See merge request core-developers/forge!296
 2018-03-18 08:54:46 +00:00
Misha Colbourne
0a1efba7d9 DOM: Yet more new cards 2018-03-18 00:32:07 +00:00
Misha Colbourne
e7dca7ff6f Update whisper_blood_liturgist.txt 2018-03-18 00:30:22 +00:00
Misha Colbourne
93b552b33c DOM: Yet more new cards 2018-03-18 00:09:28 +00:00
Misha Colbourne
59a36015b6 DOM: Yet more new cards 2018-03-17 23:56:42 +00:00
Misha Colbourne
1ccf93b64b DOM: Yet more new cards 2018-03-17 23:37:39 +00:00
Misha Colbourne
b702effb60 DOM: Yet more new cards 2018-03-17 23:14:46 +00:00
Misha Colbourne
882218b493 DOM: Yet more new cards 2018-03-17 23:09:07 +00:00
Misha Colbourne
2ccfadc075 DOM: Yet more new cards 2018-03-17 23:02:13 +00:00
Agetian
9bf4bacaee - Fixed Stangg. 2018-03-17 19:50:42 +03:00
Agetian
e23f807e63 - Clean up some code ugliness and fix a meaningless "unknown key: turn" error message in GameState. 2018-03-17 17:15:25 +03:00
Agetian
b959f61049 - Doomsday search effect should not be optional. 
- Temporarily make it impossible to use the new mass selection code with cards that have the ChangeNum parameter on AF ChangeZone because it allows the human to select an arbitrarily small or big amount of cards without any limitation.
 2018-03-17 16:32:50 +03:00
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