external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,270 Commits 31 Branches 187 Tags
c89c0181d364961a24d0daa6f37a76c5cb94691c
Commit Graph

53270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
c89c0181d3 Merge branch 'adventure' into 'master' 
Add Adventure mode

See merge request core-developers/forge!5318
 2021-10-16 16:47:21 +00:00
Michael Kamensky
79518f43d6 Merge branch 'master' into 'master' 
Prepare Forge for Android publish 1.6.45.001

See merge request core-developers/forge!5570
 2021-10-16 16:02:46 +00:00
Michael Kamensky
2129a1dcf2 - Prepare Forge for Android publish 1.6.45.001 [incremental]. 2021-10-16 19:01:47 +03:00
Michael Kamensky
5520cd2a67 [maven-release-plugin] prepare for next development iteration 2021-10-16 18:52:21 +03:00
Michael Kamensky
340a6b2af5 [maven-release-plugin] prepare release forge-1.6.45 forge-1.6.45 2021-10-16 18:52:12 +03:00
Michael Kamensky
6c8ea1de96 Merge branch 'master' into 'master' 
Rudimentary Announcements update, part 2

See merge request core-developers/forge!5569
 2021-10-16 15:46:42 +00:00
Michael Kamensky
8653d97081 - Rudimentary Announcements update, part 2 2021-10-16 18:46:10 +03:00
Michael Kamensky
2d355be51d Merge branch 'master' into 'master' 
- Rudimentary Announcements update.

See merge request core-developers/forge!5568
 2021-10-16 15:44:39 +00:00
Michael Kamensky
0c998f971b - Rudimentary Announcements update. 2021-10-16 18:44:11 +03:00
Michael Kamensky
22469cd604 Merge branch 'master' into 'master' 
Migrate Upcoming (MID/MIC)

See merge request core-developers/forge!5567
 2021-10-16 15:41:24 +00:00
Michael Kamensky
dcb398f195 - Migrate Upcoming (MID/MIC) 2021-10-16 18:40:22 +03:00
Anthony Calosa
7c150c36b1 Merge branch 'master' into 'master' 
[Mobile] Auto Adjust Zoom Display on local Multiplayer (landscape mode)

See merge request core-developers/forge!5565
 2021-10-16 13:31:11 +00:00
Anthony Calosa
025c195a70 [Mobile] Auto Adjust Zoom Multiplayer Local 
When playing local multiplayer game on landscape mode, adjust zoom display automatically when 3rd/4th player has lost.
 2021-10-16 21:28:55 +08:00
Anthony Calosa
473cd7cfe0 Merge branch 'master' into 'master' 
Announce non doublefaced transform cards only

See merge request core-developers/forge!5564
 2021-10-16 13:24:30 +00:00
Anthony Calosa
c7864ee374 Announce non doublefaced transform cards only 
Doublefaced card transformation has trigger (except daybound/nightbound) when flipping back and forth making announcement redundant.
 2021-10-16 21:23:18 +08:00
Anthony Calosa
e3a1a5b7f4 Merge branch 'master' into 'master' 
[Mobile] fix facedown splitcard showing different cardbacks when zoomed

See merge request core-developers/forge!5563
 2021-10-16 13:06:44 +00:00
Anthony Calosa
9829ed36c7 Merge remote-tracking branch 'core/master' 2021-10-16 21:05:41 +08:00
Anthony Calosa
f5b0e3d068 [Mobile] fix facedown splitcard showing different cardbacks when zoomed 2021-10-16 21:04:46 +08:00
Michael Kamensky
d3a94167ab Merge branch 'johnwilliams7-master-patch-23793' into 'master' 
Update Resale Promos.txt

See merge request core-developers/forge!5562
 2021-10-16 09:59:06 +00:00
John Williams
804c1c2961 Update Resale Promos.txt 2021-10-16 09:53:09 +00:00
Anthony Calosa
aaeb387f6c Merge branch 'master' into 'master' 
[Mobile] prevent crash empty deck

See merge request core-developers/forge!5561
 2021-10-16 07:20:28 +00:00
Anthony Calosa
7a25f0b5b8 [Mobile] prevent crash empty deck 2021-10-16 15:19:33 +08:00
Anthony Calosa
9e29e98e89 Merge branch 'master' into 'master' 
[Mobile] prevent NPE on deck import

See merge request core-developers/forge!5560
 2021-10-16 06:46:36 +00:00
Anthony Calosa
b7e6d51f97 [Mobile] prevent NPE on deck import 2021-10-16 14:45:13 +08:00
Michael Kamensky
3a7878f182 Merge branch 'master' into 'master' 
Minor tweaks to DayTimeAi

See merge request core-developers/forge!5559
 2021-10-16 04:38:18 +00:00
Michael Kamensky
037b8250cf - Minor tweaks to DayTimeAi 2021-10-16 07:35:22 +03:00
Anthony Calosa
6a7dd633d9 Merge branch 'master' into 'master' 
show indicator when needed

See merge request core-developers/forge!5558
 2021-10-16 04:13:06 +00:00
Anthony Calosa
d364896f98 show indicator when needed 2021-10-16 12:11:38 +08:00
Michael Kamensky
2aec1b7609 Merge branch 'attach' into 'master' 
ChangeZoneAi: Fix NPE for attaching cards

See merge request core-developers/forge!5557
 2021-10-15 20:04:18 +00:00
tool4EvEr
99c5cf87d2 Fix NPE for ChangeZone Attach 2021-10-15 21:14:07 +02:00
Michael Kamensky
ad1c08c0d8 Merge branch 'fix' into 'master' 
arlinn fix

See merge request core-developers/forge!5555
 2021-10-15 18:55:30 +00:00
Northmoc
c06cc29075 arlinn fix 2021-10-15 14:15:03 -04:00
Michael Kamensky
1234c6c04e Merge branch 'master' into 'master' 
Add (mostly stubbed) DaytimeAi

See merge request core-developers/forge!5554
 2021-10-15 18:13:09 +00:00
Michael Kamensky
7892be0269 - Add (mostly stubbed) DaytimeAi 2021-10-15 21:12:09 +03:00
Anthony Calosa
815edd5c87 Merge branch 'master' into 'master' 
update bg

See merge request core-developers/forge!5553
 2021-10-15 17:51:29 +00:00
Anthony Calosa
b3c3b82fe5 Merge remote-tracking branch 'core/master' 2021-10-16 01:48:54 +08:00
Anthony Calosa
94add3ad09 update bg 
add credits to artist
 2021-10-16 01:48:05 +08:00
Michael Kamensky
f1f907a532 Merge branch 'fixup' into 'master' 
Fix TargetsWithRelatedProperty

See merge request core-developers/forge!5551
 2021-10-15 17:21:30 +00:00
tool4EvEr
ce016180a7 Fix TargetsWithRelatedProperty 2021-10-15 15:49:36 +02:00
Sol
0e97d822bb Merge branch '1978-daybound-nightbound' into 'master' 
Resolve "Daybound & Nightbound"

Closes #1978

See merge request core-developers/forge!5462
 2021-10-15 13:20:37 +00:00
Hans Mackowiak
997e566af0 Resolve "Daybound & Nightbound" 2021-10-15 13:20:36 +00:00
Michael Kamensky
fa09c3fa7b Merge branch 'fix-mantleoftheancients' into 'master' 
Fix Mantle of the Ancients allowing to target stuff in other graveyards

See merge request core-developers/forge!5550
 2021-10-15 11:30:31 +00:00
Michael Kamensky
60cbfa4739 Merge branch 'edition_fixes' into 'master' 
New SLD cards and PPRO fixes

See merge request core-developers/forge!5549
 2021-10-15 09:30:35 +00:00
Michael Kamensky
602027be0f - Fix Mantle of the Ancients. 2021-10-15 12:29:26 +03:00
paul_snoops
a35b82e6b5 rarity_fixes 2021-10-15 09:14:10 +01:00
paul_snoops
66b20b4800 oops 2021-10-15 09:02:01 +01:00
paul_snoops
bc932ba039 New SLD cards and PPRO fixes 2021-10-15 08:58:31 +01:00
Michael Kamensky
5fd4c2e3d2 Merge branch 'aifix' into 'master' 
Fix NPE with Mount Velus Manticore

See merge request core-developers/forge!5548
 2021-10-14 13:31:25 +00:00
tool4EvEr
3b86f4f0c2 Fix NPE with Mount Velus Manticore 2021-10-14 13:26:31 +02:00
Anthony Calosa
8dca774d95 Merge branch 'master' into 'master' 
unused imports

See merge request core-developers/forge!5547
 2021-10-14 08:28:44 +00:00