external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,438 Commits 31 Branches 187 Tags
d58704062b35242b409e2f72bb5a9973f33cd67c
Commit Graph

59438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
dd217cf81a Merge pull request #1336 from kevlahnota/master 
prevent NPE
 2022-08-15 08:28:06 +08:00
Anthony Calosa
1f9d212dfd prevent NPE 2022-08-15 08:25:15 +08:00
Paul Hammerton
af1a05df45 Merge pull request #1335 from paulsnoops/typo 
Small editions clean up
 2022-08-14 20:51:35 +01:00
paulsnoops
98f171a75a Small editions clean up 2022-08-14 20:48:06 +01:00
Paul Hammerton
252254b343 Merge pull request #1334 from JohnWilliams77/patch-33 
Update Secret Lair Drop Series.txt
 2022-08-14 20:19:43 +01:00
Anthony Calosa
08c4017dad fix Nezahal, Primal Tide return abililty 2022-08-14 18:00:35 +08:00
JohnWilliams77
6393f68556 Update Secret Lair Drop Series.txt 2022-08-14 10:40:23 +01:00
Anthony Calosa
8599c60177 Update StartScene.java 2022-08-14 10:12:09 +08:00
Anthony Calosa
be6b9ecca3 Update SaveLoadScene.java 2022-08-14 10:04:34 +08:00
Anthony Calosa
c625cf8ef4 Merge pull request #1333 from kevlahnota/master 
set 250 as minimum value for temp health boost
 2022-08-14 09:48:03 +08:00
Anthony Calosa
6ad81080fc set 250 as minimum value for temp health boost 2022-08-14 09:32:37 +08:00
Anthony Calosa
f1ccf6c3cd Merge pull request #1332 from tool4ever/canttargetfix 
CantTarget "as you cast it" is checked on resolve
 2022-08-14 09:21:54 +08:00
Paul Hammerton
211ae630d4 Merge pull request #1331 from JohnWilliams77/patch-32 
Update 30th Anniversary Promos.txt
 2022-08-13 21:52:13 +01:00
JohnWilliams77
3323437fe2 Update 30th Anniversary Promos.txt 2022-08-13 21:17:53 +01:00
tool4EvEr
98215c324c CantTarget "as you cast it" is checked on resolve 2022-08-13 21:57:24 +02:00
JohnWilliams77
7ec155496e Update 30th Anniversary Promos.txt 2022-08-13 13:26:38 +01:00
Anthony Calosa
fcecec09d6 Update InnScene.java 
move computation on scene enter
 2022-08-13 20:17:36 +08:00
Anthony Calosa
2952fc9692 Merge pull request #1212 from Card-Forge/autoHealWhenEnteringTowns 
Auto heal when entering towns
 2022-08-13 18:15:37 +08:00
Anthony Calosa
f3f9c222b0 Merge branch 'master' into autoHealWhenEnteringTowns 2022-08-13 17:53:30 +08:00
Anthony Calosa
b9a3189849 Update GameHUD.java 2022-08-13 17:31:40 +08:00
Anthony Calosa
5e5117315b colored lifepoints 2022-08-13 17:26:14 +08:00
Anthony Calosa
7d13763219 Update zh-CN.properties 2022-08-13 16:59:32 +08:00
Anthony Calosa
f9552fd6f7 Update pt-BR.properties 2022-08-13 16:59:00 +08:00
Anthony Calosa
a07787e6d5 Update ja-JP.properties 2022-08-13 16:58:21 +08:00
Anthony Calosa
2153c3d8aa Update it-IT.properties 2022-08-13 16:57:33 +08:00
Anthony Calosa
6543fa1ed8 Update es-ES.properties 2022-08-13 16:56:52 +08:00
Anthony Calosa
7d4c9f1b53 Update de-DE.properties 2022-08-13 16:48:48 +08:00
Anthony Calosa
140345a31a Update AiController.java 2022-08-13 16:35:28 +08:00
Paul Hammerton
2109d7c436 Merge pull request #1325 from paulsnoops/oops 
Fix for A-Druidic Ritual and Signature Spells
 2022-08-13 09:26:40 +01:00
Anthony Calosa
cf1e5fc856 fix heal 2022-08-13 14:33:41 +08:00
Anthony Calosa
22365a3c10 Update AdventurePlayer.java 2022-08-13 14:24:22 +08:00
Anthony Calosa
661600d680 Update AdventurePlayer.java 2022-08-13 14:23:07 +08:00
Anthony Calosa
ece2fc575f Update AdventurePlayer.java 2022-08-13 14:19:52 +08:00
Anthony Calosa
9651812b0d Update TileMapScene.java 2022-08-13 14:15:45 +08:00
Anthony Calosa
86927e8076 add simple check for full heal 2022-08-13 14:13:11 +08:00
Anthony Calosa
007757187a Update Forge.java 
unused import
 2022-08-13 13:11:36 +08:00
Anthony Calosa
f1185707ee Update InnScene.java 
add default message if localizer can't find the translation
 2022-08-13 13:10:32 +08:00
Anthony Calosa
659f20edff Update TileMapScene.java 2022-08-13 13:07:42 +08:00
Anthony Calosa
f33ec785b0 move the code to tilemapscene 2022-08-13 13:05:44 +08:00
Anthony Calosa
60347103ec Merge pull request #1329 from kevlahnota/master 
prevent NPE when overriding CardView for HumanCostDecision
 2022-08-13 09:15:26 +08:00
Anthony Calosa
e8152ef621 NPE check on dispose (this is called also on destroy event) 2022-08-13 09:12:02 +08:00
Anthony Calosa
5af8a3939a prevent NPE when overriding CardView for HumanCostDecision 2022-08-13 08:41:51 +08:00
Anthony Calosa
5cd838a354 Merge pull request #1326 from kevlahnota/master 
update Flashback Zone on Mobile
 2022-08-12 08:49:15 +08:00
Anthony Calosa
c49521e063 update Flashback Zone on Mobile 2022-08-12 08:44:59 +08:00
Anthony Calosa
0dc5ff4a57 Merge pull request #1320 from tool4ever/paymanafix 
payManaOptional fix
 2022-08-12 08:06:15 +08:00
paulsnoops
bd00781bd9 Fix for A-Druidic Ritual and Signature Spells 2022-08-11 19:51:38 +01:00
Paul Hammerton
90f5845dcd Merge pull request #1324 from Northmoc/fix 
sparas_bodyguard.txt fixup
 2022-08-11 19:16:49 +01:00
Paul Hammerton
b1abebcc60 Merge pull request #1316 from paulsnoops/11_08_22_rebalanced 
Alchemy Rebalancing for August 11, 2022
 2022-08-11 19:14:30 +01:00
tool4EvEr
ecd3e66c5e Fixes 2022-08-11 19:15:01 +02:00
Northmoc
7b5da7420d sparas_bodyguard.txt fixup 2022-08-11 12:49:35 -04:00