Commit Graph

1695 Commits

Author SHA1 Message Date
Michael Kamensky
017e709a46 Merge branch '1530-reality-acid-glitch-with-flicker-of-fate' into 'master'
Resolve "Reality Acid glitch with Flicker of Fate"

Closes #1530

See merge request core-developers/forge!3121
2020-11-09 14:48:08 +00:00
Michael Kamensky
57b9260d8a Merge branch 'true_editions' into 'master'
Editions can generate their own print sheets now

See merge request core-developers/forge!3344
2020-11-09 04:38:04 +00:00
Hans Mackowiak
1a8b10c1c8 cards: update Destory Defined$ Triggered 2020-11-08 17:33:18 +01:00
Hans Mackowiak
71348b7317 TargetChoices extend ForwardingList 2020-11-08 10:48:01 +01:00
Hans Mackowiak
dffcade964 Trigger: removed the need for OncePerEffect 2020-11-07 14:10:25 +00:00
friarsol
0801bbc50b Allow desktop to play 2-6 multiplayer (not network) draft games 2020-11-06 18:48:56 -05:00
friarsol
abad110caf Editions can generate their own print sheets now 2020-11-06 11:36:04 -05:00
CCTV-1
4fa9856244 Merge remote-tracking branch 'upstream/master' 2020-10-26 14:56:46 +08:00
CCTV-1
f61329c4fe translate "Gauntlet Progress" 2020-10-25 20:20:49 +08:00
Anthony Calosa
152c7dd564 Fix leftsplit manacost display 2020-10-24 06:32:25 +08:00
Anthony Calosa
bcf858d3ec fix card Detail Panel for split cards on desktop version 2020-10-19 16:46:03 +08:00
Arona Daal
58ed7d572f [Bug] - Allow games that throw exceptions or timer runs out to allow GameOutcomes to return with a NPE being thrown 2020-10-14 04:21:48 +00:00
Michael Kamensky
34d27d628b Merge branch 'sim-draw-npe' into 'master'
fix sw.stop bug, added draw condition for timeouts and both players life 0

See merge request core-developers/forge!3251
2020-10-08 14:16:20 +00:00
MisterVito
715aec7e54 fix sw.stop bug, added draw condition for timeouts and both players life 0 2020-10-08 03:12:52 -07:00
MisterVito
e7d1ee98d2 remove sw.stop as the stopwatch is not running by this point 2020-10-07 23:39:17 -07:00
Michael Kamensky
007718f658 Merge branch 'sim-draw-npe' into 'master'
add a draw condition for sim if players life total both equal 0

See merge request core-developers/forge!3248
2020-10-08 05:29:11 +00:00
MisterVito
e4df5fe4ff add a draw condition for sim if players life total both equal 0 2020-10-07 17:34:58 -07:00
Hans Mackowiak
5854a2ff36 GUI: make many call getChoices and not order 2020-10-03 08:29:57 +02:00
Michael Kamensky
b2adfd4a02 Merge branch '1577-znr-charm-effect-tweaks' into 'master'
Resolve "ZNR: Charm Effect tweaks"

Closes #1562, #1570, and #1577

See merge request core-developers/forge!3197
2020-10-01 05:02:41 +00:00
Hans Mackowiak
daf70f7e60 Resolve "ZNR: Charm Effect tweaks" 2020-10-01 05:02:41 +00:00
Anthony Calosa
5be73af7e9 Fix GenericChoice UI 2020-09-30 21:26:06 +08:00
Anthony Calosa
6a6b8a3400 remove unnecessary imports 2020-09-30 16:26:43 +08:00
Alessandro Coli
c0a3d96621 Merge branch 'master' into questMode_wildOpponents
# Conflicts:
#	forge-gui/res/languages/en-US.properties
2020-09-27 16:01:56 +02:00
Alessandro Coli
1382952d76 Introduced 2 quest preferences for the multiplier and the number of wild
opponents
2020-09-27 14:14:12 +02:00
Michael Kamensky
3745da900a Merge branch 'landPopupPanel' into 'master'
New options introduced to see the popup only for nonbasic lands.

See merge request core-developers/forge!3191
2020-09-26 16:31:23 +00:00
Alessandro Coli
36da6b6c7f New options introduced to see the popup only for nonbasic lands.
Trigger of the popup moved earlier so as the sound will play on its
closure (when the lands enters play) and not on its opening.
2020-09-26 14:24:55 +02:00
Northmoc
c3b858e697 Fix capitalization of Combat tab in match view 2020-09-21 16:06:48 -04:00
Alessandro Coli
8d24a2a6ff Introduced a preference to turn the panel on/off. 2020-09-19 13:39:22 +02:00
Alessandro Coli
4975c6a0c3 First batch of implementations for the land popup
Still to fix localization and ability to turn it on/off in the
preferences
2020-09-17 20:14:35 +02:00
Anthony Calosa
45b205c6fe update desktop image fetcher for fullborder downloads 2020-08-22 21:09:26 +08:00
Sol
0bd3ab2071 Merge branch 'namingNames' into 'master'
Naming names

See merge request core-developers/forge!3001
2020-07-15 12:11:39 +00:00
Agetian
3ec5906def - Fix the GNU GPL license name on splash screens. 2020-07-15 08:26:42 +03:00
Zachary Kline
44a36396df Formatting fixes. 2020-07-14 21:35:26 -07:00
Zachary Kline
87533decd8 Quest combo box labels. 2020-07-14 16:39:19 -07:00
Zachary Kline
4af7c1d839 Add names for tables in deck editor. 2020-07-14 15:52:52 -07:00
Blacksmith
5076f19194 [maven-release-plugin] prepare for next development iteration 2020-07-14 02:04:44 +00:00
Blacksmith
90a4cd49e8 [maven-release-plugin] prepare release forge-1.6.36 2020-07-14 02:04:38 +00:00
Zachary Kline
9da6f28bc0 Alternate start button handling. 2020-07-13 09:59:59 -07:00
Zachary Kline
76c093d966 Add several accessible names. 2020-07-12 20:22:52 -07:00
Michael Kamensky
e863fbf77e Merge branch 'hide_unfinished_tutorial' into 'master'
Remove tutorial mode until we're ready for it

See merge request core-developers/forge!2996
2020-07-12 03:48:15 +00:00
friarsol
efa45d61fd Remove tutorial mode until we're ready for it 2020-07-11 22:15:18 -04:00
Sol
9d4fcfc397 Merge branch 'CardDetailKeyboardFocus' into 'master'
Add the details text box to the focus order for faster gameplay.

See merge request core-developers/forge!2991
2020-07-12 01:58:30 +00:00
Zachary Kline
b535332d14 Add the details text box to the focus order for faster gameplay. 2020-07-10 11:09:43 -07:00
Michael Kamensky
55ca305077 Merge branch 'FControlsFocusFIx' into 'master'
Allow keyboard focus to land on checkboxes and radio buttons.

See merge request core-developers/forge!2985
2020-07-10 04:14:32 +00:00
Zachary Kline
85b193084a FIx small typo in deletion prompt. 2020-07-09 19:58:33 -07:00
Zachary Kline
dbd3bcae71 Allow keyboard focus to land on checkboxes and radio buttons. 2020-07-09 13:57:07 -07:00
Anthony Calosa
e9ad010993 Fix flash ability outline on card panel 2020-07-06 20:44:37 +08:00
Zachary Kline
9fc24faf15 ADd accessible names to the basic land buttons 2020-07-04 21:14:35 -07:00
Michael Kamensky
6c76b9e948 Merge branch 'deckChooserAccessibility' into 'master'
Deck Chooser keyboard accessibility fix

See merge request core-developers/forge!2957
2020-07-05 04:04:43 +00:00
Zachary Kline
6b7eb0422f Remove event listeners which cause issues with keyboard accessibility. 2020-07-02 17:23:01 -07:00