external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,951 Commits 31 Branches 187 Tags
b049c8c09becb7188894a86bb76f7abcded916f3
Commit Graph

3490 Commits

Author SHA1 Message Date
Valerio Maggio
e9de55ebc8 Merge Upstream and conflict resolved on ImageView with missing localiser 2019-09-23 16:06:40 +01:00
Hans Mackowiak
14c9a8ccc3 ReplacementEffect: add Mode for ReplacementType 2019-09-23 11:53:48 +00:00
Ryan1729
9ab35769d5 fix restricted cards not being restricted to one. 2019-09-18 21:34:19 -06:00
swordshine
4fe155959e Merge branch 'push_down_toStringMap_part_1' into 'master' 
Push down toStringMap part 1

See merge request core-developers/forge!2127
 2019-09-18 10:48:34 +00:00
Ryan1729
42d0695804 push down toStringMap further, which required using AbilityKey inside TriggerWaiting and several other places. 2019-09-14 19:44:27 -06:00
Anthony Calosa
eda7d435e4 Merge remote-tracking branch 'remotes/core/master' 2019-09-12 20:38:53 +08:00
Anthony Calosa
8e282b16c5 Update Player Name 2019-09-12 20:30:42 +08: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
swordshine
51117558ac Merge branch 'update_run_trigger_callers_part_1' into 'master' 
Update run trigger callers part 1

See merge request core-developers/forge!2103
 2019-09-11 06:11:18 +00:00
Anthony Calosa
5f78608321 Some codes needed to revert 2019-09-09 13:30:53 +08:00
Ryan1729
311bbea70f remove more null literals where overloads that pass null exist 2019-09-08 21:34:46 -06:00
Anthony Calosa
1321bcd125 Revert URL Decode to support older phone 2019-09-08 10:45:13 +08: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
Anthony Calosa
3269d3fd9d Fix gameview when there is no human player 2019-09-06 21:41:05 +08: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
Anthony Calosa
efa606783c Cleanup 2019-09-03 22:13:35 +08:00
Anthony Calosa
a4d34bb858 Retained some schemas 2019-09-03 11:20:10 +08:00
Anthony Calosa
c38bae910a Refactor/Code Cleanup 2019-09-02 18:08:56 +08:00
Anthony Calosa
a15a5ad5c3 Fix Portrait mode Exit/Back key 2019-08-28 20:42:06 +08:00
Anthony Calosa
4af721ac6f Shorter Log 2019-08-28 09:37:40 +08:00
Valerio Maggio
fe95de30cf Merge remote-tracking branch 'upstream/master' 2019-08-25 12:37:35 +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
Valerio Maggio
14ce377ca6 disabled Unique cards only by default in Deck Editor 2019-08-24 20:02:11 +02:00
kevlahnota
9d63eac89a WIP: Partial fix on preventsleep when downloading resource. 2019-08-24 18:14:35 +08: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
Hans Mackowiak
b554198a96 K'rrik and his phyrexian like ability 2019-08-17 10:43:53 +00:00
Peter
dc676cda3d Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-15 08:06:37 +02:00
Hans Mackowiak
1303991ee7 CostSacrifice: allow X as amount 2019-08-14 17:33:06 +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
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
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
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
f473baa730 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-01 17:00:46 +02:00
Michael Kamensky
88ed810e4a Fix an issue with multitargeting the same card while UniqueTargets is set. 2019-08-01 14:08:09 +00:00
Peter
e4f41903d4 Changed delimiter from # to | (reminder texts fixed). 
Python script now downloads the big json file from scryfall.
Updated spanish and deutsch translations
 2019-07-31 17:57:47 +02:00
Peter
00899ff4ce Extract getting translation texts to CardTranslation 2019-07-31 11:59:54 +02:00
Peter
23b083d9ab Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-07-31 11:17:26 +02:00
Peter
b23f3d9acc Fix: We need to pass &face=back to API in order to download backface 
images correctly.
 2019-07-30 14:24:54 +02:00
Peter
cb18a369dd Changed oracle translation using the original getText function (before we lost the getText additional hints when translating). 
Needs more translation fixes.
Splitted cards (e.g. Grizzled Outcasts) don't update the translated oracle text.
 2019-07-30 13:56:41 +02:00
Peter
c7b1e764c6 Not needed to read Forge Preferences because the language selected in UI 
is passed when preloading translations.
 2019-07-30 12:31:14 +02:00
Peter
98cb151929 Merge branch 'master' into ui-card-translation 2019-07-30 12:19:51 +02:00
Michael Kamensky
d9899636c7 Merge branch 'nicerLondonMulliganMessage' into 'master' 
Show the number of cards you need to put back when London mulliganning

See merge request core-developers/forge!1990
 2019-07-30 03:27:17 +00:00
kms70847
60c2119f16 Show the number of cards you need to put back when London mulliganning 2019-07-29 22:01:34 -04:00
Peter
6d126acd7c Added new font characters to mobile port (diacritics). 
Deleted removeDiacritics because it's not needed now in mobile port.
 2019-07-28 13:55:15 +02:00
Peter
6e3cadac99 Added es-ES and de-DE translation files (generated via python script) 2019-07-28 11:00:47 +02:00