external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,703 Commits 31 Branches 187 Tags
c0b76016f1880ee4daeb40c20c5e92d8bd44703f
Commit Graph

40703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
c0b76016f1 Merge branch 'master' into 'master' 
Added puzzle PS_WAR0 (Possibility Storm - War of the Spark Card Preview Puzzle).

See merge request core-developers/forge!1526
 2019-04-10 11:02:05 +00:00
Agetian
ff45188dff - Added puzzle PS_WAR0. 2019-04-10 14:01:16 +03:00
swordshine
257ba16c5b Merge branch 'war_proliferate' into 'master' 
War: Proliferate: rework effect now put each counter type on it

Closes #930

See merge request core-developers/forge!1501
 2019-04-10 10:23:00 +00:00
Hans Mackowiak
2617795e37 War: Proliferate: rework effect now put each counter type on it 2019-04-10 10:23:00 +00:00
swordshine
5c95216d9d Merge branch '929-war-amass-keyword-action' into 'master' 
Resolve "WAR: Amass Keyword Action"

Closes #929

See merge request core-developers/forge!1495
 2019-04-10 07:46:28 +00:00
Hanmac
e2c175439f Amass: more cards 2019-04-10 08:13:22 +02:00
Hanmac
94b2dfc282 Amass: better AI logic for token create 2019-04-10 08:13:22 +02:00
Agetian
d5c8aa765f - A little bit more AmassAi logic: check if the token will survive, also check if the counters will actually be placed on the Army. 2019-04-10 08:13:22 +02:00
Agetian
9d75d13be1 - AmassAi: check if a counter will be placed on the creature if the AI controls an Army. 2019-04-10 08:13:22 +02:00
Agetian
7025098797 - Use the newer checkApiLogic call for AmassAi, also override doTriggerAINoCost (basic for now, will always return true until checkApiLogic is improved). 2019-04-10 08:13:22 +02:00
Agetian
9157fa728b - Amass AI: basic implementation, currently just accepts and selects the best Army creature in play if available. To be improved. 2019-04-10 08:13:22 +02:00
Hanmac
64f17935e5 Amass: add new Keyword Action for War of the Spark 2019-04-10 08:13:22 +02:00
swordshine
d2143e2f2a Merge branch 'patch' into 'master' 
Update scripts

See merge request core-developers/forge!1523
 2019-04-10 01:09:03 +00:00
swordshine
a969d9d615 Update scripts 2019-04-10 09:08:00 +08:00
swordshine
2041b9da1a Merge branch 'master' into 'master' 
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1506
 2019-04-10 01:01:58 +00:00
swordshine
1d6beb1085 Merge branch 'warcards2' into 'master' 
Today's easy WAR spoilers, plus a couple of corrections from discord

See merge request core-developers/forge!1521
 2019-04-10 01:00:49 +00:00
swordshine
16a662ab30 Merge branch 'patch-2' into 'master' 
Fix Daxos' wb_x_x_e_spirit_experience.txt token

See merge request core-developers/forge!1522
 2019-04-10 00:57:47 +00:00
Sol
d0c39e7b14 Fix Daxos' wb_x_x_e_spirit_experience.txt token 2019-04-10 00:14:17 +00:00
churrufli
fdf3d3588e updating res files 2019-04-10 00:44:52 +02:00
churrufli
da4f1ade9d Merge remote-tracking branch 'origin/master' 2019-04-10 00:21:04 +02:00
austinio7116
07e327828d Fixed various issues from MR comments 
Added wizard tokenscript
 2019-04-09 17:09:56 +01:00
Churrufli
2db2ba5375 Update en-US.properties 2019-04-09 12:34:32 +00:00
churrufli
b4448b9384 updating res files 2019-04-09 14:33:23 +02:00
churrufli
cc19b2b39e Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-04-09 14:21:03 +02:00
austinio7116
abea68241e Today's easy WAR spoilers, plus a couple of corrections from discord 
(cherry picked from commit 0bc43de)
 2019-04-09 06:58:36 +01:00
swordshine
64eacd07a1 Merge branch 'fix-counterbalance-crash' into 'master' 
Fix counterbalance crashing on an empty library

See merge request core-developers/forge!1520
 2019-04-09 02:30:43 +00:00
Chris H
e0101ebb7b Fix counterbalance crashing on an empty library 2019-04-08 20:58:47 -04:00
swordshine
cdc032b39f Merge branch 'guild-kits-2' into 'master' 
GK2 decks

See merge request core-developers/forge!1518
 2019-04-09 00:48:53 +00:00
swordshine
e48858b4ce Merge branch 'warcards' into 'master' 
Warcards

See merge request core-developers/forge!1512
 2019-04-09 00:46:44 +00:00
Michael Kamensky
ed7611a332 Merge branch 'master' into 'master' 
Preparing Forge for Android publish v1.6.23.001 [incremental].

See merge request core-developers/forge!1519
 2019-04-08 18:21:27 +00:00
Agetian
b97e6fa3e4 - Preparing Forge for Android publish v1.6.23.001 [incremental]. 2019-04-08 21:20:47 +03:00
austinio7116
aa677ca306 Corrected Tomik based on Swordshine's comments 2019-04-08 16:57:20 +01:00
Blacksmith
33fe26a892 Clear out release files in preparation for next release 2019-04-07 19:53:43 +00:00
Blacksmith
405cbd5ab3 [maven-release-plugin] prepare for next development iteration 2019-04-07 19:48:55 +00:00
Blacksmith
5b39be5fe9 [maven-release-plugin] prepare release forge-1.6.23 forge-1.6.23 2019-04-07 19:48:50 +00:00
Blacksmith
f6b38bf9ee Update README.txt for release 2019-04-07 19:46:31 +00:00
Rob Schnautz
9812bbb0da Add 2nd batch of guild kits to quest shop. 2019-04-07 17:53:18 +00:00
swordshine
af7cb0ae30 Merge branch 'fix-card-auditer' into 'master' 
Add variants for Card Auditer

See merge request core-developers/forge!1516
 2019-04-07 03:51:01 +00:00
Chris H
38b183b795 Add variants for Card Auditer 2019-04-06 23:26:20 -04:00
Sol
06afb22fd7 Merge branch 'patch-2' into 'master' 
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!1515
 2019-04-07 03:10:04 +00:00
Sol
04cd2e8c45 Update ANNOUNCEMENTS.txt 2019-04-07 03:09:52 +00:00
Sol
6cf73e2a5d Merge branch 'patch' into 'master' 
Update Typelists

See merge request core-developers/forge!1514
 2019-04-07 02:13:37 +00:00
Sol
28ee9eb58d Merge branch 'Nigol-master-patch-38850' into 'master' 
g_2_2_monkey PT should be 2/2 not 1/1

See merge request core-developers/forge!1513
 2019-04-07 02:13:14 +00:00
churrufli
ada8d59b2c Update language properties 2019-04-06 22:53:38 +02:00
Marc-André
6a755db00d g_2_2_monkey PT should be 2/2 not 1/1 2019-04-06 07:35:01 +00:00
swordshine
2bd008328a Update Typelists 2019-04-06 15:33:39 +08:00
austinio7116
347266382f Removed incompleted Vivien 2019-04-06 06:58:32 +01:00
austinio7116
d087fac128 More WAR forgeScribed spoilers 2019-04-06 06:56:55 +01:00
Michael Kamensky
9feb583413 Merge branch 'sealed-mode-singleton-round-limits' into 'master' 
Build up to 7 extra sealed pools, based on numbers

See merge request core-developers/forge!1509
 2019-04-06 03:37:24 +00:00
Sol
6ee9f14e59 Merge branch 'Nigol-master-patch-52687' into 'master' 
Update forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt

Closes #935

See merge request core-developers/forge!1511
 2019-04-06 02:51:00 +00:00