external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,079 Commits 33 Branches 187 Tags
baff2a548617ea807d5285da65589dbb87a5f09c
Commit Graph

53079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
baff2a5486 - Minor change to the code. 2021-10-05 07:04:43 +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
Michael Kamensky
fd41a0c00f Merge branch 'combo' into 'master' 
Fix Combo Attack

See merge request core-developers/forge!5499
 2021-10-05 04:01:43 +00:00
tool4EvEr
2435111048 Fix Combo Attack 2021-10-04 23:06:13 +02:00
Anthony Calosa
693d5c4597 Merge branch 'master' into 'master' 
[Mobile] fix accuracy for mouse hover

See merge request core-developers/forge!5498
 2021-10-04 20:27:13 +00:00
Anthony Calosa
58403fde5b [Mobile] fix accuracy for mouse hover 2021-10-05 04:25:50 +08:00
Michael Kamensky
fe60e5ef31 - Attempt to fix FightAi for Back for More, part 2. 2021-10-04 23:04:11 +03:00
Michael Kamensky
40af8ba071 - Attempt to fix FightAi for Back for More. 2021-10-04 23:03:37 +03:00
Bug Hunter
5bd6be02c6 Merge branch 'aifix' into 'master' 
Fix DamageDealAi when not targeting players

See merge request core-developers/forge!5496
 2021-10-04 19:53:52 +00:00
tool4EvEr
34fdad4379 Fix DamageDealAi when not targeting players 2021-10-04 21:54:13 +02:00
Michael Kamensky
c6e072cc1a Merge branch 'master' into 'master' 
Fix imports.

See merge request core-developers/forge!5495
 2021-10-04 19:24:50 +00:00
Michael Kamensky
4885898588 - Fix imports. 2021-10-04 22:24:14 +03:00
Michael Kamensky
2aa70f7dc3 Merge branch 'suspend' into 'master' 
Fix Quicken + Suspend

See merge request core-developers/forge!5494
 2021-10-04 18:09:53 +00:00
tool4EvEr
4470cdc0bf Don't allow suspend when Split Second 2021-10-04 18:31:13 +02:00
TRT
8e35f0b4ce Clean up 2021-10-04 17:19:15 +02:00
TRT
d24bbf1979 Cleanup usesTargeting 2021-10-04 17:13:37 +02:00
TRT
68f3879f11 Fix Quicken + Suspend 2021-10-04 14:05:13 +02:00
Michael Kamensky
ecf1843922 Merge branch 'aifix' into 'master' 
Improvements for Oath of Mages, Grimoire Thief & Tyrant of Discord

See merge request core-developers/forge!5493
 2021-10-04 03:44:53 +00:00
tool4EvEr
42b6d39726 Improvements for Oath of Mages, Grimoire Thief & Tyrant of Discord 2021-10-04 00:51:34 +02:00
Anthony Calosa
97b5100fc9 Merge branch 'master' into 'master' 
update TrackableProperty

See merge request core-developers/forge!5492
 2021-10-03 09:58:45 +00:00
Anthony Calosa
194b4b2128 update TrackableProperty 2021-10-03 17:57:40 +08:00
Michael Kamensky
fc1a291bdc Merge branch 'master' into 'master' 
Fix local Multiplayer Phase Indicator

See merge request core-developers/forge!5491
 2021-10-03 04:32:42 +00:00
Michael Kamensky
fbb7ce8938 Merge branch 'npe' into 'master' 
Fix NPE when attaching aura with Genesis Hydra

See merge request core-developers/forge!5488
 2021-10-03 04:32:21 +00:00
Anthony Calosa
64c7e5b5cb update empty stack not hidden on local multiplayer 2021-10-03 11:32:48 +08:00
tool4EvEr
50c5d479e6 copyLastState must happen before any move 2021-10-02 21:52:01 +02:00
Anthony Calosa
3bf4c33044 Fix local Multiplayer Phase Indicator 2021-10-02 13:56:40 +08:00
Michael Kamensky
2cec5db777 Merge branch 'twosat-master-patch-24386' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5490
 2021-10-02 03:52:32 +00:00
Andreas Bendel
13e1840da0 Update de-DE.properties 
GrayText translation
 2021-10-01 21:02:52 +00:00
Michael Kamensky
10a21fb1a6 Merge branch 'johnwilliams7-master-patch-48251' into 'master' 
Update Pro Tour Promos.txt

See merge request core-developers/forge!5489
 2021-10-01 20:27:47 +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
c1fa46df39 Fix NPE when attaching aura with Genesis Hydra 2021-10-01 18:51:14 +02:00
Michael Kamensky
f452e86221 Merge branch 'aifix' into 'master' 
EffectAi: fix logic for targeting spells for prevent

See merge request core-developers/forge!5487
 2021-10-01 14:54:31 +00:00
tool4EvEr
9a4b60aaf5 Fix targeting 2021-10-01 16:32:47 +02: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
0d13edd84e clean up a few things 2021-09-30 22:13:19 -04:00
Northmoc
c73395e98b add prompts in all languages 2021-09-30 22:04:39 -04:00
Northmoc
c2dfde32fb implement preference in getAbilityText 2021-09-30 22:01:05 -04:00
Northmoc
aa0b390cde GameRules set up useGrayText boolean 2021-09-30 22:00:33 -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
0c7b0621cd note for mobile version pref handling 2021-09-30 12:53:59 -04:00
Michael Kamensky
e131ad1f2c Merge branch 'master' into 'master' 
Fix imports.

See merge request core-developers/forge!5486
 2021-09-30 16:25:41 +00:00
Michael Kamensky
e02168b3e4 - Fix imports. 2021-09-30 19:25:14 +03: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
080bd7324b Merge branch 'master' into 'master' 
Add Foretold Event

See merge request core-developers/forge!5483
 2021-09-30 13:48:46 +00:00
Anthony Calosa
54ee4d451e Merge remote-tracking branch 'remotes/core/master' 2021-09-30 21:46:47 +08:00