external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,546 Commits 31 Branches 187 Tags
c3a95a07a1a28e9664617bb9007d6d715c9e211c
Commit Graph

43546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan1729
4969547938 inline capitalize 2019-10-06 01:36:37 -06:00
Ryan1729
6808be7a42 route all capitalize calls through a new method 2019-10-06 01:33:52 -06:00
Ryan1729
70986149ef do less stuff since we know what the arguments will be. 2019-10-06 01:05:42 -06:00
Ryan1729
bc859b3e52 inline wrap 2019-10-06 00:56:12 -06:00
Ryan1729
eb376b8eb3 pull all still needed WordUtils.wrap calls into one method 2019-10-06 00:55:29 -06:00
swordshine
eb82d454b8 Merge branch 'start_replacement_run_keys_refactor' into 'master' 
Start replacement run keys refactor

See merge request core-developers/forge!2175
 2019-10-06 06:22:54 +00:00
Ryan1729
33ccc5c21f remove import 
...
 2019-10-05 23:52:14 -06:00
Ryan1729
5f3a0b3f0b change replacingObjects type 2019-10-05 23:44:22 -06:00
Ryan1729
f6134e3ccf update canReplace method 2019-10-05 22:24:05 -06:00
Michael Kamensky
d294e02b44 Merge branch 'cardTraitsReworkAnimate' into 'master' 
Card: CardTraits are now not added to Card/State anymore but uses timestamp

Closes #1165, #1120, #955, and #573

See merge request core-developers/forge!2216
 2019-10-05 19:59:28 +00:00
Hans Mackowiak
f32a8d7bb8 Card: CardTraits are now not added to Card/State anymore but uses timestamp 2019-10-05 19:59:28 +00:00
Michael Kamensky
5a13903b34 Merge branch 'master' into 'master' 
Added puzzle PS_ELD0 - Possibility Storm - Throne of Eldraine 00 (Pre-release Puzzle)

See merge request core-developers/forge!2217
 2019-10-05 11:37:49 +00:00
Michael Kamensky
3af071a531 Merge branch 'adventureZoneCheck' into 'master' 
GameAction: better ZoneCheck for Adventure

See merge request core-developers/forge!2218
 2019-10-05 11:37:30 +00:00
Hans Mackowiak
937521632d GameAction: better ZoneCheck for Adventure 2019-10-05 11:37:29 +00:00
Agetian
f95cdd6ab4 - Added puzzle PS_ELD0. 2019-10-05 10:51:34 +03:00
Alessandro Coli
9fce28bed7 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-04 23:13:19 +02:00
swordshine
dc000318bd Merge branch 'patch-3' into 'master' 
Refactor String.join -> StringUtils.join

See merge request core-developers/forge!2213
 2019-10-04 03:35:29 +00:00
swordshine
0dbc90817a Merge branch 'patch-2' into 'master' 
Prevent NPE casting adventure card as spell

See merge request core-developers/forge!2211
 2019-10-04 03:35:07 +00:00
Alessandro Coli
0bcc0e9248 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-03 20:44:18 +02:00
leriomaggio
780343a746 Added myself to the list of contributors 2019-10-03 19:37:29 +01:00
Valerio Maggio
c07230c447 workaround to fix Deck Editor extra space for label 2019-10-03 18:50:37 +01:00
Valerio Maggio
27565d4cc0 fixed bug that was keep on creating filters in deck editor every tab switch (issue 1174) 2019-10-03 18:33:12 +01:00
Valerio Maggio
c6bd5aaaf1 Merge remote-tracking branch 'upstream/master' into ref-base-fork 2019-10-03 18:10:26 +01:00
Anthony Calosa
90e2c08e75 Refactor String.join -> StringUtils.join 2019-10-03 13:54:34 +00:00
swordshine
3c2eac78d6 Merge branch 'patch' into 'master' 
Fix Tome of Legends

See merge request core-developers/forge!2212
 2019-10-03 12:58:19 +00:00
swordshine
92077f1647 Fix Tome of Legends 2019-10-03 20:47:13 +08:00
Michael Kamensky
3b47b51bb7 Merge branch 'newBranch' into 'master' 
Manaicons update

See merge request core-developers/forge!2210
 2019-10-03 07:18:21 +00:00
Anthony Calosa
c9c27faf8f Prevent NPE casting adventure card as spell 2019-10-03 05:45:44 +00:00
Anthony Calosa
ed5d654ac3 Rounded edges a little 2019-10-03 13:06:16 +08:00
Anthony Calosa
353263f936 Add slight drop shadow 2019-10-03 13:00:34 +08:00
swordshine
cecf532da8 Merge branch 'german-translation' into 'master' 
german translation update

See merge request core-developers/forge!2209
 2019-10-03 03:15:09 +00:00
Anthony Calosa
5c9edece87 Reduce edge aliasing 2019-10-02 23:38:29 +08:00
Alessandro Coli
aecee3cea2 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-02 13:30:06 +02:00
Dagin Svezek
677c19ca80 german translation update 2019-10-02 05:53:04 +00:00
Michael Kamensky
7b6543e7fa Merge branch 'staticEffectCleanup' into 'master' 
StaticEffect: cleanup old methods

See merge request core-developers/forge!2208
 2019-10-02 05:06:15 +00:00
Hans Mackowiak
9fefaa58fc StaticEffect: cleanup old methods 2019-10-02 05:06:15 +00:00
swordshine
297b7e9728 Merge branch 'patch' into 'master' 
Fix Rowan, Fearless Sparkmage

See merge request core-developers/forge!2207
 2019-10-02 02:50:55 +00:00
swordshine
873d4dfc0a Fix Rowan, Fearless Sparkmage 2019-10-02 10:45:58 +08:00
Michael Kamensky
e2f7358970 Merge branch 'newBranch' into 'master' 
Upscale some sprites

See merge request core-developers/forge!2201
 2019-10-01 17:34:05 +00:00
Michael Kamensky
d2666caf73 Merge branch 'master' into 'master' 
No need to separately add the Food card by name to AI sac preferences.

See merge request core-developers/forge!2206
 2019-10-01 17:30:39 +00:00
Agetian
6e906888cb - No need to separately add the Food card by name to AI sac preferences. 2019-10-01 20:22:21 +03:00
Alessandro Coli
3432b9fdcd Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-01 18:56:14 +02:00
Anthony Calosa
72ab3cc690 adjust spacing - rendered icons 2019-10-01 21:47:53 +08:00
Anthony Calosa
7a614352bd Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-01 20:13:51 +08:00
swordshine
5ccc6ca10f Merge branch 'patch' into 'master' 
Update some cards

See merge request core-developers/forge!2204
 2019-10-01 09:04:03 +00:00
swordshine
5f9f22ddab Update 5 scripts 2019-10-01 16:56:46 +08:00
swordshine
aa75871aae Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2205
 2019-10-01 08:47:42 +00:00
CCTV-1
d405fd7ae6 update simplified chinese translation 2019-10-01 16:31:43 +08:00
CCTV-1
eb05ce8da7 Merge remote-tracking branch 'upstream/master' 2019-10-01 16:11:06 +08:00
swordshine
af2ac7e611 Fix Rohgahh of Kher Keep 2019-10-01 16:02:54 +08:00