Commit Graph

18628 Commits

Author SHA1 Message Date
Michael Kamensky
760a25a5fa Merge branch 'sacrifice' into 'master'
getPlayers: use APNAP order

See merge request core-developers/forge!5510
2021-10-07 13:32:12 +00:00
Bug Hunter
ff257f89f7 getPlayers: use APNAP order 2021-10-07 13:32:12 +00:00
Northmoc
7a224548a5 better Hideaway fix 2021-10-07 09:26:54 -04:00
Northmoc
1e83e5364f tidy up sublime_epiphany.txt 2021-10-07 09:10:02 -04:00
Anthony Calosa
ad939ea3bd [Mobile] Refactor Targeting Arrows
- Added option to use new arrow overlay
2021-10-07 16:22:56 +08:00
Michael Kamensky
cb5f0f360b Merge branch 'hideaway' into 'master'
allow for Watcher for Tomorrow to have correct reminder text

See merge request core-developers/forge!5514
2021-10-07 03:49:39 +00:00
Northmoc
63a7b68642 allow for Watcher for Tomorrow to have correct reminder text 2021-10-06 20:18:20 -04:00
Northmoc
3cb322ae5f fix wandering_archaic_explore_the_vastlands.txt 2021-10-06 17:59:41 -04:00
Michael Kamensky
e7f06887f0 Merge branch 'ai' into 'master'
Add ReplaceDamageAi

See merge request core-developers/forge!5512
2021-10-06 20:05:51 +00:00
tool4EvEr
d175f6cb6d Clean up 2021-10-06 20:59:51 +02:00
tool4EvEr
e21871b1e7 Clean up 2021-10-06 18:09:57 +02:00
Hans Mackowiak
164784fdad Update the_bears_of_littjara: fix SpellDescription 2021-10-06 07:28:51 +00:00
tool4EvEr
8ea9eb6118 Add AI for Rousing Refrain 2021-10-05 20:16:34 +02:00
Michael Kamensky
d444c7ec82 - Added puzzle PS_MID1. 2021-10-05 07:54:28 +03:00
Michael Kamensky
9ced0e0d76 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-10-05 07:02:29 +03:00
tool4EvEr
2435111048 Fix Combo Attack 2021-10-04 23:06:13 +02:00
Michael Kamensky
40af8ba071 - Attempt to fix FightAi for Back for More. 2021-10-04 23:03:37 +03:00
TRT
d24bbf1979 Cleanup usesTargeting 2021-10-04 17:13:37 +02:00
Andreas Bendel
13e1840da0 Update de-DE.properties
GrayText translation
2021-10-01 21:02:52 +00:00
John Williams
356e9ff477 Update Pro Tour Promos.txt 2021-10-01 19:57:12 +00:00
Michael Kamensky
bb421ea2e6 Merge branch 'gray_text' into 'master'
Gray text preference

See merge request core-developers/forge!5485
2021-10-01 17:09:36 +00:00
tool4EvEr
781de0fd5a Clean up 2021-10-01 16:28:03 +02:00
Michael Kamensky
cda73ae992 Merge branch 'austeregrim-add-m4a-music-filter' into 'master'
Update forge-gui/src/main/java/forge/sound/MusicPlaylist.java

See merge request core-developers/forge!5484
2021-10-01 03:42:33 +00:00
Northmoc
c73395e98b add prompts in all languages 2021-09-30 22:04:39 -04:00
Northmoc
7a86f84d0d add the pref to different rules sets 2021-09-30 22:00:02 -04:00
Northmoc
b3a7a8aecf add the pref to different rules sets 2021-09-30 21:59:45 -04:00
Northmoc
36a8c93bc8 setting up the pref 2021-09-30 12:21:52 -04:00
Northmoc
d4e0202e20 ForgePreferences 2021-09-30 12:21:51 -04:00
Austere Grim
2e27a95f3e Update forge-gui/src/main/java/forge/sound/MusicPlaylist.java 2021-09-30 16:20:15 +00:00
Anthony Calosa
54ee4d451e Merge remote-tracking branch 'remotes/core/master' 2021-09-30 21:46:47 +08:00
Anthony Calosa
ca3e19c289 Add Foretold Event
When a player foretolds a card, the exile is shown
2021-09-30 21:45:40 +08:00
Michael Kamensky
abf498f746 Merge branch 'klaxnek-master-patch-82600' into 'master'
Update es-ES.properties (translated lblShowBattlefield)

See merge request core-developers/forge!5481
2021-09-30 12:44:29 +00:00
klaxnek
11fb7fd296 Updated card translations (Innistrad) 2021-09-30 14:14:14 +02:00
klaxnek
c63519b644 Update es-ES.properties (translated lblShowBattlefield) 2021-09-30 10:14:31 +00:00
Michael Kamensky
0ed61fcee7 Merge branch 'draw_reveal' into 'master'
tweak Sindbad effect to reveal drawn to player before discard

See merge request core-developers/forge!5473
2021-09-30 03:42:18 +00:00
Northmoc
cf2086a79b tweak Sindbad effect to reveal drawn to player before discard 2021-09-29 19:35:42 -04:00
Andreas Bendel
1a8ab764fe Update de-DE.properties
translated lblShowBattlefield
2021-09-29 18:47:06 +00:00
Michael Kamensky
b3d0e1c81d Merge branch 'custom-sound-fx' into 'master'
Auto-detect custom sound files for cards if they exist

See merge request core-developers/forge!5468
2021-09-29 11:01:14 +00:00
Anthony Calosa
660d827c54 [Mobile] enable mouseMoved and update some selectable element 2021-09-29 17:42:03 +08:00
Michael Kamensky
0454786545 - Auto-detect custom sound files for cards if they exist. 2021-09-29 09:30:53 +03:00
Michael Kamensky
9a7fe7c4f0 Merge branch 'tapcap' into 'master'
Fix some tap-related capitalization issues

See merge request core-developers/forge!5463
2021-09-29 03:49:05 +00:00
Michael Kamensky
37837810bb Merge branch 'fix' into 'master'
blood_lust.txt streamline

See merge request core-developers/forge!5464
2021-09-29 03:48:48 +00:00
Michael Kamensky
f86018817e Merge branch 'cleanup' into 'master'
Cleanup Duel for Dominance

See merge request core-developers/forge!5466
2021-09-29 03:48:26 +00:00
Michael Kamensky
e7427b9836 Merge branch 'master' into 'master'
Update simplified chinese translation

See merge request core-developers/forge!5467
2021-09-29 03:47:31 +00:00
CCTV-1
88a18af329 translate new settings. 2021-09-29 11:13:04 +08:00
tool4EvEr
756dbf08c1 Cleanup Duel for Dominance 2021-09-28 23:15:25 +02:00
Northmoc
e25a966abc lynde_cheerful_tormentor.txt 2021-09-28 16:42:32 -04:00
Northmoc
4cfe47901c blood_lust.txt streamline 2021-09-28 16:35:31 -04:00
Northmoc
39c96322f8 fix capitalization in prompts 2021-09-28 14:36:20 -04:00
Northmoc
6ffd8e28a3 capitalize the tap button! 2021-09-28 14:26:09 -04:00