external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,850 Commits 34 Branches 187 Tags
08e84cb15ddf6f3e9024adaca832c39800c8f7f6
Commit Graph

1714 Commits

Author SHA1 Message Date
Sol
97f6806beb Merge branch 'fixDeckEditorHover' into 'master' 
Fix no hover in deck editor when edit from lobby

Closes #1549

See merge request core-developers/forge!3598
 2021-01-18 03:24:42 +00:00
Sol
f339eafdc1 Merge branch 'fixDraftMenu' into 'master' 
Improve Draft GUI flow

Closes #1695

See merge request core-developers/forge!3604
 2021-01-17 01:57:59 +00:00
Michael Kamensky
da39f1edd4 Merge branch 'change-quest-starting-difficulties' into 'master' 
Change quest difficulties

Closes #1674

See merge request core-developers/forge!3608
 2021-01-16 16:34:35 +00:00
friarsol
cc8bea403d Change quest difficulties 2021-01-15 21:46:32 -05:00
tool4EvEr
704f93a4dc Improve Draft GUI flow 2021-01-15 22:32:07 +01:00
tool4EvEr
9c0a82091b Fix no hover in deck editor when edit from lobby 2021-01-14 21:44:42 +01:00
Anthony Calosa
2842304d09 Remove unused imports 2021-01-14 21:38:30 +08:00
Anthony Calosa
52f5120a1e Fix card detail text 2021-01-14 10:11:13 +08:00
tool4EvEr
e1ca782105 Fix all planeswalkers being available as commander in deck builder 2021-01-12 23:05:37 +01:00
Hans Mackowiak
3243133831 CardUtil getThisTurnEntered return LKI list 2021-01-09 15:53:00 +01:00
Hans Mackowiak
7c9ac66e8a AI: logic for X in Sac cost 2021-01-02 05:15:08 +00:00
Tim Mocny
f700b9d43b Butcher Orgg!!! 2020-12-30 02:35:25 +00:00
Bug Hunter
e0688d7458 Fix hand hiding after controlled turns 2020-12-25 09:46:01 +00:00
friarsol
3eaf694ca9 Miglayout 5+ breaks quest WinLoseView 2020-12-07 22:05:28 -05:00
Hans Mackowiak
8076682d1b AbstractGuiGame: only create Timer when needed, and destroy again after game end 2020-12-06 09:49:57 +01:00
Hans Mackowiak
ecb010ed41 GUI: fixed memory leak on gui-desktop 2020-12-03 10:44:20 +01:00
Hans Mackowiak
ce0875b8ce MVN: update miglayout-swing fixing Memory Leak 2020-12-03 03:13:00 +01:00
Hans Mackowiak
88c017f962 GameView: do not store Game anymore, get it from Match 2020-11-29 11:18:58 +01:00
friarsol
a8b7d67d9a Finally block blowing up when no exception is thrown. 2020-11-27 21:56:12 -05:00
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