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

43179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Mocny
b77bb5768d Upload New File 2019-12-03 14:09:52 +00:00
Tim Mocny
2be9fc65b1 Delete moss_viper.txt 2019-12-03 14:08:41 +00:00
Tim Mocny
c4e04fe003 Delete hydras_growth.txt 2019-12-03 14:07:56 +00:00
Tim Mocny
964e06b8cb Delete dreamshaper_shaman.txt 2019-12-03 14:07:26 +00:00
Tim Mocny
78d6847db5 Delete dreadful_apathy.txt 2019-12-03 14:07:11 +00:00
Tim Mocny
25d6ce6763 Delete aspect_of_lamprey.txt 2019-12-03 14:06:39 +00:00
Tim Mocny
fc26b5d3a9 Delete arena_trickster.txt 2019-12-03 14:06:04 +00:00
Tim Mocny
9e4dc631e8 Delete ashioks_erasure.txt 2019-12-03 14:04:49 +00:00
Tim Mocny
b6bff03ad3 Upload New File 2019-12-03 02:24:52 +00:00
Tim Mocny
394a365497 Upload New File 2019-12-03 02:24:12 +00:00
Tim Mocny
d5de2f387b Upload New File 2019-12-03 02:20:54 +00:00
Tim Mocny
5106de0abe Upload New File 2019-12-03 02:20:23 +00:00
Tim Mocny
510c81d251 Upload New File 2019-12-03 02:19:28 +00:00
Tim Mocny
b4437636a8 Upload New File 2019-12-03 02:18:38 +00:00
Tim Mocny
cc64997832 Upload New File 2019-12-03 02:17:39 +00:00
Tim Mocny
86262f3810 Upload New File 2019-11-28 04:51:27 +00:00
Tim Mocny
9237de38df Upload New File 2019-11-28 04:50:48 +00:00
Tim Mocny
18d5d7da27 Delete fiendish_duo.txt 2019-11-28 04:50:14 +00:00
Tim Mocny
cba653d891 Upload New File 2019-11-28 04:47:34 +00:00
Tim Mocny
9ea265625e Update highcliff_felidar.txt 2019-11-28 04:46:58 +00:00
Tim Mocny
d4aa0ecae4 Upload New File 2019-11-28 04:46:02 +00:00
Tim Mocny
bb5ee52133 Upload New File 2019-11-28 04:44:54 +00:00
Tim Mocny
33d5d45d3c Upload New File 2019-11-28 04:42:51 +00:00
swordshine
87bad70939 Merge branch 'master' into 'master' 
translate some controller button

See merge request core-developers/forge!2305
 2019-11-27 14:25:51 +00:00
CCTV-1
047bc9c5cd remove duplicate keys 2019-11-27 13:36:07 +08:00
CCTV-1
f098e333d2 translate some controller button 2019-11-27 13:32:05 +08:00
swordshine
785835632d Merge branch 'byebyeoko' into 'master' 
Updated standard deckgen data - no more ELKs

See merge request core-developers/forge!2304
 2019-11-27 01:43:56 +00:00
austinio7116
360b72fd91 Updated standard deckgen data - no more ELKs 
(cherry picked from commit 42eafee)
 2019-11-26 20:36:59 +00:00
Michael Kamensky
19082049e7 Merge branch 'master' into 'master' 
Better AI logic spec for Heraldic Banner

Closes #1207

See merge request core-developers/forge!2302
 2019-11-25 16:26:57 +00:00
Agetian
eacc29672f - Better AI logic spec for Heraldic Banner 2019-11-25 19:19:15 +03:00
Agetian
c7b6ac1670 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-11-25 12:40:04 +03:00
swordshine
0aa54cea23 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!2300
 2019-11-25 05:57:04 +00:00
Michael Kamensky
9fe50f6c66 Merge branch 'newBranch' into 'master' 
Fix path seperator, Fix newdeck editor

See merge request core-developers/forge!2301
 2019-11-25 05:27:44 +00:00
Anthony Calosa
2bb84cf79f Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-25 13:04:29 +08:00
Anthony Calosa
8d0ade1eab Fix path seperator 
(android now works for filtering download if you have existing fullborder cards)

Fix newdeck editor not loading if a user deleted unwanted edition file
(TODO: Don't include setless cards on deck editor...)
 2019-11-25 13:01:19 +08:00
CCTV-1
242c7c3b21 update simplified chinese translation 2019-11-25 12:36:07 +08:00
CCTV-1
ff272b89fd added missing translation label 2019-11-25 12:35:13 +08:00
Michael Kamensky
4e83e73dca Merge branch 'master' into 'master' 
Update CHANGES.txt

See merge request core-developers/forge!2299
 2019-11-24 05:01:49 +00:00
Michael Kamensky
7d1ffa4e90 Update CHANGES.txt 2019-11-24 05:01:49 +00:00
Agetian
aab83d882a - Updating CHANGES.txt, part 2. 2019-11-24 07:56:59 +03:00
Agetian
4f69b673bf Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-11-24 07:54:14 +03:00
Michael Kamensky
7d17e58e1f Merge branch 'newBranch' into 'master' 
Update additional check

See merge request core-developers/forge!2298
 2019-11-24 04:53:54 +00:00
Agetian
3d6677bbd5 - Update CHANGES.txt. 2019-11-24 07:52:42 +03:00
Anthony Calosa
30d57a5745 Update 2019-11-24 12:35:12 +08:00
Michael Kamensky
2fb2b64d33 Merge branch 'newBranch' into 'master' 
Update LQ Downloader

See merge request core-developers/forge!2297
 2019-11-24 04:35:01 +00:00
Anthony Calosa
1dc8fed6e8 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-24 12:11:12 +08:00
Anthony Calosa
44c6605804 Update LQ downloader 
(dont download full image equivalent to an existing fullborder images)
 2019-11-24 12:05:45 +08:00
Michael Kamensky
560f8ac14a Merge branch 'master' into 'master' 
Stack Addition Modal Panel

See merge request core-developers/forge!2294
 2019-11-23 12:35:48 +00:00
Alessandro Coli
b99dea604d Labels for changes to stack effect notification panel 2019-11-23 12:07:36 +01:00
Alessandro Coli
f3ff419462 Changes for the stack effect notifications - request by Michael Kamensky 
@Agetian in merge  request
https://git.cardforge.org/core-developers/forge/merge_requests/2294
 2019-11-23 12:05:08 +01:00