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
37,091 Commits 32 Branches 187 Tags
758dbb689aa4d2c75835af3eaef5236df511f050
Commit Graph

37091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris H
758dbb689a When playing non-team matches, display Player name as winner in Game Recap screen 2018-04-28 23:22:23 -04:00
Michael Kamensky
dc71046018 Merge branch 'assorted-fixes' into 'master' 
AI: Only consider the "prevent all combat damage" pump KW useful in combat

See merge request core-developers/forge!497
 2018-04-28 12:58:18 +00:00
Agetian
881572cba5 - AI: Only consider the "prevent all combat damage" pump KW useful when inside combat and blocking/blocked (e.g. Blinding Powder). 2018-04-28 15:57:47 +03:00
Hans Mackowiak
4a41c57e93 Merge branch 'assorted-fixes' into 'master' 
(Experimental) Attempting to fix the interaction of text-changing abilities and keyworded effects

See merge request core-developers/forge!496
 2018-04-28 12:43:04 +00:00
Agetian
084f45393e - Code tweak suggested by Hanmac. 2018-04-28 15:08:53 +03:00
Agetian
90a1a5f058 - (Experimental) Attempting to fix the interaction of text-changing abilities with keyworded effects that use overriding abilities (e.g. Fabricate and Artificial Evolution). 2018-04-28 13:56:53 +03:00
Michael Kamensky
e0486aff29 Merge branch 'assorted-fixes' into 'master' 
Updating DrainMana ability description (mana pool reference removed).

See merge request core-developers/forge!494
 2018-04-28 10:44:05 +00:00
Agetian
ce165f4234 - Updating DrainMana ability description. 2018-04-28 13:42:51 +03:00
Hans Mackowiak
4d73f954f8 Merge branch 'assorted-fixes' into 'master' 
Removing references to mana pool in code (and updating the relevant code parts).

See merge request core-developers/forge!493
 2018-04-28 10:40:03 +00:00
Agetian
445625ba1e - Removing references to mana pool in other parts of the code. 2018-04-28 13:34:16 +03:00
Michael Kamensky
e76e610b97 Merge branch 'assorted-fixes' into 'master' 
Fixing a test with the new mana ability text in mind.

See merge request core-developers/forge!492
 2018-04-28 10:22:50 +00:00
Agetian
8c50ddef2f - Fixing a test with the new mana ability text in mind. 2018-04-28 13:21:42 +03:00
Hans Mackowiak
d11c608bd0 Merge branch 'dom-oracle-mana-pool' into 'master' 
Oracle non-functional update: removing "mana pool" from card texts.

See merge request core-developers/forge!487
 2018-04-28 09:08:31 +00:00
Michael Kamensky
38376b3978 Merge branch 'assorted-fixes' into 'master' 
Making transform cards work as plane/region art in Planar Conquest

See merge request core-developers/forge!488
 2018-04-27 19:17:01 +00:00
Agetian
7d5b0be5ca - Removed an unused variable. 2018-04-27 13:48:00 +03:00
Agetian
98bc1fb01a - Somewhat better implementation for getArt in ConquestRegion. 2018-04-27 10:53:06 +03:00
Agetian
aa11704caa - Correction for Ixalan plane definition. 2018-04-27 10:52:03 +03:00
Agetian
bc701fecb3 - Making transform cards work as plane/region art in Planar Conquest (mobile Forge). 
- Currently will show the cards untransformed on the plane selection screen and transformed on the multiverse/region screen.
 2018-04-27 10:46:48 +03:00
Agetian
e8462e8291 - Oracle non-functional update: removing "mana pool" from card texts. Pass one. 2018-04-27 08:42:30 +03:00
swordshine
d74c6a2e21 Merge branch 'dom-pw-decks' into 'master' 
Deck descriptions

See merge request core-developers/forge!486
 2018-04-27 02:39:44 +00:00
Rob Schnautz
bddd94aec0 back matter, premium Sunblast Angel 2018-04-26 21:49:25 +00:00
Rob Schnautz
665d07cd56 back matter, premium Goliath Sphinx 2018-04-26 21:44:41 +00:00
Rob Schnautz
7375ad8a5d premium sphinx of uthuun 2018-04-26 21:41:41 +00:00
Rob Schnautz
581461f0e3 back matter 2018-04-26 21:39:11 +00:00
Rob Schnautz
3dc3da5932 back matter 2018-04-26 21:21:56 +00:00
Sol
0464601dc5 Merge branch 'dom-fixes' into 'master' 
DOM fixes

See merge request core-developers/forge!485
 2018-04-26 21:10:52 +00:00
Rob Schnautz
3f31bf85fb back matter 2018-04-26 21:10:31 +00:00
Chris H
7c4429da46 DOM fixes 2018-04-26 17:07:40 -04:00
Rob Schnautz
b73efba916 back matter 2018-04-26 21:06:53 +00:00
Rob Schnautz
58cbcee5ba back matter 2018-04-26 21:01:50 +00:00
Rob Schnautz
ab8b71b152 back matter 2018-04-26 20:56:34 +00:00
Rob Schnautz
ca71a997dd back matter 2018-04-26 20:55:30 +00:00
Sol
ce6ddd2f91 Merge branch 'fix_shivan_fire' into 'master' 
Fix Shivan FIre

See merge request core-developers/forge!484
 2018-04-26 20:46:01 +00:00
Chris H
c938f8e731 Fix Shivan FIre 2018-04-26 16:40:03 -04:00
Michael Kamensky
7df7703c50 Merge branch 'assorted-fixes' into 'master' 
- Fix the implementation of Exalted.

See merge request core-developers/forge!483
 2018-04-26 04:45:21 +00:00
Agetian
33bc3557e5 - Fix the implementation of Exalted. 2018-04-26 07:44:38 +03:00
Michael Kamensky
cf2bc158a0 Merge branch 'assorted-fixes' into 'master' 
- Preparing Forge for Android publish 1.6.9.005 [hotfix].

See merge request core-developers/forge!482
 2018-04-26 04:36:26 +00:00
Agetian
e8d0fe07f4 - Preparing Forge for Android publish 1.6.9.005 [hotfix]. 2018-04-26 07:36:04 +03:00
Michael Kamensky
a4fa7cb5ee Merge branch 'assorted-fixes' into 'master' 
Fixed Exalted and possibly other triggers with overwriting ability crashing the AI

See merge request core-developers/forge!481
 2018-04-26 04:35:25 +00:00
Agetian
6ea52c93fe - Fixed Exalted and possibly other triggers with overwriting ability crashing the trigger checking code in getPossibleNonCombatDamage. 2018-04-26 07:34:14 +03:00
Michael Kamensky
b28887e91c Merge branch 'sortFix' into 'master' 
D'Avenant before Danitha

See merge request core-developers/forge!480
 2018-04-26 04:18:24 +00:00
Rob Schnautz
263b906aec D'Avenant before Danitha 2018-04-26 02:44:39 +00:00
austinio7116
acef14aadc Merge branch 'fix_outcome_memory_leak' into 'master' 
Memory leak within a match

See merge request core-developers/forge!458
 2018-04-25 22:35:02 +00:00
Michael Kamensky
055ebac496 Merge branch 'assorted-fixes' into 'master' 
- NPE prevention related to guaranteed cards in boosters (for Quest Mode).

See merge request core-developers/forge!479
 2018-04-25 04:27:33 +00:00
Agetian
285370fe35 - NPE prevention related to guaranteed cards in boosters (for Quest Mode). 2018-04-25 07:26:54 +03:00
Michael Kamensky
23af3953e6 Merge branch 'assorted-fixes' into 'master' 
Preparing Forge for Android publish 1.6.9.004 [AI hotfix].

See merge request core-developers/forge!478
 2018-04-25 04:18:18 +00:00
Agetian
83665d0992 - Preparing Forge for Android publish 1.6.9.004 [AI hotfix]. 2018-04-25 07:17:39 +03:00
Michael Kamensky
c6dcb9db2b Merge branch 'assorted-fixes' into 'master' 
AI: fixed a logic error in DealDamage, somewhat better prediction of noncombat damage for assault attacks

See merge request core-developers/forge!475
 2018-04-25 04:14:28 +00:00
Michael Kamensky
b3205d43db Merge branch 'master' into 'master' 
Tweaked the updated Drudge Sentinel.

See merge request core-developers/forge!477
 2018-04-24 18:05:09 +00:00
Agetian
4feefd404b - Tweaked the updated Drudge Sentinel. 2018-04-24 21:04:23 +03:00