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
50,395 Commits 31 Branches 187 Tags
d622f9075a84d67bda187bfbe596e5a3cee83efc
Commit Graph

50395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
1db289c35e Merge branch 'soulecho' into 'master' 
Fix Soul Echo

See merge request core-developers/forge!4691
 2021-05-11 18:10:46 +00:00
tool4EvEr
c8a4a41eaf Fix Soul Echo 2021-05-11 19:51:00 +02:00
Michael Kamensky
6221f87b8c Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!4689
 2021-05-11 16:48:10 +00:00
Michael Kamensky
ab3b682c47 Merge branch 'tokencards' into 'master' 
Add Time Sidewalk and Bone Rattler

See merge request core-developers/forge!4690
 2021-05-11 16:48:08 +00:00
Michael Kamensky
38d6ab9895 Merge branch 'refactor_cant_be_prevented' into 'master' 
Refactor damage can't be prevented effect

Closes #1232

See merge request core-developers/forge!4686
 2021-05-11 16:47:55 +00:00
Alumi
4d6da7454c Refactor damage can't be prevented effect 2021-05-11 16:47:54 +00:00
Churrufli
19ac30eed0 Net Decks Archive Updates 2021-05-11 09:29:42 +02:00
Hythonia
84a7b79e3c Add Time Sidewalk and Bone Rattler 2021-05-11 09:12:05 +02:00
Michael Kamensky
e2fc8015b8 Merge branch 'twosat-master-patch-29098' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4687
 2021-05-11 03:46:02 +00:00
Hans Mackowiak
5aac30f44a Merge branch 'colors' into 'master' 
ColorIdentity: Check for CDA text

See merge request core-developers/forge!4672
 2021-05-10 19:36:09 +00:00
Bug Hunter
d9340349fa ColorIdentity: Check for CDA text 2021-05-10 19:36:09 +00:00
Hans Mackowiak
82019b5f40 Merge branch 'samename' into 'master' 
ChangeZoneAi: Fix crash

Closes #1830

See merge request core-developers/forge!4688
 2021-05-10 19:35:22 +00:00
tool4EvEr
06e0a82927 Fix crash 2021-05-10 21:17:17 +02:00
Andreas Bendel
53409a6c70 Update de-DE.properties 
translated SwitchStates and AltZoneTabs
 2021-05-10 18:25:37 +00:00
Hans Mackowiak
59b68d80ca Merge branch 'servant' into 'master' 
Fix Grindstone & Painter's Servant interaction

See merge request core-developers/forge!4679
 2021-05-10 16:51:06 +00:00
Bug Hunter
4f38f5a389 Fix Grindstone & Painter's Servant interaction 2021-05-10 16:51:06 +00:00
Anthony Calosa
7a0bb07fc1 Merge branch 'kevlahnota-master-patch-01624' into 'master' 
unused import

See merge request core-developers/forge!4685
 2021-05-10 07:50:36 +00:00
Anthony Calosa
b1d3e712be unused import 2021-05-10 07:50:23 +00:00
Anthony Calosa
bc0cd4a783 Merge branch 'prevent' into 'master' 
prevent damage bug

See merge request core-developers/forge!4682
 2021-05-10 07:46:32 +00:00
Michael Kamensky
d4dc65c45f Merge branch 'show_remaining_shield' into 'master' 
Show remaining shields amount for damage prevention and redirection effect

See merge request core-developers/forge!4684
 2021-05-10 03:27:03 +00:00
Michael Kamensky
dd40a1de6b Merge branch 'update_prevention_predition' into 'master' 
Update AI damage prevention prediction code

See merge request core-developers/forge!4683
 2021-05-10 03:26:41 +00:00
Lyu Zong-Hong
ea65a3423e Show remaining shields amount for damage prevention and redirection effect 2021-05-10 10:04:45 +09:00
Lyu Zong-Hong
04811da9cc Update AI damage prevention prediction code 2021-05-10 08:09:27 +09:00
tool4EvEr
46a4243093 prevent damage bug 2021-05-09 22:47:31 +02:00
Michael Kamensky
03bee3e11e Merge branch 'refactor_fog_protection' into 'master' 
Refactor Damage Prevention - Step 3

See merge request core-developers/forge!4680
 2021-05-09 18:15:44 +00:00
Lyu Zong-Hong
20491e1136 Refactor fog and protection to use replacement effect 2021-05-09 20:17:26 +09:00
Michael Kamensky
4ea01ea135 Merge branch 'new_sets' into 'master' 
Initial edition files for MH2, AFR, PWP21

See merge request core-developers/forge!4671
 2021-05-09 04:01:31 +00:00
Michael Kamensky
8440f72e9e Merge branch 'cascade' into 'master' 
PlayAi confirmAction only when card is worth it

See merge request core-developers/forge!4661
 2021-05-09 04:01:22 +00:00
Michael Kamensky
65291259ee Merge branch 'fix_get_total_shield_npe' into 'master' 
Fix NPE in getTotalPreventionShieldAmount

Closes #1827

See merge request core-developers/forge!4678
 2021-05-09 04:00:20 +00:00
Lyu Zong-Hong
d42ee05740 Fix NPE in getTotalPreventionShieldAmount 2021-05-09 07:46:04 +09:00
Michael Kamensky
c4bf644240 Merge branch 'refactor_static_prevention' into 'master' 
Refactor Damage Prevention - Step 2

See merge request core-developers/forge!4676
 2021-05-08 13:57:04 +00:00
Alumi
fe95ad2e11 Refactor Damage Prevention - Step 2 2021-05-08 13:57:03 +00:00
Michael Kamensky
644f80df57 Merge branch 'Williams-master-patch-45382' into 'master' 
Update Resale Promos.txt

See merge request core-developers/forge!4677
 2021-05-08 13:56:17 +00:00
Michael Kamensky
46e5c3233a Merge branch 'master' into 'master' 
Spoiled cards from MH2 and AFR

See merge request core-developers/forge!4674
 2021-05-08 13:56:08 +00:00
John
1da27edde6 Update Resale Promos.txt 2021-05-08 09:37:38 +00:00
Hythonia
75da8833dc Urza's Saga fix 2021-05-08 10:22:33 +02:00
Michael Kamensky
c40a132811 Merge branch 'refactor_prevention' into 'master' 
Refactor Damage Prevention - Step 1

See merge request core-developers/forge!4675
 2021-05-08 04:34:44 +00:00
Alumi
288267ae11 Refactor Damage Prevention - Step 1 2021-05-08 04:34:42 +00:00
Michael Kamensky
8f1a493327 Merge branch 'digreveal' into 'master' 
add support to Dig for Reveal$ False

See merge request core-developers/forge!4667
 2021-05-08 04:34:08 +00:00
Northmoc
f97adc325f simplify boolean function 2021-05-07 15:06:40 -04:00
Hythonia
8aa72e9397 MH2 and AFR 2021-05-07 19:45:55 +02:00
tool4EvEr
3ab7886eab Refactor confirmAction 2021-05-07 18:14:20 +02:00
paul_snoops
551968a38c Initial edition files for MH2, AFR, PWP21 2021-05-07 15:37:18 +01:00
paul_snoops
e954102f81 Initial edition files for MH2, AFR, PWP21 2021-05-07 14:23:04 +01:00
Michael Kamensky
5a1d5c0a2d Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!4670
 2021-05-07 13:11:36 +00:00
paul_snoops
42b553266a Initial edition files for MH2, AFR, PWP21 2021-05-07 09:26:45 +01:00
Churrufli
d98d2915ca Net Deck Archive Updates 2021-05-07 09:18:14 +02:00
Anthony Calosa
634dced5aa Merge branch 'master' into 'master' 
[Mobile] NullPointerException forge.toolbox.FChoiceList in showAlternate

See merge request core-developers/forge!4669
 2021-05-07 00:48:38 +00:00
Anthony Calosa
5ee94199bb Merge branch 'fixturns' into 'master' 
Fix multiplayer extra turns deadlock

See merge request core-developers/forge!4665
 2021-05-07 00:48:21 +00:00
Anthony Calosa
23422220ce [Mobile] update check 2021-05-07 08:43:40 +08:00