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 |
|
swordshine
|
2797f95cd3
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!2264
|
2019-11-06 08:31:33 +00:00 |
|
austinio7116
|
5eb9be6248
|
Pioneer random quest mode
|
2019-11-06 08:07:21 +00:00 |
|
austinio7116
|
23eebf9037
|
Updated Modern and Standard Deckgen Data
|
2019-11-06 06:17:41 +00:00 |
|
CCTV-1
|
b59adab68d
|
added missing translation label
|
2019-11-06 10:45:44 +08:00 |
|
CCTV-1
|
b2d44105be
|
update simplified chinese translation
|
2019-11-06 10:44:19 +08:00 |
|
swordshine
|
2235546f2a
|
Merge branch 'translation10' into 'master'
More translations: New menu settings, Search, Priority, PayMana, Discard, Order, Exile, Delve, ...
See merge request core-developers/forge!2251
|
2019-11-06 01:04:53 +00:00 |
|
swordshine
|
59d104f68b
|
Merge branch 'pioneerdeckgen' into 'master'
Pioneer deckgen
See merge request core-developers/forge!2263
|
2019-11-06 01:04:07 +00:00 |
|
swordshine
|
6abdfd391d
|
Merge branch '1191-format-pioneer' into 'master'
Resolve "Format: pioneer"
Closes #1191
See merge request core-developers/forge!2250
|
2019-11-06 01:04:02 +00:00 |
|
Hans Mackowiak
|
a6ff0b5b10
|
Resolve "Format: pioneer"
|
2019-11-06 01:04:02 +00:00 |
|
austinio7116
|
02969cfe5b
|
Pioneer archetype deck generation added to UI
|
2019-11-05 23:02:58 +00:00 |
|
austinio7116
|
c6a2c35850
|
Pioneer initial meta
(cherry picked from commit af89555)
|
2019-11-05 22:37:00 +00:00 |
|
maustin
|
4c0a71f37d
|
Merge branch '1191-format-pioneer' of https://git.cardforge.org/core-developers/forge into pioneerdeckgen
|
2019-11-05 22:36:19 +00:00 |
|
Hans Mackowiak
|
74e3bd1895
|
Pionier: November 2019 Banned cards
|
2019-11-05 12:05:34 +00:00 |
|
Hans Mackowiak
|
121c9f5012
|
add PioneerPredicate to magicDb
|
2019-11-05 08:36:19 +00:00 |
|
Hans Mackowiak
|
7b1cd816b7
|
Update formats
|
2019-11-05 08:25:43 +00:00 |
|
Alessandro Coli
|
02ae8f8108
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git
|
2019-11-05 08:31:54 +01:00 |
|
Michael Kamensky
|
6a76cc8bc6
|
Merge branch 'newBranch' into 'master'
Update Network and Dependency files
See merge request core-developers/forge!2259
|
2019-11-04 16:44:48 +00:00 |
|
swordshine
|
9b9c38126e
|
Merge branch '1200-memory-theft-allows-discarding-of-a-land' into 'master'
Resolve "Memory Theft allows discarding of a land"
Closes #1200
See merge request core-developers/forge!2261
|
2019-11-04 14:26:01 +00:00 |
|
Michael Kamensky
|
e4ee0c768f
|
Merge branch 'ManaPoolHiddenCleanup' into 'master'
ManaPool: no hidden keyword there, so no need for extra cleanup
See merge request core-developers/forge!2262
|
2019-11-04 13:46:08 +00:00 |
|
Hans Mackowiak
|
340de153c8
|
ManaPool: no hidden keyword there, so no need for extra cleanup
|
2019-11-04 13:46:08 +00:00 |
|
Hans Mackowiak
|
2bf477102d
|
Update memory_theft: add nonLand part
|
2019-11-04 09:42:30 +00:00 |
|
Anthony Calosa
|
42a15b40b3
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-11-04 07:47:27 +08:00 |
|
Michael Kamensky
|
a2589cd433
|
Merge branch 'patch-5' into 'master'
Update net-decks.txt adding Current Pioneer Decks
See merge request core-developers/forge!2260
|
2019-11-03 13:49:24 +00:00 |
|
Churrufli
|
7ec7025ed4
|
Update net-decks.txt adding Current Pioneer Decks
|
2019-11-03 07:40:41 +00:00 |
|
Anthony Calosa
|
5edeb6df94
|
removed config (log4j2 uses alternate config via xml)
|
2019-11-02 10:12:59 +08:00 |
|
Anthony Calosa
|
001a1981cf
|
update log4j 1.2.17 -> log4j 2.11.2
(log4j 2.12.x latest needs higher Android API)
|
2019-11-02 10:07:13 +08:00 |
|