external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 32 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

2168 Commits

Author SHA1 Message Date
klaxnek
fa6fce9589 Moved CardTranslation to forge-core. We need it to translate card info in forge-game. 2019-10-23 11:47:21 +02:00
Anthony Calosa
402885391f Card Sleeves 2019-10-22 16:12:03 +08:00
Hans Mackowiak
773df25b53 replace .getZone().is with .isInZone, no null check needed 2019-10-14 18:46:43 +00:00
swordshine
c7a1aae06b Merge branch 'deck-editor-unique-filter' into 'master' 
Deck editor filters bug

See merge request core-developers/forge!2214
 2019-10-07 03:45:17 +00:00
Ryan Wiedemann
7fcac4944a change assertTrue to assertEquals as suggested by Intellij, so we get better test failure messages 2019-10-07 02:20:19 +00:00
Ryan1729
ea25ad2c3b use setVisible(true) instead of show to get rid of the warning 2019-10-06 01:49:06 -06:00
Ryan1729
ac7f34d3f5 Cast to Object as recommended by warning 2019-10-06 01:40:15 -06:00
Ryan1729
6808be7a42 route all capitalize calls through a new method 2019-10-06 01:33:52 -06:00
Ryan1729
70986149ef do less stuff since we know what the arguments will be. 2019-10-06 01:05:42 -06:00
Ryan1729
bc859b3e52 inline wrap 2019-10-06 00:56:12 -06:00
Ryan1729
eb376b8eb3 pull all still needed WordUtils.wrap calls into one method 2019-10-06 00:55:29 -06:00
swordshine
eb82d454b8 Merge branch 'start_replacement_run_keys_refactor' into 'master' 
Start replacement run keys refactor

See merge request core-developers/forge!2175
 2019-10-06 06:22:54 +00:00
Valerio Maggio
c07230c447 workaround to fix Deck Editor extra space for label 2019-10-03 18:50:37 +01:00
Valerio Maggio
27565d4cc0 fixed bug that was keep on creating filters in deck editor every tab switch (issue 1174) 2019-10-03 18:33:12 +01:00
Anthony Calosa
bf5f581cf6 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-01 14:28:38 +08:00
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
Blacksmith
d028cd2918 [maven-release-plugin] prepare for next development iteration 2019-09-29 00:23:27 +00:00
Blacksmith
4803d74c33 [maven-release-plugin] prepare release forge-1.6.29 2019-09-29 00:23:21 +00: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
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