external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,672 Commits 33 Branches 187 Tags
5e90679d76b2080e01a78a8cf0c46f1d5370db8c
Commit Graph

42672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
fbf94af590 Merge branch 'master' into 'master' 
Add Oathbreaker variant

See merge request core-developers/forge!2043
 2019-08-20 04:34:14 +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
Michael Kamensky
ce96e64edb Merge branch 'fix-mobile-home' into 'master' 
Restore mobile home screen buttons

See merge request core-developers/forge!2045
 2019-08-20 04:32:31 +00:00
drdev
8e812c7f2a Remove unused imports 2019-08-19 22:50:28 -05: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
Michael Kamensky
4e79ea827d Merge branch 'ai-krrik' into 'master' 
Basic AI for payments via K'rrik's static ability.

See merge request core-developers/forge!2044
 2019-08-19 09:49:09 +00:00
Agetian
c823a493bb - Basic AI for payments via K'rrik's static ability. 2019-08-19 09:25:50 +03:00
swordshine
cf9256ddf8 Add Wall of Stolen Identity 2019-08-18 15:16:22 +08:00
swordshine
e929523aea Fix Mass Diminish 2019-08-18 13:20:38 +08:00
swordshine
676e92fee2 Add Ghired's Belligerence 2019-08-18 11:52:21 +08:00
swordshine
955d18caa3 Add Thieving Amalgam 2019-08-18 11:10:43 +08:00
swordshine
bfd42a8c60 Merge branch 'patch' into 'master' 
Add Tahngarth, First Mate

See merge request core-developers/forge!2041
 2019-08-17 11:52:08 +00: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
swordshine
ad9f08e85e Merge branch 'krrik' into 'master' 
K'rrik and his phyrexian like ability

See merge request core-developers/forge!2040
 2019-08-17 10:43:53 +00:00
Hans Mackowiak
b554198a96 K'rrik and his phyrexian like ability 2019-08-17 10:43:53 +00:00
swordshine
ea552253ef Merge branch 'fix-npe-getcontroller' into 'master' 
NPE guard for no owner in getController

Closes #1125

See merge request core-developers/forge!2039
 2019-08-17 06:24:58 +00:00
Michael Kamensky
e03f555add NPE guard for no owner in getController 2019-08-17 06:24:58 +00:00
swordshine
db00eb640d Merge branch 'mobile-hometranslations-exit' into 'master' 
Mobile only: Translate home menus and add an exit button

See merge request core-developers/forge!2038
 2019-08-16 00:43:39 +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
e3bc9bf5dc Mobile only: Translate home menus and add an exit button 2019-08-15 21:05:00 +02:00
swordshine
b32017aab2 Merge branch 'patch' into 'master' 
Fix the color of Arcum's Astrolabe

See merge request core-developers/forge!2037
 2019-08-15 07:15:34 +00:00
swordshine
e29663916c Fix the color of Arcum's Astrolabe 2019-08-15 15:06:57 +08:00
Michael Kamensky
b40300d072 Merge branch 'fixCombatTest' into 'master' 
PickerTest: fix combat

Closes #1121

See merge request core-developers/forge!2036
 2019-08-15 06:57:31 +00:00
Hans Mackowiak
59e7ca4a9f PickerTest: fix combat 2019-08-15 06:57:30 +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
Michael Kamensky
dde0cf1fa5 Merge branch 'sacrificeXCost' into 'master' 
CostSacrifice: allow X as amount

See merge request core-developers/forge!2023
 2019-08-14 17:33:06 +00: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
Peter
3f058ff6d9 Merge branch 'ui-card-translation' of https://git.cardforge.org/klaxnek/forge into ui-card-translation 2019-08-14 10:50:11 +02:00
swordshine
424ed9bad1 Merge branch 'patch' into 'master' 
Fix Atla Palani, Nest Tender

See merge request core-developers/forge!2035
 2019-08-14 07:22:56 +00:00
swordshine
17d3f23bed Fix Atla Palani, Nest Tender 2019-08-14 15:22:12 +08:00
swordshine
c248034a3d Merge branch 'patch' into 'master' 
Fix a few cards reported in the slightlymagic forum

See merge request core-developers/forge!2034
 2019-08-14 01:46:05 +00:00
swordshine
5b43f81d7b Fix a few cards reported in the slightlymagic forum 2019-08-14 09:45:24 +08:00
Sol
09157b0122 Merge branch 'patch-3' into 'master' 
Add messaging about Java 8.211 being bad

See merge request core-developers/forge!2033
 2019-08-14 01:22:13 +00:00
Sol
34a2917e08 Update ANNOUNCEMENTS.txt 2019-08-14 01:21:38 +00:00
Agetian
dc73d5b417 - NPE prevention. 2019-08-13 22:19:52 +03:00
swordshine
b591421bd5 Merge branch 'patch' into 'master' 
Fix Frostwalk Bastion

See merge request core-developers/forge!2031
 2019-08-13 15:24:51 +00:00
swordshine
6f517770d9 Fix Frostwalk Bastion 2019-08-13 23:22:56 +08:00
Michael Kamensky
8e5c50ed9c Merge branch 'master' into 'master' 
Added puzzle PS_M205 - Possibility Storm - Magic Core Set 2020 05

See merge request core-developers/forge!2030
 2019-08-13 06:15:36 +00:00
Agetian
d56c6c78e4 - Added puzzle PS_M205. 2019-08-13 09:14:27 +03:00
Michael Kamensky
c788329202 Merge branch 'endCombatPhase' into 'master' 
EndCombatPhase: add way to end combat phase by effect

See merge request core-developers/forge!2029
 2019-08-13 05:35:29 +00:00
Hans Mackowiak
581e05c01d EndCombatPhase: add way to end combat phase by effect 2019-08-13 05:35:29 +00:00
Michael Kamensky
0142532532 Merge branch 'typofix5' into 'master' 
Fix typos in card files, mostly having to do with missing or extra pipes

See merge request core-developers/forge!2028
 2019-08-13 04:42:41 +00:00
kms70847
ec8c77abfb Fix typos in card files, mostly having to do with missing or extra pipes 2019-08-12 23:09:40 -04:00
swordshine
61087e135b Merge branch 'patch' into 'master' 
Fix Battlefield Thaumaturge

See merge request core-developers/forge!2027
 2019-08-13 02:39:20 +00:00
swordshine
3a6c07bb0b Fix Battlefield Thaumaturge 2019-08-13 10:38:55 +08:00
swordshine
bb09ac2550 Merge branch 'patch' into 'master' 
C19: Sevinne, the Chronoclasm

See merge request core-developers/forge!2026
 2019-08-13 01:06:12 +00:00