external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,661 Commits 31 Branches 187 Tags
fe2c3c90d62aab8f44478e9968182c97a13fbd77
Commit Graph

1353 Commits

Author SHA1 Message Date
Anthony Calosa
91674ef0b2 Seperate some Sprite Icons, Upscaled sprite_planar_conquest, 
added some ability icons, Enabled texture filter on some textures
 2019-10-01 13:41:52 +08:00
Peter
e869c6ac6b Remove unused imports 2019-09-30 11:35:18 +02:00
Peter
17fabb0bec Translated strings related to Win/Loose/Concede 2019-09-30 11:25:27 +02:00
Ryan1729
4728b5ad76 Merge branch 'master' of git.cardforge.org:core-developers/forge into start_replacement_run_keys_refactor 2019-09-27 17:17:26 -06:00
Ryan1729
df4b0b03b9 remove runOld and getReplacementListOld 2019-09-27 17:13:44 -06:00
Anthony Calosa
f1c3e93548 Update HexproofKey 2019-09-25 21:11:01 +08:00
Anthony Calosa
b6ed045c21 Add Show Ability Icons Preference 
(Overlay Menu on PC, Settings Page on Mobile)
 2019-09-25 14:49:41 +08:00
Anthony Calosa
c24f4b59ec Update Icons 2019-09-25 12:28:40 +08:00
Anthony Calosa
8df2022a87 Add Hexproof From Icons (TODO: better Hexproof from Icons) 2019-09-25 09:31:08 +08:00
Anthony Calosa
bc5e5a731d Fix NPE 2019-09-24 12:11:16 +00:00
Anthony Calosa
6ad34fed2c Better Fix NPE 2019-09-24 20:07:22 +08:00
Anthony Calosa
028880e026 Fix NPE 2019-09-24 19:47:17 +08:00
Anthony Calosa
b2f80b47a9 Display Ability Icons (Mobile & PC) 2019-09-24 12:30:51 +08:00
Valerio Maggio
e246751cab Added missing Localizer Import 2019-09-23 16:16:21 +01:00
Valerio Maggio
e9de55ebc8 Merge Upstream and conflict resolved on ImageView with missing localiser 2019-09-23 16:06:40 +01:00
Anthony Calosa
77ab276d83 Add Path to Exile, Act of Treason test (The player whose controller of the creature taken by Act of Treason in this test after casting Path to Exile to the creature is the one who will get the benefit of getting the land) 2019-09-19 14:11:12 +00:00
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
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
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
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
Valerio Maggio
27a65c551b Removed unused imports to avoid checkstyle failures 2019-08-25 14:46:39 +02:00
Valerio Maggio
fe95de30cf Merge remote-tracking branch 'upstream/master' 2019-08-25 12:37:35 +02:00
Valerio Maggio
f8c98dca5d Add new shared options to show Unique Cards Only in ItemList and Image views 2019-08-25 12:24:01 +02: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