Commit Graph

56126 Commits

Author SHA1 Message Date
Anthony Calosa
368acd1c59 [Mobile] Update netcode, fix swapped players
-update CObjectInputStream to use DecompressibleInputStream method
2022-03-08 10:43:53 +08:00
Anthony Calosa
64488ed813 [Mobile] Fix path for fallback_skin 2022-03-08 10:27:50 +08:00
Andreas Bendel
33a77f900c Update de-DE.properties
some translations
2022-03-07 20:20:34 +00:00
Paul Hammerton
5101fe1c1c Merge branch 'bandr_7_march_22' into 'master'
Banned and Restricted Announcement: 7 March 2022

See merge request core-developers/forge!6366
2022-03-07 18:23:44 +00:00
paul_snoops
f9ba586f50 Banned and Restricted Announcement: 7 March 2022 2022-03-07 18:22:04 +00:00
paul_snoops
c3b1c6665e New Current Metagame Categories 2022-03-07 13:07:23 +00:00
Anthony Calosa
3b6b6376d8 Merge branch 'master' into 'master'
fix layout text for award

See merge request core-developers/forge!6363
2022-03-07 00:28:26 +00:00
Anthony Calosa
7c30cdf6ec fix layout 2022-03-07 08:26:44 +08:00
Anthony Calosa
e2a7fefafe Merge branch 'master' into 'master'
adjust SaveLoadScene layout

See merge request core-developers/forge!6362
2022-03-07 00:19:51 +00:00
Anthony Calosa
976a463d9f adjust SaveLoadScene layout 2022-03-07 08:17:10 +08:00
Michael Kamensky
5142549c0d [maven-release-plugin] prepare for next development iteration 2022-03-06 20:30:40 +03:00
Michael Kamensky
587539290c [maven-release-plugin] prepare release forge-1.6.48 forge-1.6.48 2022-03-06 20:30:23 +03:00
Michael Kamensky
2c2bea91d8 Merge branch 'master' into 'master'
Update ANNOUNCEMENTS.

See merge request core-developers/forge!6361
2022-03-06 17:25:44 +00:00
Michael Kamensky
4c61f0b0e5 - Update ANNOUNCEMENTS. 2022-03-06 20:24:59 +03:00
Michael Kamensky
d7c59cdb92 Merge branch 'master' into 'master'
Add puzzles PS_NEO1, PS_NEO2, prepare ANNOUNCEMENTS.txt.

See merge request core-developers/forge!6360
2022-03-06 17:05:48 +00:00
Michael Kamensky
47f2756a39 - Add puzzles PS_NEO1, PS_NEO2
- Update ANNOUNCEMENTS.txt
2022-03-06 20:04:44 +03:00
Michael Kamensky
fc6ba8d73b Merge branch 'purging' into 'master'
Fix Purging Scythe damaging players

See merge request core-developers/forge!6358
2022-03-06 16:41:55 +00:00
Michael Kamensky
a6345325b4 Merge branch 'swallow' into 'master'
Fix Swallow Whole putting P1P1 on player

See merge request core-developers/forge!6359
2022-03-06 16:41:37 +00:00
tool4EvEr
1ae507f378 Fix Swallow Whole putting P1P1 on player 2022-03-06 17:09:05 +01:00
tool4EvEr
430cabf3b6 Fix Purging Scythe damaging players 2022-03-06 13:53:38 +01:00
Michael Kamensky
a11bf3b99c Merge branch 'johnwilliams7-master-patch-30601' into 'master'
Update Pro Tour Promos.txt

See merge request core-developers/forge!6352
2022-03-06 12:44:53 +00:00
Anthony Calosa
1933fde126 Merge branch 'master' into 'master'
update

See merge request core-developers/forge!6357
2022-03-06 12:44:16 +00:00
Michael Kamensky
87c3411259 Merge branch 'reveal' into 'master'
RevealAi: fix missing trigger

See merge request core-developers/forge!6349
2022-03-06 12:44:01 +00:00
Anthony Calosa
cc459479ee update 2022-03-06 20:42:11 +08:00
Anthony Calosa
e93211dca2 Merge branch 'master' into 'master'
[Mobile] Fix startup if no internet

See merge request core-developers/forge!6356
2022-03-06 12:34:38 +00:00
Anthony Calosa
2c0fb81335 [Mobile] Fix startup if no internet 2022-03-06 20:32:49 +08:00
Anthony Calosa
fbb8fed858 Merge branch 'kevlahnota-master-patch-84929' into 'master'
unused import

See merge request core-developers/forge!6355
2022-03-06 11:37:23 +00:00
Anthony Calosa
bb1a7ee22f unused import 2022-03-06 11:37:06 +00:00
Anthony Calosa
0ea1795ef3 Merge branch 'master' into 'master'
update some translations

See merge request core-developers/forge!6353
2022-03-06 11:21:46 +00:00
Anthony Calosa
edf9ade77a update some translations 2022-03-06 19:20:12 +08:00
John Williams
cec3ea278f Update Pro Tour Promos.txt 2022-03-06 10:48:37 +00:00
Anthony Calosa
b73fbc7659 Merge branch 'master' into 'master'
[Adventure] Minor Speedup

See merge request core-developers/forge!6351
2022-03-06 10:46:56 +00:00
Anthony Calosa
e6157fc707 minor speedup 2022-03-06 18:43:05 +08:00
Anthony Calosa
aab3488539 Merge branch 'master' into 'master'
cleanup

See merge request core-developers/forge!6350
2022-03-06 10:27:24 +00:00
tool4EvEr
7155c07c6d Add todo 2022-03-06 11:21:03 +01:00
Anthony Calosa
de6c1a26e3 cleanup 2022-03-06 18:15:40 +08:00
tool4EvEr
96511a6fbc Serene Master fix 2022-03-06 11:05:15 +01:00
Anthony Calosa
d9607327d6 Merge branch 'master' into 'master'
[Adventure] Support for localization

See merge request core-developers/forge!6348
2022-03-06 10:01:29 +00:00
Anthony Calosa
eb6719d144 update 2022-03-06 17:55:30 +08:00
tool4EvEr
c5c8294e62 Clean up 2022-03-06 10:21:34 +01:00
tool4EvEr
a1dd44dc60 RevealAi: fix missing trigger 2022-03-06 10:18:08 +01:00
Anthony Calosa
6ff80452d7 update localization 2022-03-06 16:07:08 +08:00
Anthony Calosa
c37abd2b75 cleanup 2022-03-06 13:45:46 +08:00
Anthony Calosa
d4be53c72f [Adventure] Support for localization
-refactor some codes for localization
2022-03-06 12:23:33 +08:00
Hans Mackowiak
0933034f98 Merge branch '2112-problem-with-some-ltb-trigger' into 'master'
Resolve "Problem with some LTB trigger"

Closes #2112

See merge request core-developers/forge!6347
2022-03-05 21:42:28 +00:00
Hans Mackowiak
390ca4b0d9 Resolve "Problem with some LTB trigger" 2022-03-05 21:42:27 +00:00
Michael Kamensky
6c60e5cc03 Merge branch 'counters' into 'master'
CountersPutEffect allow to handle multiple Defined

See merge request core-developers/forge!6345
2022-03-05 15:04:19 +00:00
Tim Mocny
fddff49bb9 CountersPutEffect allow to handle multiple Defined 2022-03-05 15:04:15 +00:00
Michael Kamensky
22863b7ce4 Merge branch 'triomes' into 'master'
Streets of New Capenna cards (and THB Demigod / various Ajani tweaks)

See merge request core-developers/forge!6336
2022-03-05 05:13:20 +00:00
Tim Mocny
8a1d787b54 Streets of New Capenna cards (and THB Demigod / various Ajani tweaks) 2022-03-05 05:13:16 +00:00