Anthony Calosa
|
fe5d8e537c
|
Fix game pause
|
2019-11-15 11:14:54 +08:00 |
|
Anthony Calosa
|
d943891e4f
|
additional check (prevent npe on mojhosto)
|
2019-11-15 10:11:57 +08:00 |
|
Anthony Calosa
|
da3d1d7099
|
Update
|
2019-11-15 08:56:35 +08:00 |
|
Anthony Calosa
|
86dd21ae7b
|
Fix permanents not updating when animated to creature.
|
2019-11-15 06:57:43 +08:00 |
|
Hans Mackowiak
|
2d30184f76
|
Merge branch 'combatPhaseHandlerFix' into 'master'
Combat: initConstraints before Declare Attackers
See merge request core-developers/forge!2281
|
2019-11-14 11:12:31 +00:00 |
|
Hans Mackowiak
|
271063934a
|
Combat: initConstraints before Declare Attackers
|
2019-11-14 11:12:31 +00:00 |
|
Alessandro Coli
|
3fb601adfb
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git
|
2019-11-13 19:23:30 +01:00 |
|
swordshine
|
757e11af42
|
Merge branch 'patch-8' into 'master'
November 11, 2019 Pioneer Banned Announcement
See merge request core-developers/forge!2280
|
2019-11-13 00:54:19 +00:00 |
|
Hans Mackowiak
|
7ec12fb58d
|
November 11, 2019 Pioneer Banned Announcement
|
2019-11-13 00:54:18 +00:00 |
|
Hans Mackowiak
|
6c9cf02884
|
Merge branch 'newBranch' into 'master'
Fix Amass ability (Woodland Champion and Dreadhorde Invasion)
See merge request core-developers/forge!2279
|
2019-11-12 12:13:36 +00:00 |
|
Anthony Calosa
|
0c904e208a
|
Add AmassTrigger Test
(If Woodland Champion will trigger from Eternal Skylord Amass Ability)
|
2019-11-12 19:49:01 +08:00 |
|
swordshine
|
d12a898333
|
Merge branch 'seven-dwarves' into 'master'
Add 7 Dwarves
See merge request core-developers/forge!2278
|
2019-11-12 07:52:57 +00:00 |
|
Anthony Calosa
|
0e665dc673
|
Fix Amass ability (Woodland Champion and Dreadhorde Invasion)
|
2019-11-12 13:31:16 +08:00 |
|
tehdiplomat
|
02299a0400
|
Add 7 Dwarves
|
2019-11-11 14:12:49 -05:00 |
|
Michael Kamensky
|
86d7069626
|
Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.30.001 [incremental].
See merge request core-developers/forge!2277
|
2019-11-11 05:17:32 +00:00 |
|
Agetian
|
776b865761
|
- Preparing Forge for Android publish 1.6.30.001 [incremental].
|
2019-11-11 08:10:57 +03:00 |
|
Blacksmith
|
a3a4ef22df
|
Clear out release files in preparation for next release
|
2019-11-11 02:50:48 +00:00 |
|
Blacksmith
|
c2db78baf7
|
[maven-release-plugin] prepare for next development iteration
|
2019-11-11 02:45:55 +00:00 |
|
Blacksmith
|
9a30d78f54
|
[maven-release-plugin] prepare release forge-1.6.30
forge-1.6.30
|
2019-11-11 02:45:50 +00:00 |
|
Blacksmith
|
db98ce160b
|
Update README.txt for release
|
2019-11-11 02:43:16 +00:00 |
|
Sol
|
ce8b5b53e0
|
Merge branch 'update-release-files' into 'master'
Update Release files
See merge request core-developers/forge!2276
|
2019-11-11 02:32:02 +00:00 |
|
Sol
|
0c4055726c
|
Update ANNOUNCEMENTS.txt
|
2019-11-11 02:26:43 +00:00 |
|
Michael Kamensky
|
64ae4bae0c
|
Merge branch 'newBranch' into 'master'
Update some GUI elements on Mobile Networkplay
See merge request core-developers/forge!2274
|
2019-11-10 06:21:46 +00:00 |
|
Anthony Calosa
|
044cc793e8
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-11-09 21:04:48 +08:00 |
|
Alessandro Coli
|
ca81b2b55c
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git
|
2019-11-09 12:59:40 +01:00 |
|
Michael Kamensky
|
e310dc30d7
|
Merge branch 'pioneerdeckgen' into 'master'
Updated standard deckgen data
See merge request core-developers/forge!2275
|
2019-11-09 11:41:28 +00:00 |
|
Anthony Calosa
|
f239755249
|
Fix "controls" when alternating human vs ai, then ai vs ai play on mobile forge,
update refreshfield, update targeting arrows on 3 to 4 players
(shows attacked player on 3/4 player match...)
|
2019-11-09 19:28:21 +08:00 |
|
austinio7116
|
57686c0554
|
Updated standard deckgen data
(cherry picked from commit 75f1a60)
|
2019-11-09 09:04:06 +00:00 |
|
Anthony Calosa
|
5ecde572c3
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-11-09 06:27:14 +08:00 |
|
Anthony Calosa
|
23e9974950
|
Update some GUI elements on networkplay -> client
|
2019-11-09 06:20:13 +08:00 |
|
Anthony Calosa
|
ec98d128f1
|
prevent npe mojhosto
|
2019-11-09 06:16:58 +08:00 |
|
swordshine
|
5c07951604
|
Merge branch 'german-translation' into 'master'
fix typos
See merge request core-developers/forge!2273
|
2019-11-08 00:43:36 +00:00 |
|
Dagin Svezek
|
7be34625f6
|
fix typos
|
2019-11-07 14:03:24 +00:00 |
|
Alessandro Coli
|
f15762b746
|
Introduction of "wild duels" in quest
|
2019-11-07 13:26:22 +01:00 |
|
Alessandro Coli
|
e365e78756
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git
|
2019-11-07 13:23:11 +01:00 |
|
swordshine
|
5f6cb893ef
|
Merge branch 'master' into 'master'
Added puzzle PS_ELD4. Added the relevant functionality to GateState and fixed a NPE.
See merge request core-developers/forge!2271
|
2019-11-07 06:17:25 +00:00 |
|
Agetian
|
3b636be2fe
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2019-11-07 08:10:19 +03:00 |
|
Agetian
|
1af940b034
|
- Simpler adventure card detection.
|
2019-11-07 08:08:03 +03:00 |
|
Agetian
|
8cb1789e60
|
- Added puzzle PS_ELD4.
- Added OnAdventure functionality to game states.
- Fixed a NPE when dev-adding a card to exile.
|
2019-11-07 08:06:31 +03:00 |
|
Michael Kamensky
|
01782de3a6
|
Merge branch 'patch-7' into 'master'
Update de-DE.properties from forum (twosat user)
See merge request core-developers/forge!2270
|
2019-11-07 04:02:59 +00:00 |
|
Michael Kamensky
|
3a7e35c51d
|
Merge branch 'cardtranslationforgecore' into 'master'
Moved CardTranslation to forge-core.
See merge request core-developers/forge!2253
|
2019-11-07 04:02:57 +00:00 |
|
swordshine
|
bff24a1d3d
|
Merge branch 'patch-6' into 'master'
Replace sprite_icons.png in darkred skin
See merge request core-developers/forge!2269
|
2019-11-07 00:52:17 +00:00 |
|
swordshine
|
8a075000a2
|
Merge branch 'patch-5' into 'master'
Replace bg_splash.png in Darkred skin
See merge request core-developers/forge!2268
|
2019-11-07 00:52:05 +00:00 |
|
Churrufli
|
5e0761d085
|
Update de-DE.properties from forum (twosat user)
|
2019-11-06 23:33:57 +00:00 |
|
Churrufli
|
2184ddf1bb
|
Replace sprite_icons.png in darkred skin
|
2019-11-06 17:54:06 +00:00 |
|
Churrufli
|
fd032f6ccd
|
Replace bg_splash.png in Darkred skin
|
2019-11-06 17:52:30 +00:00 |
|
Hans Mackowiak
|
164c819523
|
Merge branch 'patch-5' into 'master'
Update dread_warlock: added Warlock type
See merge request core-developers/forge!2267
|
2019-11-06 15:06:41 +00:00 |
|
Hans Mackowiak
|
987043ead2
|
Update dread_warlock: added Warlock type
|
2019-11-06 15:06:41 +00:00 |
|
swordshine
|
4aa9c224d0
|
Merge branch 'pioneerrandomquestworld' into 'master'
Pioneer random quest mode
See merge request core-developers/forge!2266
|
2019-11-06 08:32:13 +00:00 |
|
swordshine
|
2ac6fa4542
|
Merge branch 'elddeckgendata' into 'master'
Updated Modern and Standard Deckgen Data
See merge request core-developers/forge!2265
|
2019-11-06 08:31:48 +00:00 |
|