external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,453 Commits 32 Branches 187 Tags
0637c69bfe901babf30a015d11386699407b602b
Commit Graph

1482 Commits

Author SHA1 Message Date
Hans Mackowiak
47d3a74387 Resolve "multiple StaticAbility Pump on same creature does conflict" 2019-09-14 16:33:56 +00:00
Ryan1729
b76a3c3efa several mechanical refactorings 2019-09-11 21:23:27 -06:00
swordshine
434027c14f Merge branch 'ui-card-translation' into 'master' 
UI Card Translation (desktop and mobile)

See merge request core-developers/forge!1987
 2019-09-11 13:27:55 +00:00
CCTV-1
0b244b0b40 language list is generated from an res/languages existing file(consistent with Andorid behavior) 2019-09-11 09:37:00 +08:00
CCTV-1
65ea561462 add zh-CN language option 2019-09-11 09:05:12 +08:00
Anthony Calosa
5f78608321 Some codes needed to revert 2019-09-09 13:30:53 +08:00
Ryan Wiedemann
3d51a6e962 Merge branch 'master' into 'start_trigger_run_params_refactor' 
# Conflicts:
#   forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
 2019-09-07 23:36:05 +00:00
Michael Kamensky
f53346eaf7 Merge branch 'master' into 'master' 
Big Refactoring + Android Fix for older phones

See merge request core-developers/forge!2092
 2019-09-07 17:50:01 +00:00
Anthony Calosa
a0b71d60a1 Revert Android 8 codes to support older Android phones. 
Hope I didn't miss any. :)
(tested with Android Marshmallow phone with 2gb RAM and mediatek cpu)
 2019-09-07 22:54:53 +08:00
Peter
3d53c41208 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-09-07 08:46:19 +02:00
Michael Kamensky
193dfae43b Merge branch 'overlap_same_clip' into 'master' 
Support overlapped reproducing of same AudioClip

See merge request core-developers/forge!2081
 2019-09-06 19:22:48 +00:00
Anthony Calosa
e977420ffa Finalization for Refactoring 2019-09-06 12:55:40 +08:00
swordshine
19585aa007 Merge branch 'master' into 'master' 
Refactor/Code Cleanup

See merge request core-developers/forge!2080
 2019-09-06 00:41:16 +00:00
Anthony Calosa
59bf5830fe Big Cleanup 2019-09-06 00:03:04 +08:00
Anthony Calosa
efbd2a08eb Updated codes 2019-09-05 20:56:17 +08:00
Anthony Calosa
ca28b4d696 Merge remote-tracking branch 'remotes/core/master' 2019-09-05 18:01:47 +08:00
Anthony Calosa
2b0e47dd14 Initial migration 2019-09-05 08:24:58 +08:00
Ryan1729
ef5b7e902b rename runTrigger to runTriggerOld and add new runTrigger method 2019-09-03 22:52:38 -06:00
Blacksmith
10877ca143 [maven-release-plugin] prepare for next development iteration 2019-09-04 01:51:10 +00:00
Blacksmith
367dab571d [maven-release-plugin] prepare release forge-1.6.28 2019-09-04 01:51:04 +00:00
Anthony Calosa
c38bae910a Refactor/Code Cleanup 2019-09-02 18:08:56 +08:00
NikolayHD
7a760bb37f Support overlapped reproducing of same AudioClip 
when playing same sound in a batch, like auto-tapping N lands
or drawing 7 cards in mulligane
 2019-09-01 21:23:31 +03:00
NikolayHD
f62f2832dd followup on fixed AudioClip deadlock 2019-08-30 00:52:47 +03:00
NikolayHD
64c624509c fix deadlock in AudioClip reproducing 
in JRE 1.8.0_221 a call to clip.setMicrosecondPosition(0)
can produce a deadlock if the clip is already beginning
to reproduce, that is clip.start() was recently called

The workaround is to wait until the clip actually begins to
reproduce before letting another clip.setMicrosecondPosition(0)
call happen
 2019-08-29 02:27:23 +03:00
Peter
4913633a25 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 
 Conflicts:
	forge-gui-mobile/src/forge/assets/FSkinFont.java
	forge-gui-mobile/src/forge/card/CardImageRenderer.java
	forge-gui-mobile/src/forge/card/CardRenderer.java
 2019-08-25 10:36:12 +02:00
Hans Mackowiak
5cf1f47047 ImageFetcher: Better handling if Image can't be saved as jpg 2019-08-24 17:51:39 +00:00
Dan Demp
f1e0158102 Add menu item for setting Oathbreaker 
Allow double-tapping to set Commander or Oathbreaker if one hasn't yet been set
 2019-08-20 04:34:14 +00:00
drdev
6486ebd1ad Remove Exit button from mobile home screen 
Revert text of other buttons on mobile home screen
Fix text with spaces removed, like "Planar Conquest"
 2019-08-19 22:01:50 -05:00
Hans Mackowiak
59e7ca4a9f PickerTest: fix combat 2019-08-15 06:57:30 +00:00
Peter
d8e073f561 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-14 14:22:16 +02: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
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
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
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
NikolayHD
3c6d45ff0c Fix null reference exception when loading deck 
in sealed or draft deck editor
 2019-08-10 03:35:51 +03:00
kms70847
ce32bdb0b5 don't rearrange frames if the cursor is in the frame's head region 2019-08-07 11:10:22 -04:00
Peter
720a3966c1 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-06 08:46:45 +02:00
Hanmac
773f2b280f Loyalty: use String Property for X 2019-08-01 21:16:07 +02:00
Peter
98cb151929 Merge branch 'master' into ui-card-translation 2019-07-30 12:19:51 +02:00
Peter
24f7de8ee1 Show translated card name in card overlay 2019-07-28 09:40:57 +02:00
Peter
1d8e7a0cb3 Add Download HQ Card Pictures from Scryfall 2019-07-26 18:39:38 +02:00
Hanmac
4182ad7395 DigEffect: remove AndOrValid 2019-07-14 05:59:04 +02:00
Hanmac
371379def8 DigMultipleEffect: new effect for Kaalia 2019-07-11 07:18:42 +02:00
Hans Mackowiak
3ca71ccd7b - Basic AI for the revised Replicate and Conspire (will currently mimic the old behavior of paying as much as possible, to be improved) 2019-07-08 09:52:20 +00:00
Blacksmith
9a12564054 [maven-release-plugin] prepare for next development iteration 2019-07-08 00:55:54 +00:00
Blacksmith
118e86ec92 [maven-release-plugin] prepare release forge-1.6.27 2019-07-08 00:55:48 +00:00
Agetian
330a811dd0 - Fix ChangeZone UI for Sideboard->Library (and possibly other cases going through this code path) 2019-07-03 13:53:35 +03:00
churrufli
181aa0f2ab Moving hard-coded text to res files 2019-06-24 06:54:33 +02:00
kms70847
c82950555d Use FMouseAdapter's onLeftDoubleClick event for double click detection in ListChooser. 2019-06-19 01:34:19 -04:00
churrufli
e029ee713d Moving hard-coded text to res files 2019-06-19 00:05:20 +02:00