swordshine
b591421bd5
Merge branch 'patch' into 'master'
...
Fix Frostwalk Bastion
See merge request core-developers/forge!2031
2019-08-13 15:24:51 +00:00
swordshine
6f517770d9
Fix Frostwalk Bastion
2019-08-13 23:22:56 +08:00
Michael Kamensky
8e5c50ed9c
Merge branch 'master' into 'master'
...
Added puzzle PS_M205 - Possibility Storm - Magic Core Set 2020 05
See merge request core-developers/forge!2030
2019-08-13 06:15:36 +00:00
Agetian
d56c6c78e4
- Added puzzle PS_M205.
2019-08-13 09:14:27 +03:00
Michael Kamensky
c788329202
Merge branch 'endCombatPhase' into 'master'
...
EndCombatPhase: add way to end combat phase by effect
See merge request core-developers/forge!2029
2019-08-13 05:35:29 +00:00
Hans Mackowiak
581e05c01d
EndCombatPhase: add way to end combat phase by effect
2019-08-13 05:35:29 +00:00
Michael Kamensky
0142532532
Merge branch 'typofix5' into 'master'
...
Fix typos in card files, mostly having to do with missing or extra pipes
See merge request core-developers/forge!2028
2019-08-13 04:42:41 +00:00
kms70847
ec8c77abfb
Fix typos in card files, mostly having to do with missing or extra pipes
2019-08-12 23:09:40 -04:00
swordshine
61087e135b
Merge branch 'patch' into 'master'
...
Fix Battlefield Thaumaturge
See merge request core-developers/forge!2027
2019-08-13 02:39:20 +00:00
swordshine
3a6c07bb0b
Fix Battlefield Thaumaturge
2019-08-13 10:38:55 +08:00
swordshine
bb09ac2550
Merge branch 'patch' into 'master'
...
C19: Sevinne, the Chronoclasm
See merge request core-developers/forge!2026
2019-08-13 01:06:12 +00:00
swordshine
f55b57718f
C19: Sevinne, the Chronoclasm
2019-08-13 09:05:22 +08:00
Michael Kamensky
691d1021de
Merge branch 'master' into 'master'
...
Added puzzle PS_M204 - Possibility Storm - Magic Core Set 2020 04.
See merge request core-developers/forge!2025
2019-08-12 16:47:15 +00:00
Michael Kamensky
40b21710b1
Merge branch 'fix_nre_loading_limited_deck' into 'master'
...
Fix null reference exception when loading deck
See merge request core-developers/forge!2015
2019-08-12 16:46:29 +00:00
Agetian
77820b4f78
- Added puzzle PS_M204.
2019-08-12 19:45:15 +03:00
swordshine
e483981207
Merge branch 'facedownCostAdjust' into 'master'
...
CostAdjustment: fix facedown cast setting facedown flag
See merge request core-developers/forge!2024
2019-08-11 12:33:42 +00:00
Hans Mackowiak
9110cd08fd
CostAdjustment: fix facedown cast setting facedown flag
2019-08-11 12:33:41 +00:00
swordshine
a2efaa3c45
Merge branch 'sonarqubefixes02' into 'master'
...
More SonarQube detected bugs fixed
See merge request core-developers/forge!2021
2019-08-11 02:10:30 +00:00
swordshine
17946c00d9
Merge branch 'patch' into 'master'
...
Add Wildfire Devils
See merge request core-developers/forge!2022
2019-08-11 02:09:27 +00:00
klaxnek
9aaaf93062
Fix variable memSet might not have been initialized
2019-08-10 14:07:03 +02:00
klaxnek
d04fae8e96
More SonarQube detected bugs fixed:
...
- Use try-with-resources in AutoCloseable objects.
- End this switch case with an unconditional break, return or throw statement.
- A "NullPointerException" could be thrown.
- Use the "equals" method if value comparison was intended.
- Correct this "&" to "&&".
2019-08-10 13:57:06 +02:00
swordshine
ef598642b4
C19: Add Wildfire Devils
2019-08-10 19:56:22 +08:00
swordshine
c9744bea27
Merge branch 'panelDragFix' into 'master'
...
don't rearrange frames if the cursor is in the frame's head region
See merge request core-developers/forge!2012
2019-08-10 10:49:46 +00:00
swordshine
b690388358
Merge branch 'manifestChoices' into 'master'
...
Manifest: add Choices
See merge request core-developers/forge!2020
2019-08-10 10:44:53 +00:00
Hans Mackowiak
f08432273c
Manifest: add Choices
2019-08-10 10:44:53 +00:00
swordshine
49bdff3f17
Merge branch 'sonarqubefixes01' into 'master'
...
Fixes some SonarQube detected bugs
See merge request core-developers/forge!2019
2019-08-10 10:32:18 +00:00
klaxnek
2534c2c27a
Fixes some SonarQube detected bugs:
...
1. Use try-with-resources in AutoCloseable objects
2. Use the "equals" method if value comparison was intended.
3. Fixed getting the cheapest mana card in getCheapestPermanentAI.
2019-08-10 12:15:17 +02:00
swordshine
0899629e16
Merge branch 'patch' into 'master'
...
C19
See merge request core-developers/forge!2017
2019-08-10 10:01:28 +00:00
swordshine
587535cc4a
Merge branch 'goadStatic' into 'master'
...
StaticAbility: add flag for static Goad
See merge request core-developers/forge!2018
2019-08-10 08:44:44 +00:00
Hans Mackowiak
fd0c79968d
StaticAbility: add flag for static Goad
2019-08-10 08:44:44 +00:00
swordshine
6c6a729dcf
C19: Fix Cliffside Rescuer
2019-08-10 15:47:24 +08:00
swordshine
278c8b7770
C19: Add Hate Mirage
2019-08-10 14:29:03 +08:00
swordshine
f83b09bad3
C19: Add Cliffside Rescuer
2019-08-10 13:42:33 +08:00
swordshine
aa4e04e0f6
C19: Add Archfiend of Spite
2019-08-10 13:29:49 +08:00
swordshine
d744a50e2d
Merge branch 'patch' into 'master'
...
C19 cards
See merge request core-developers/forge!2016
2019-08-10 04:52:24 +00:00
swordshine
d58dbac90f
C19: Added three cards
2019-08-10 12:46:11 +08:00
swordshine
5b659c433e
C19: Update tokens
2019-08-10 10:51:30 +08:00
swordshine
1288830c0e
C19: Update edition file
2019-08-10 10:21:37 +08:00
swordshine
ca06bc69a2
Merge branch 'patch' into 'master'
...
C19 cards
See merge request core-developers/forge!2014
2019-08-10 01:08:07 +00:00
NikolayHD
3c6d45ff0c
Fix null reference exception when loading deck
...
in sealed or draft deck editor
2019-08-10 03:35:51 +03:00
swordshine
74af2b2423
C19: Add three charm cards
2019-08-09 23:34:44 +08:00
swordshine
004d3e5805
C19: Add Voice of Many
2019-08-09 23:12:24 +08:00
swordshine
6f6cb9296b
Merge branch 'patch' into 'master'
...
C19 cards
See merge request core-developers/forge!2013
2019-08-09 15:11:57 +00:00
swordshine
1a3a920dba
C19: add forgescribed cards (patch 8)
2019-08-09 21:47:20 +08:00
swordshine
0b1e552143
C19: add forgescribed cards (patch 7)
2019-08-09 19:47:50 +08:00
swordshine
708b5c8c9b
C19: add forgescribed cards (patch 6)
2019-08-09 19:09:12 +08:00
swordshine
922c065149
C19: add forgescribed cards (patch 5)
2019-08-09 18:07:51 +08:00
swordshine
85d076bdd2
C19: add forgescribed cards (patch 4)
2019-08-09 17:35:32 +08:00
swordshine
14afacbf59
C19: add forgescribed cards (patch 3)
2019-08-09 14:10:54 +08:00
swordshine
25b7c3dd0f
C19: add forgescribed cards (patch 2)
2019-08-09 12:26:22 +08:00
