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
49,974 Commits 32 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

2987 Commits

Author SHA1 Message Date
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
Anthony Calosa
85eb740264 aifixes NPE 2019-11-01 12:40:40 +08:00
Hans Mackowiak
06b9dffa55 Player keyword rework 2019-10-15 11:12:20 +00:00
Hans Mackowiak
773df25b53 replace .getZone().is with .isInZone, no null check needed 2019-10-14 18:46:43 +00:00
Anthony Calosa
32621257df update 2019-10-13 17:09:56 +08:00
Anthony Calosa
ff7a8f994c prevent waiting for opponent during assert, 
send the exception via sentry
 2019-10-13 14:48:49 +08:00
Hans Mackowiak
44bcc72662 AiController: only do verifyTransitivity when sort failed 2019-10-13 06:36:55 +00:00
Agetian
7fa461e839 - Comment out the transitivity test due to lag reasons. 2019-10-13 07:36:40 +03:00
Hans Mackowiak
fb159a6261 verifyTransitivity on saComparator 2019-10-11 19:03:15 +00:00
swordshine
eb82d454b8 Merge branch 'start_replacement_run_keys_refactor' into 'master' 
Start replacement run keys refactor

See merge request core-developers/forge!2175
 2019-10-06 06:22:54 +00:00
Ryan1729
5f3a0b3f0b change replacingObjects type 2019-10-05 23:44:22 -06:00
Ryan1729
f6134e3ccf update canReplace method 2019-10-05 22:24:05 -06:00
Hans Mackowiak
f32a8d7bb8 Card: CardTraits are now not added to Card/State anymore but uses timestamp 2019-10-05 19:59:28 +00:00
Blacksmith
d028cd2918 [maven-release-plugin] prepare for next development iteration 2019-09-29 00:23:27 +00:00
Blacksmith
4803d74c33 [maven-release-plugin] prepare release forge-1.6.29 2019-09-29 00:23:21 +00:00
Hans Mackowiak
398796999f Resolve "Questing Beast and Damage Prevention" 2019-09-29 00:03:10 +00:00
Ryan1729
df4b0b03b9 remove runOld and getReplacementListOld 2019-09-27 17:13:44 -06:00
Ryan1729
786448e14e Merge branch 'start_replacement_run_keys_refactor' of git.cardforge.org:Ryan1729/forge into start_replacement_run_keys_refactor 2019-09-25 19:50:47 -06:00
Ryan1729
c9b66d9743 add mapFromAffected convenience function 2019-09-25 19:50:00 -06:00
Hans Mackowiak
15e5d68520 Update ManifestAi: unused import 2019-09-25 08:03:32 +00:00
Ryan1729
5298b8666d refactor getReplacementList to use AbiltyKey as much as currently possible 2019-09-25 00:04:28 -06:00
Anthony Calosa
44eee1c5c4 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-24 12:05:57 +08:00
Ryan Wiedemann
308c75e60e Merge branch 'master' into 'push_down_toStringMap_part_3' 
# Conflicts:
#   forge-ai/src/main/java/forge/ai/AiController.java
#   forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
#   forge-game/src/main/java/forge/game/card/CardFactory.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceDrawCards.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceSurveil.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java
#   forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java
 2019-09-23 14:18:52 +00:00
Hans Mackowiak
14c9a8ccc3 ReplacementEffect: add Mode for ReplacementType 2019-09-23 11:53:48 +00:00
Anthony Calosa
1f58279525 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-09-23 14:49:29 +08:00
Ryan1729
80506954f1 more replacing getMapParams().containsKey with hasParam 2019-09-22 12:13:40 -06:00
Ryan1729
d8c27ccb14 find and replace .getMapParams().get(...) to getParam(...) 
Using Intellij's structural search.
 2019-09-22 11:50:19 -06:00
swordshine
bcccf726b5 Fix Kaalia of the Vast 2019-09-21 22:10:57 +08:00
Anthony Calosa
73f3a5ff85 Prevent NPE 2019-09-19 23:22:59 +08:00
swordshine
e98cb0043d Add Robber of the Rich 2019-09-16 22:08:07 +08:00
Hans Mackowiak
47d3a74387 Resolve "multiple StaticAbility Pump on same creature does conflict" 2019-09-14 16:33:56 +00:00
Ryan Wiedemann
3d51a6e962 Merge branch 'master' into 'start_trigger_run_params_refactor' 
# Conflicts:
#   forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
 2019-09-07 23:36:05 +00:00
Agetian
d11fc1b6fe - Rewire AI logic for AiAttackController. 2019-09-07 20:50:28 +02:00
Agetian
ad2565305f - Rewire the AI support for AttachAi and PumpAi 2019-09-07 20:50:28 +02:00
Hanmac
357f146742 CanBlockAny: rewrite for 'can block an additional' and 'can block any number' 2019-09-07 20:50:27 +02:00
Anthony Calosa
a0b71d60a1 Revert Android 8 codes to support older Android phones. 
Hope I didn't miss any. :)
(tested with Android Marshmallow phone with 2gb RAM and mediatek cpu)
 2019-09-07 22:54:53 +08:00
Anthony Calosa
00f263b2be Merge remote-tracking branch 'remotes/core/master' 2019-09-06 20:22:07 +08:00
Anthony Calosa
e977420ffa Finalization for Refactoring 2019-09-06 12:55:40 +08:00
Agetian
03be13bacf Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-09-06 07:45:57 +03:00
swordshine
19585aa007 Merge branch 'master' into 'master' 
Refactor/Code Cleanup

See merge request core-developers/forge!2080
 2019-09-06 00:41:16 +00:00
Anthony Calosa
59bf5830fe Big Cleanup 2019-09-06 00:03:04 +08:00
Anthony Calosa
efbd2a08eb Updated codes 2019-09-05 20:56:17 +08:00
Anthony Calosa
0f62a297c7 Updated some codes 2019-09-05 18:20:36 +08:00
Anthony Calosa
ca28b4d696 Merge remote-tracking branch 'remotes/core/master' 2019-09-05 18:01:47 +08:00
Ryan1729
9d2e92157c move and rename TriggerKey to AbilityKey 2019-09-04 22:53:32 -06:00
Ryan1729
ef5b7e902b rename runTrigger to runTriggerOld and add new runTrigger method 2019-09-03 22:52:38 -06:00
Blacksmith
10877ca143 [maven-release-plugin] prepare for next development iteration 2019-09-04 01:51:10 +00:00
Blacksmith
367dab571d [maven-release-plugin] prepare release forge-1.6.28 2019-09-04 01:51:04 +00:00
Anthony Calosa
efa606783c Cleanup 2019-09-03 22:13:35 +08:00
Anthony Calosa
a4d34bb858 Retained some schemas 2019-09-03 11:20:10 +08:00