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

3585 Commits

Author SHA1 Message Date
Anthony Calosa
38b07d6185 Merge remote-tracking branch 'origin/master' 2019-09-03 21:12:16 +08:00
Hans Mackowiak
6247cffcfe Fix Pump with negative values 2019-09-03 09:34:31 +00: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
Hans Mackowiak
c55ec06688 PumpEffect: fix PT update for view 2019-09-02 04:49:08 +00:00
Hans Mackowiak
c04ccdaf7c Card: combine PT boost into one Map using timestamp 2019-09-01 05:39:09 +00:00
Peter
d859368d7c Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-27 19:06:25 +02:00
Hanmac
ea14729609 PowerExchangeEffect: use NewPT to set base power 2019-08-26 21:35:37 +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
Michael Kamensky
6c64ae97fb - Update the state for view when unanimating the card, helps address misrepresented visual state for relevant cards. 2019-08-23 04:52:20 +00:00
swordshine
ffbf21c233 Merge branch 'grip-of-chaos' into 'master' 
Try to fix Grip of Chaos

See merge request core-developers/forge!1535
 2019-08-23 02:56:00 +00:00
swordshine
5e260fc9fb Fix Reality Scramble 2019-08-22 23:35:12 +08:00
swordshine
47a1b6ea98 Merge branch 'patch' into 'master' 
C19 cards

See merge request core-developers/forge!2042
 2019-08-20 12:20:57 +00:00
swordshine
a8c1377e10 Update Wall of Stolen Identity 2019-08-20 20:02:59 +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
swordshine
cf9256ddf8 Add Wall of Stolen Identity 2019-08-18 15:16:22 +08:00
swordshine
c47b0acccb Add "until end of combat" 2019-08-17 19:03:57 +08:00
swordshine
97a13768a4 Add Tahngarth, First Mate 2019-08-17 18:59:56 +08:00
Hans Mackowiak
b554198a96 K'rrik and his phyrexian like ability 2019-08-17 10:43:53 +00:00
Michael Kamensky
e03f555add NPE guard for no owner in getController 2019-08-17 06:24:58 +00:00
swordshine
22a3060444 Merge branch 'npe-fix' into 'master' 
NPE prevention in AttackConstraints.

Closes #1118

See merge request core-developers/forge!2032
 2019-08-16 00:42:37 +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
Peter
3f76085a5d Removed regex formatting (problems with UTF-8...) 2019-08-15 08:05:20 +02:00
Hans Mackowiak
1303991ee7 CostSacrifice: allow X as amount 2019-08-14 17:33:06 +00:00
Peter
368ffbf41d Don't translate cloned cards. 2019-08-14 15:14:06 +02: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
Agetian
dc73d5b417 - NPE prevention. 2019-08-13 22:19:52 +03:00
Hans Mackowiak
581e05c01d EndCombatPhase: add way to end combat phase by effect 2019-08-13 05:35:29 +00:00
Hans Mackowiak
9110cd08fd CostAdjustment: fix facedown cast setting facedown flag 2019-08-11 12:33:41 +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
Hans Mackowiak
f08432273c Manifest: add Choices 2019-08-10 10:44:53 +00:00
swordshine
49bdff3f17 Merge branch 'sonarqubefixes01' into 'master' 
Fixes some SonarQube detected bugs

See merge request core-developers/forge!2019
 2019-08-10 10:32:18 +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
swordshine
0899629e16 Merge branch 'patch' into 'master' 
C19

See merge request core-developers/forge!2017
 2019-08-10 10:01:28 +00:00
Hans Mackowiak
fd0c79968d StaticAbility: add flag for static Goad 2019-08-10 08:44:44 +00:00
swordshine
6c6a729dcf C19: Fix Cliffside Rescuer 2019-08-10 15:47:24 +08:00
swordshine
f83b09bad3 C19: Add Cliffside Rescuer 2019-08-10 13:42:33 +08:00
swordshine
aa4e04e0f6 C19: Add Archfiend of Spite 2019-08-10 13:29:49 +08:00
swordshine
ca06bc69a2 Merge branch 'patch' into 'master' 
C19 cards

See merge request core-developers/forge!2014
 2019-08-10 01:08:07 +00:00
swordshine
004d3e5805 C19: Add Voice of Many 2019-08-09 23:12:24 +08:00
Hans Mackowiak
f0e22cf712 Merge branch '1112-effect-emblem-for-each-player' into 'master' 
Resolve "Effect: Emblem for each player"

Closes #1112

See merge request core-developers/forge!2002
 2019-08-08 18:32:52 +00:00
klaxnek
68bf39d218 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-08 16:57:45 +02:00
Hans Mackowiak
75cc8d3ee2 Update ReplacementHandler: otherwise it causes crashes 2019-08-06 20:55:40 +00:00
Hanmac
e5b9c313b4 CardView: updateStateForView on GameAction changeZone 2019-08-03 10:39:15 +02:00
Hanmac
e45babe243 EffectEffect: make an Effect for each Owner 2019-08-02 07:22:43 +02:00
Hanmac
773f2b280f Loyalty: use String Property for X 2019-08-01 21:16:07 +02:00
Peter
00899ff4ce Extract getting translation texts to CardTranslation 2019-07-31 11:59: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
Michael Kamensky
91327b7310 Merge branch 'controllerInWeirdZonesFix' into 'master' 
Cards in graveyards (etc) are always controlled by their owners

See merge request core-developers/forge!1991
 2019-07-30 05:37:04 +00:00
kms70847
89da830c6c Rebound: "it's manacost" -> "its mana cost" 2019-07-29 23:03:58 -04:00