external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,013 Commits 34 Branches 187 Tags
e60d5173f4335afb7d0809b9aa79d63c9fbd9a4d
Commit Graph

37013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
e60d5173f4 Merge branch 'assorted-fixes' into 'master' 
Fixed references to the no longer existing set MBP.

Closes #525

See merge request core-developers/forge!466
 2018-04-22 17:47:47 +00:00
Agetian
30d4bb923b - Fixed references to the no longer existing set MBP. 2018-04-22 20:46:16 +03:00
Hans Mackowiak
659a2e5a55 Merge branch 'assorted-fixes' into 'master' 
Attempting to fix inverse logic in CardType#setCreatureTypes.

See merge request core-developers/forge!464
 2018-04-22 17:26:12 +00:00
Agetian
0b128cc4ab - Attempting to fix inverse logic in CardType#setCreatureTypes. 2018-04-22 20:09:03 +03:00
Michael Kamensky
a4c1fea08b Merge branch 'domimages' into 'master' 
Added challenger deck precons and fixed/sorted DOM token image paths

See merge request core-developers/forge!463
 2018-04-22 14:34:28 +00:00
austinio7116
8a50cb9ea3 Fixed name of second sun control image for consistency 2018-04-22 09:13:00 +01:00
austinio7116
62a6839f84 Adding challenger deck precon images 2018-04-22 08:51:04 +01:00
austinio7116
023af864b6 ordered and renamed DOM token images 2018-04-22 08:17:13 +01:00
Michael Kamensky
d0e167d93c Merge branch 'domimages' into 'master' 
Added blockdata for fatpacks and booster boxes and token image list for DOM

See merge request core-developers/forge!460
 2018-04-22 06:47:24 +00:00
austinio7116
33c6e01d34 Added DOM token list images 2018-04-22 07:22:21 +01:00
austinio7116
4312791cf6 Added blockdata for fatpacks and booster boxes for DOM 2018-04-22 07:10:08 +01:00
Sol
ad1c2b6f0b Merge branch 'domimages' into 'master' 
Added DOM quest images

See merge request core-developers/forge!457
 2018-04-22 03:24:56 +00:00
Michael Kamensky
78525a830b Merge branch 'assorted-fixes' into 'master' 
Added NPE prevention for situations where AI evaluation for targeting cards with Shroud in MoJhoSto crashes the game.

See merge request core-developers/forge!455
 2018-04-21 20:16:58 +00:00
Michael Kamensky
b02f8e5dc7 Merge branch 'mojhosto-ai-choices' into 'master' 
- MoJhoSto: some more profile-based configurability for AI strategy.

See merge request core-developers/forge!456
 2018-04-21 20:16:20 +00:00
Agetian
28998e97ab - MoJhoSto: some more profile-based configurability for AI strategy. 2018-04-21 23:15:26 +03:00
austinio7116
8c3fefd3ff Added DOM quest images 2018-04-21 21:09:41 +01:00
Agetian
819301c7d8 - FIXME: Added NPE prevention for situations where targeting cards with Shroud would be tested, but the SA activator would be null at this point (seems to happen for the AI in MoJhoSto matches; probably needs a more thorough long-term solution). 2018-04-21 19:58:03 +03:00
Michael Kamensky
76df4d2412 Merge branch 'master' into 'master' 
Marking Izzet Chemister as RemAIDeck, the AI sacs it immediately

See merge request core-developers/forge!454
 2018-04-21 15:34:58 +00:00
Agetian
6e95a36fb2 - Marking Izzet Chemister as RemAIDeck, the AI has no logic for it and immediately sacrifices it for no reason. 2018-04-21 18:34:20 +03:00
Michael Kamensky
a6e81e5d09 Merge branch 'dominaria-guaranteed' into 'master' 
Some refactoring in BoosterGenerator related to guaranteed cards.

See merge request core-developers/forge!453
 2018-04-21 12:24:45 +00:00
Agetian
b7e48ac2cc - Some refactoring in BoosterGenerator related to guaranteed cards. 2018-04-21 15:23:46 +03:00
swordshine
35dc1bf028 Merge branch 'traxisfix' into 'master' 
Deck Generator Improvements

See merge request core-developers/forge!452
 2018-04-21 10:17:53 +00:00
swordshine
816ff7a8eb Merge branch 'dominaria-guaranteed' into 'master' 
Dominaria: booster packs must have a guaranteed Legendary Creature

See merge request core-developers/forge!451
 2018-04-21 10:17:33 +00:00
Agetian
2b41c97355 - Dominaria: booster packs must have a guaranteed Legendary Creature 2018-04-21 08:34:25 +03:00
austinio7116
131def83b9 removed commented out old code 2018-04-21 06:29:43 +01:00
Michael Kamensky
e40211ad49 Merge branch 'master' into 'master' 
- Preparing Forge for Android publish 1.6.9.001 [incremental].

See merge request core-developers/forge!450
 2018-04-21 03:37:40 +00:00
Agetian
30f8e8b16c - Preparing Forge for Android publish 1.6.9.001 [incremental]. 2018-04-21 06:36:46 +03:00
Blacksmith
5a9547e79b Clear out release files in preparation for next release 2018-04-21 01:23:46 +00:00
Blacksmith
0d375ecd93 [maven-release-plugin] prepare for next development iteration 2018-04-21 01:18:35 +00:00
Blacksmith
970f684345 [maven-release-plugin] prepare release forge-1.6.9 forge-1.6.9 2018-04-21 01:18:32 +00:00
Blacksmith
992372913e Update README.txt for release 2018-04-21 01:16:51 +00:00
Sol
28f328b0bc Merge branch 'fix_editions_tracking' into 'master' 
Simple fix for EditionTracking with new format style

See merge request core-developers/forge!449
 2018-04-21 01:16:11 +00:00
Chris H
2196551126 Simple fix for EditionTracking with new format style 2018-04-20 21:10:21 -04:00
austinio7116
84653d7aae Deactivated deck generation logs 2018-04-21 00:00:40 +01:00
austinio7116
7cb11e5191 Deck generation card quality and mana curve improvements 2018-04-20 23:59:19 +01:00
Sol
916b026b12 Merge branch 'release_files_update' into 'master' 
Updating release files for release

See merge request core-developers/forge!448
 2018-04-20 22:21:51 +00:00
Chris H
c6406e9f16 Updating release files for release 2018-04-20 18:18:35 -04:00
Michael Kamensky
2b14e25935 Merge branch 'master' into 'master' 
Revert a change in GameSimulator to make it work and prevent tests from failing

See merge request core-developers/forge!447
 2018-04-20 20:03:10 +00:00
Agetian
2f8fd5c359 - Revert a change in GameSimulator to make it work and prevent tests from failing (may require further attention later). 2018-04-20 23:02:38 +03:00
Michael Kamensky
f342fe3351 Merge branch 'traxisfix' into 'master' 
Deck generation fix and performance issue

See merge request core-developers/forge!446
 2018-04-20 18:52:07 +00:00
austinio7116
a60f5d1660 Fixed deck generation performance issue 2018-04-20 19:13:35 +01:00
austinio7116
e6c4f6c703 Generic mana fix for deck generation 2018-04-20 19:11:52 +01:00
austinio7116
51bf8a5286 Fixed deck generation performance issue 2018-04-20 18:23:59 +01:00
austinio7116
7df721a863 Fix for colourless brawl commanders 2018-04-20 18:04:54 +01:00
swordshine
ee7a3e934e Merge branch 'fixes-hanmac' into 'master' 
Fixes

Closes #430

See merge request core-developers/forge!445
 2018-04-20 12:04:53 +00:00
Hanmac
04254fcb00 GameSimulator: use canPlay & resolve for PlayLandAbility 2018-04-20 13:06:13 +02:00
Hanmac
6911906c4f CardThemedDeckBuilder: some final fixes 2018-04-20 13:04:12 +02:00
Hanmac
47cf2040f6 PlayerControllerHuman: chooseCardName need to respect face name 2018-04-20 13:03:35 +02:00
Hanmac
c47da9acdd PlayEffect: don't cast to CardCollection 2018-04-20 13:01:29 +02:00
Hanmac
a11d5a0fa5 CardDb: fixed other Cardface 2018-04-20 13:00:44 +02:00