external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,609 Commits 34 Branches 187 Tags
e4a0ce916519e44b58ad97d7bf17f06b0d23017c
Commit Graph

48609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
3a3c8230c0 Merge branch 'kevlahnota-master-patch-09449' into 'master' 
fix Time Spiral Remastered promo

See merge request core-developers/forge!4133
 2021-03-07 09:52:57 +00:00
Anthony Calosa
e8046e0483 fix Time Spiral Remastered promo 2021-03-07 09:52:37 +00:00
Michael Kamensky
882ab0c24b Merge branch 'unicode_deck_name' into 'master' 
support unicode deck name

See merge request core-developers/forge!2472
 2021-03-07 05:43:27 +00:00
Michael Kamensky
137b10f361 Merge branch 'remove-reference' into 'master' 
Remove References$ from everything

See merge request core-developers/forge!4031
 2021-03-07 05:41:04 +00:00
Adam Pantel
fd44c9745d Remove References$ from scripts 2021-03-07 00:39:14 -05:00
Adam Pantel
fdd5aa936f Remove code for References$ 2021-03-07 00:36:03 -05:00
Michael Kamensky
3335e17803 Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.39.001

See merge request core-developers/forge!4131
 2021-03-07 05:15:14 +00:00
Michael Kamensky
7d47cf2a06 - Preparing Forge for Android publish 1.6.39.001 [incremental]. 2021-03-07 08:12:56 +03:00
Michael Kamensky
22b45fff9a Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-03-07 08:12:06 +03:00
Michael Kamensky
cbc0051f8a [maven-release-plugin] prepare for next development iteration 2021-03-07 08:00:39 +03:00
Michael Kamensky
0437e9354b [maven-release-plugin] prepare release forge-1.6.39 forge-1.6.39 2021-03-07 08:00:30 +03:00
Michael Kamensky
668e2834bc Merge branch 'master' into 'master' 
Prepare for release

See merge request core-developers/forge!4130
 2021-03-07 04:48:09 +00:00
Michael Kamensky
4ca125e0b6 - Fix unused imports. 2021-03-07 07:46:22 +03:00
Michael Kamensky
73a6d65118 - Update ANNOUNCEMENTS.txt 
- Rename a method in ChangeZoneAi
 2021-03-07 07:42:48 +03:00
Michael Kamensky
8cff34e488 Merge branch 'unset-cards' into 'master' 
[Un-cards] DeckLimit keyword + Cardboard Carapace

See merge request core-developers/forge!4127
 2021-03-07 04:34:27 +00:00
Michael Kamensky
1efda3f97b Merge branch 'pcel' into 'master' 
[Un-cards] PCEL

See merge request core-developers/forge!4129
 2021-03-07 04:33:06 +00:00
Michael Kamensky
04e25abdc6 Update shichifukujin_dragon.txt 2021-03-07 04:32:33 +00:00
Michael Kamensky
8d025dffbf Update robot_chicken.txt [AI hint] 2021-03-07 04:31:38 +00:00
Michael Kamensky
df17c3a31b Merge branch 'master' into 'master' 
[Desktop] update ImageView for Decks

See merge request core-developers/forge!4128
 2021-03-07 04:28:46 +00:00
Michael Kamensky
4148742624 Merge branch 'Williams-master-patch-25386' into 'master' 
Time Spiral Remastered

See merge request core-developers/forge!4126
 2021-03-07 04:17:07 +00:00
Adam Pantel
41cae28145 [Un-cards] PCEL 2021-03-06 23:16:58 -05:00
Anthony Calosa
e73f117037 [Desktop] update ImageView for Decks 2021-03-07 08:39:12 +08:00
John
92ca4f2dc6 Update Time Spiral Remastered.txt 2021-03-06 21:21:18 +00:00
Adam Pantel
acb21b2a28 [Un-cards] DeckLimit keyword + Cardboard Carapace 2021-03-06 16:16:07 -05:00
John
5123b1d434 Update Time Spiral Remastered.txt 2021-03-06 20:21:03 +00:00
John
96dfc7425e Update Time Spiral Remastered.txt 2021-03-06 20:15:01 +00:00
John
05e8afdeb2 Update Time Spiral Remastered.txt 2021-03-06 20:03:02 +00:00
John
6f50a0520b Update blocks.txt 2021-03-06 19:44:37 +00:00
John
f30689ff4a Add new file 2021-03-06 19:40:46 +00:00
Michael Kamensky
0312e54590 Merge branch 'Williams-master-patch-33741' into 'master' 
Historic Anthology 4

See merge request core-developers/forge!4125
 2021-03-06 19:38:04 +00:00
John
db9af67f33 Add new file 2021-03-06 18:12:59 +00:00
Michael Kamensky
671aca556a Merge branch 'fixEphara' into 'master' 
Ephara, God of the Polis: fix card drawing for opponent

See merge request core-developers/forge!4123
 2021-03-06 12:37:59 +00:00
Michael Kamensky
cb5da0f99c Merge branch 'fix_text_renderer_crash' into 'master' 
[Mobile] Fix crash issue in TextRenderer

See merge request core-developers/forge!4124
 2021-03-06 12:37:53 +00:00
Lyu Zong-Hong
84d2f43265 Fix crash issue in TextRenderer 2021-03-06 21:15:33 +09:00
tool4EvEr
f46e96170a Fix card drawing for opponent 2021-03-06 13:02:52 +01:00
Michael Kamensky
5decca1571 Merge branch 'master' into 'master' 
[Un-cards] Mine, Mine, Mine!

See merge request core-developers/forge!4122
 2021-03-06 11:09:29 +00:00
Hythonia
67e532534d Merge remote-tracking branch 'origin/master' 2021-03-06 12:03:09 +01:00
Hythonia
849c1faaff ULG: Mine, Mine, Mine! 2021-03-06 12:02:38 +01:00
Michael Kamensky
398d4220dc Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4117
 2021-03-06 09:56:20 +00:00
Michael Kamensky
0156a04541 Merge branch 'update_japanese_localization' into 'master' 
Update Japanese Localization

See merge request core-developers/forge!4121
 2021-03-06 09:36:06 +00:00
Michael Kamensky
4474a7f6d2 Merge branch 'fix_cjk_text_wrap' into 'master' 
[Mobile] Fix CJK text line wrap for Android/Mobile port

See merge request core-developers/forge!4119
 2021-03-06 09:36:02 +00:00
Alumi
f6569872ce [Mobile] Fix CJK text line wrap for Android/Mobile port 2021-03-06 09:36:02 +00:00
Michael Kamensky
ee11189ed3 Merge branch 'update_font_list' into 'master' 
[Mobile] Update CJK font list

See merge request core-developers/forge!4120
 2021-03-06 09:35:42 +00:00
Lyu Zong-Hong
ab148cd120 Update Japanese localization 2021-03-06 18:24:28 +09:00
Lyu Zong-Hong
bace635203 Update CJK font list 2021-03-06 17:49:05 +09:00
Michael Kamensky
078f7395bd Merge branch 'audioClips' into 'master' 
[Desktop] Map Audio Clips

See merge request core-developers/forge!4118
 2021-03-06 06:07:01 +00:00
Anthony Calosa
09d6abc0d2 [Desktop] Map Audio Clips 2021-03-06 13:44:10 +08:00
CCTV-1
f1cff21f57 update simplified chinese translation 2021-03-06 13:28:26 +08:00
Michael Kamensky
74fd7e1c54 Merge branch 'twosat-master-patch-92194' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4112
 2021-03-06 04:59:23 +00:00
Michael Kamensky
6b24d93d46 Merge branch 'fix_change_zone_all_remember_meld_mutate' into 'master' 
Remember meld and merged cards for ChangeZoneAll effect

See merge request core-developers/forge!4115
 2021-03-06 04:59:13 +00:00