external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,218 Commits 31 Branches 187 Tags
39b70ee7737bac33f16c0f08173cd4d810b4bafc
Commit Graph

56218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
13d800ca0a Merge remote-tracking branch 'core/master' 2022-02-28 15:19:15 +08:00
Anthony Calosa
ecbfb5bdd1 [Mobile] Add Adventure/Classic Switch button 
- on Classic Mode, on Exit, you can switch to Adventure Mode
- on Adventure Mode, added switch button to Classic Mode
 2022-02-28 15:14:25 +08:00
Hans Mackowiak
273e821592 CardType: add hasABasicLandType as Property 2022-02-28 07:24:49 +01:00
Michael Kamensky
97b848b49c Merge branch 'paco_cardformatcolumn' into 'master' 
Add card column: FORMAT

See merge request core-developers/forge!6318
 2022-02-27 19:19:32 +00:00
Paco Ito
ff657f1412 Add card column: FORMAT 2022-02-27 19:19:32 +00:00
Anthony Calosa
7c1ea008ca Merge branch 'master' into 'master' 
update viewport

See merge request core-developers/forge!6317
 2022-02-27 12:53:22 +00:00
Anthony Calosa
8129d1004a Merge remote-tracking branch 'core/master' 2022-02-27 20:52:46 +08:00
Anthony Calosa
cd79764395 update viewport 
- Scaling to fillX, some MapStage are larger than the intended width.
 2022-02-27 20:51:27 +08:00
Michael Kamensky
b0c5af8d37 Merge branch 'twosat-master-patch-14482' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!6316
 2022-02-27 12:40:15 +00:00
Andreas Bendel
32f4f1f3e5 Update de-DE.properties 
translated lblWouldYouLikePutRemoveCounters
 2022-02-27 12:27:19 +00:00
Anthony Calosa
10ef223854 Merge branch 'master' into 'master' 
unused import

See merge request core-developers/forge!6315
 2022-02-27 11:52:56 +00:00
Anthony Calosa
0c77e8b270 unused import 2022-02-27 19:52:20 +08:00
Anthony Calosa
45e4c1ab8f Merge branch 'master' into 'master' 
[Adventure] Fix World Background & Loading Transition

See merge request core-developers/forge!6314
 2022-02-27 11:33:31 +00:00
Anthony Calosa
9e4ce0756e [Adventure] fix Map Stage Visibility 
- add Life, Money on Statistics
- use ExtendViewport for MapStage
- auto show/hide Map and GameHud controls for MapStage visibility
- decrease Reward/Match delay for faster loading of scenes
 2022-02-27 19:08:03 +08:00
Anthony Calosa
360522475c remove unnecessary pixmap 2022-02-27 13:19:33 +08:00
Anthony Calosa
ac8365e13a Fix World Background 2022-02-27 13:12:55 +08:00
Anthony Calosa
3f252af15e fix black transition screen when loading save 
- run transition screen first then switchscene
 2022-02-27 12:34:35 +08:00
Anthony Calosa
b283ff5c7f Merge branch 'master' into 'master' 
use DecompressibleInputStream

See merge request core-developers/forge!6313
 2022-02-27 03:56:55 +00:00
Anthony Calosa
5a0f1714e9 use DecompressibleInputStream 2022-02-27 11:55:14 +08:00
Anthony Calosa
6aec834317 Merge branch 'master' into 'master' 
[Adventure] Try to load old save file

See merge request core-developers/forge!6311
 2022-02-27 03:09:17 +00:00
Anthony Calosa
e125c43304 Merge branch 'edition_type_fixes' into 'master' 
Small edition type changes

See merge request core-developers/forge!6310
 2022-02-27 03:05:54 +00:00
Anthony Calosa
ac440d5d07 update 2022-02-27 11:05:08 +08:00
Anthony Calosa
26f27bdd76 [Adventure] Try to load old save file 
- override mismatch
 2022-02-27 11:00:28 +08:00
paul_snoops
814a0d02da Small edition type changes 2022-02-26 20:27:06 +00:00
Anthony Calosa
e278a4c63e Merge branch 'master' into 'master' 
[Android] fix reward actor

See merge request core-developers/forge!6309
 2022-02-26 14:38:10 +00:00
Anthony Calosa
b72a991d5c [Android] fix reward actor 2022-02-26 22:35:29 +08:00
Anthony Calosa
ee972cc576 Merge branch 'kevlahnota-master-patch-94209' into 'master' 
fix compile

See merge request core-developers/forge!6308
 2022-02-26 10:15:38 +00:00
Anthony Calosa
c5c484fd41 fix compile 2022-02-26 10:15:16 +00:00
Anthony Calosa
10c358cd3e Merge branch 'master' into 'master' 
update StartScene and NewGameScene

See merge request core-developers/forge!6307
 2022-02-26 06:39:24 +00:00
Anthony Calosa
31824f2180 update resume 
- if the player was inside the tilemap, reload the tiledmap scene
 2022-02-26 14:38:28 +08:00
Anthony Calosa
6ec2078509 Merge remote-tracking branch 'core/master' 2022-02-26 12:39:08 +08:00
Anthony Calosa
b5631eb95c update StartScene and NewGameScene 2022-02-26 12:37:30 +08:00
Michael Kamensky
fdd96eefe7 Merge branch 'freshmaster' into 'master' 
Incidental Editing Vol. 2

See merge request core-developers/forge!6301
 2022-02-26 04:21:19 +00:00
Renato Santos
cda2626816 Incidental Editing Vol. 2 2022-02-26 04:21:10 +00:00
Anthony Calosa
816ecd645f Merge branch 'master' into 'master' 
update touch controls

See merge request core-developers/forge!6306
 2022-02-26 04:14:00 +00:00
Anthony Calosa
373be68a76 Merge remote-tracking branch 'core/master' 
# Conflicts:
#	forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
 2022-02-26 12:05:33 +08:00
Anthony Calosa
9c72cd2279 update touch controls 2022-02-26 11:58:51 +08:00
Anthony Calosa
14d71ad278 pull from master 2022-02-26 11:56:25 +08:00
Bug Hunter
e03811c803 Merge branch 'TRT-master-patch-47800' into 'master' 
Update forge-gui/res/cardsfolder/t/tomb_tyrant.txt

See merge request core-developers/forge!6305
 2022-02-25 20:39:20 +00:00
Bug Hunter
652bcbd415 Update forge-gui/res/cardsfolder/t/tomb_tyrant.txt 2022-02-25 20:38:44 +00:00
Michael Kamensky
358a02fb12 Merge branch 'johnwilliams7-master-patch-57238' into 'master' 
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!6304
 2022-02-25 17:30:28 +00:00
Michael Kamensky
eff74c7d92 Merge branch '2053-ltb-trigger-might-be-stopped-by-own-die-replacementeffect' into 'master' 
Resolve "LTB Trigger might be stopped by own Die ReplacementEffect"

Closes #2053

See merge request core-developers/forge!6298
 2022-02-25 17:30:13 +00:00
John Williams
e9f697da1b Update Secret Lair Drop Series.txt 2022-02-25 10:53:05 +00:00
Anthony Calosa
c382140138 Merge branch 'master' into 'master' 
update RewardScene

See merge request core-developers/forge!6303
 2022-02-25 10:17:06 +00:00
Anthony Calosa
c2dbf1075c update RewardScene 2022-02-25 10:17:05 +00:00
Anthony Calosa
0ec1e7a25a update RewardScene 2022-02-25 18:14:12 +08:00
Anthony Calosa
2a00684208 Merge remote-tracking branch 'core/master' 2022-02-25 15:42:13 +08:00
Michael Kamensky
984f91ec0d Merge branch 'rebalanced_24_feb_2022' into 'master' 
24 February 2022 Arena Rebalanced Cards

See merge request core-developers/forge!6299
 2022-02-25 03:52:49 +00:00
Michael Kamensky
d6f3b85f22 Merge branch 'counters_put_rem' into 'master' 
Tweak CountersPutRemoveEffect and add it to some cards

See merge request core-developers/forge!6300
 2022-02-25 03:39:50 +00:00
Tim Mocny
b7e902826a Tweak CountersPutRemoveEffect and add it to some cards 2022-02-25 03:39:43 +00:00