external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,835 Commits 33 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

2461 Commits

Author SHA1 Message Date
schnautzr
59214fe332 Code cleanup - deprecations 2019-02-23 20:59:19 -06:00
churrufli
f87f6bdebe undo translation in AddBasicLandsDialog.java 2019-02-22 17:35:37 +01:00
churrufli
2e70ab329e undo translation in AddBasicLandsDialog.java 2019-02-22 17:26:44 +01:00
churrufli
73749f28da Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-22 17:23:31 +01:00
churrufli
f7134f0a54 Translating hard-coded text to res en-US.properties 2019-02-22 16:53:57 +01:00
churrufli
231b2da573 Translating hard-coded text to res en-US.properties 2019-02-22 15:28:02 +01:00
churrufli
d781b6ba61 Translating hard-coded text to res en-US.properties 2019-02-22 15:10:54 +01:00
Churrufli
da9373a0df Merge branch 'master' into 'master' 
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1410
 2019-02-22 06:51:50 +00:00
Krazy
893cc3b08f Merge branch 'eclipse-cleanup' into 'master' 
Eclipse cleanup

Closes #844

See merge request core-developers/forge!1399
 2019-02-22 02:09:05 +00:00
churrufli
25858f625b Translating hard-coded text to res en-US.properties 2019-02-22 00:30:48 +01:00
Sol
6ae7cddcb9 Merge branch 'master' into 'master' 
fix crash when showing uninitialized zone

See merge request core-developers/forge!1405
 2019-02-19 16:10:52 +00:00
Peter F. Patel-Schneider
0d79a84b9f tiny optimization 2019-02-19 10:51:41 -05:00
Peter F. Patel-Schneider
6fcb996938 fix crash when showing uninitialized zone 2019-02-19 08:10:09 -05:00
Blacksmith
4ed17e1e16 [maven-release-plugin] prepare for next development iteration 2019-02-17 19:51:17 +00:00
Blacksmith
a70136c98c [maven-release-plugin] prepare release forge-1.6.21 2019-02-17 19:51:13 +00:00
Tim Scott
7f16a3dce2 Remove Eclipse-specific files and directories. Maven-based build configurations can be easily imported by (at least) Eclipse 2018-12. Hint: File > Import > Maven > Existing Maven Projects > Navigate to root forge folder. 
Tweak base pom.xml to allow for error-free Eclipse compilation.
 2019-02-14 21:26:23 -06:00
Peter F. Patel-Schneider
e8f14d5a6c describe change in CHANGES.txt; comment cleanup 2019-02-11 08:04:36 -05:00
Peter F. Patel-Schneider
c9f9fd93cd allow floating zones to be sorted by the name of the card 2019-02-10 13:28:52 -05:00
Michael Kamensky
d491972995 Merge branch 'master' into 'master' 
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1283
 2019-02-07 05:54:47 +00:00
Michael Kamensky
cdb47e0e10 Merge branch 'optimize' into 'master' 
optimize redisplay of floating card areas

See merge request core-developers/forge!1337
 2019-02-04 20:34:45 +00:00
Michael Kamensky
b008a75043 Merge branch 'bugfix' into 'master' 
fix crash when hiding temporarily shown zones

See merge request core-developers/forge!1360
 2019-02-04 20:32:39 +00:00
Peter F. Patel-Schneider
efe71e8384 fix crash when hiding temporarily shown zones 2019-02-04 14:24:34 -05:00
Peter F. Patel-Schneider
33c398fcb6 add newline to separate functions 2019-02-03 08:51:32 -05:00
Peter F. Patel-Schneider
31bca6c614 try to do fewer layout calculations when moving cards 2019-02-02 16:46:23 -05:00
Blacksmith
17dedb4bf4 [maven-release-plugin] prepare for next development iteration 2019-02-02 02:00:32 +00:00
Blacksmith
eb3fb9e1ce [maven-release-plugin] prepare release forge-1.6.20 2019-02-02 02:00:28 +00:00
KrazyTheFox
8d4854bd5d Saving progress 2019-02-01 20:39:57 -05:00
Peter F. Patel-Schneider
30607291fc optimize redisplay of floating card areas 2019-01-31 19:53:05 -05:00
Michael Kamensky
01742f06f6 Merge branch 'highlight' into 'master' 
Darken non-selectable cards in Desktop GUI

See merge request core-developers/forge!1317
 2019-01-28 17:55:36 +00:00
Peter F. Patel-Schneider
1ba1226661 refresh hand floating zone when hand is updated 2019-01-28 05:53:38 -05:00
Peter F. Patel-Schneider
25003aa74e better way to schedule visual updates to non-selectable cards 2019-01-27 21:09:52 -05:00
Peter F. Patel-Schneider
70f0f1108b darken non-selectable cards during paintChildren 2019-01-27 08:22:50 -05:00
Peter F. Patel-Schneider
62316abf38 darken non-selectable cards when selecting (needs work) 2019-01-27 07:16:54 -05:00
Peter F. Patel-Schneider
e2ddcdda4d stronger highlighting for selectable cards 2019-01-27 07:16:54 -05:00
Hans Mackowiak
9778f9e3a0 Teysa and Gitrog fixes 2019-01-24 21:26:17 +01:00
Hanmac
b6019c6308 GameSimulatorTest: second test for Teysa 2019-01-24 07:45:36 +01:00
Hans Mackowiak
7006c548a5 GameSimulatorTest: Teysa Karlov and Xathrid Necromancer 2019-01-24 07:45:36 +01:00
Hanmac
1917871b98 GameSimulatorTest: assert check for DoubleRiot 2019-01-24 07:28:14 +01:00
Hanmac
96e6111400 Riot: Make Riot Enchantment look into the future 2019-01-24 07:27:22 +01:00
Michael Kamensky
8ed1ad4afc Merge branch 'master' into 'master' 
remember old location and size of pop-up card list window

See merge request core-developers/forge!1300
 2019-01-22 04:18:38 +00:00
churrufli
84ef513489 New 5 Gauntlet Contest - Starting Magic Core Set 2019 Welcome Decks 2019-01-22 00:35:42 +01:00
Peter F. Patel-Schneider
67ca319674 remove debugging print in manipulateCardList 2019-01-21 18:10:30 -05:00
Peter F. Patel-Schneider
1f4142e368 remember old location and size of pop-up card list window 2019-01-21 18:05:19 -05:00
Michael Kamensky
b8147a2e58 Merge branch 'master' into 'master' 
use multi-select for dig

Closes #799

See merge request core-developers/forge!1296
 2019-01-21 14:47:08 +00:00
Peter F. Patel-Schneider
f0c45cf814 Add visual chooser for two lists and use it for and/or dig 2019-01-20 21:23:16 -05:00
Evan Murawski
6090bc8117 Fix for Invalid Deck or Proxy File Names 2019-01-21 00:55:35 +00:00
churrufli
8bf2bd6ddc Translating hard-coded text to res en-US.properties 2019-01-21 00:43:16 +01:00
churrufli
07c2065917 Translating hard-coded text to res en-US.properties 2019-01-18 08:20:02 +01:00
Peter F. Patel-Schneider
c7d9646f7f adjust highlighting for new manipulation interface 2019-01-16 13:10:56 -05:00
Peter F. Patel-Schneider
2cd86bfe1e put yellow border on selectable cards 2019-01-16 12:09:13 -05:00