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

63746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
a583435ed3 minor patch fix 2023-03-24 05:49:28 +08:00
Anthony Calosa
19855e761b Merge pull request #2736 from kevlahnota/newmaster2 
show quest keys in GameHUD
 2023-03-24 01:49:44 +08:00
Anthony Calosa
3fcb3635ff add Main Story Key Indicator 
- show quest keys in GameHUD
 2023-03-24 01:42:41 +08:00
Simisays
794a5d64f4 update 2023-03-23 18:02:59 +01:00
Simisays
6cfd62b1b0 update 2023-03-23 17:26:33 +01:00
Anthony Calosa
cfc36cc604 Merge branch 'master' into newmaster2 2023-03-24 00:11:53 +08:00
Anthony Calosa
951652c790 fix plane folder conflict, fix RewardActor label (#2735) 
* fix plane folder conflict, fix RewardActor label
- update textratypist, adjust settings prior to new changes
- fix RewardActor label render
- move music to default plane directory

* update

* labels
 2023-03-24 00:11:06 +08:00
Anthony Calosa
5320e54273 Merge branch 'master' into newmaster2 2023-03-24 00:08:26 +08:00
Anthony Calosa
7da1b33681 labels 2023-03-24 00:05:18 +08:00
Anthony Calosa
dc7ffee172 update 2023-03-24 00:04:57 +08:00
Simisays
b6dc7b974b update 2023-03-23 17:04:45 +01:00
Anthony Calosa
fe10bfcc47 fix plane folder conflict, fix RewardActor label 
- update textratypist, adjust settings prior to new changes
- fix RewardActor label render
- move music to default plane directory
 2023-03-24 00:03:55 +08:00
Paul Hammerton
9bc6904e38 Merge pull request #2732 from Northmoc/qs 
quicksilver_servitor.txt and support
 2023-03-23 13:34:50 +00:00
Simisays
6d3a55811c update 2023-03-23 12:33:31 +01:00
Simisays
5089448a6f update 2023-03-23 12:28:45 +01:00
Anthony Calosa
d61f3b1dc1 Merge pull request #2734 from tool4ever/clean23 
Update Charm desc when turn restriction is lifted
 2023-03-23 18:25:13 +08:00
tool4EvEr
fad1327a08 Update Charm desc when turn restriction is lifted 2023-03-23 11:10:46 +01:00
tool4EvEr
eaee14f3ca Clean up 2023-03-23 11:10:04 +01:00
Simisays
1c109815de update 2023-03-23 09:26:01 +01:00
Anthony Calosa
b5571f70b1 Update xiras_hive.txt 2023-03-23 16:10:21 +08:00
Anthony Calosa
f86a727428 Update garruk_boss_effect_phasetwo.txt 2023-03-23 16:09:44 +08:00
Anthony Calosa
24eb6a534e Update xira_boss_effect.txt 2023-03-23 16:08:24 +08:00
Simisays
686e5c9bdf Update wildrat.atlas 2023-03-23 08:16:22 +01:00
Anthony Calosa
e309f77069 Merge pull request #2726 from Card-Forge/MaxFromEffectv2 
CountersPutEffect: remove MaxFromEffect, let the CounterTable handle it
 2023-03-23 13:56:11 +08:00
Anthony Calosa
97da604ed3 Merge pull request #2731 from kevlahnota/newmaster2 
fix splashscreen NPE, disable flip sfx
 2023-03-23 13:55:53 +08:00
Anthony Calosa
41136da7d5 update ArenaScene 2023-03-23 12:04:40 +08:00
Northmoc
2de115d829 quicksilver_servitor.txt and support 2023-03-22 22:33:14 -04:00
Anthony Calosa
b697068570 fix splashscreen NPE, disable flip sfx 2023-03-23 07:58:00 +08:00
Simisays
8bbe85605d update 2023-03-22 22:20:32 +01:00
Simisays
8c71301446 update 2023-03-22 21:53:42 +01:00
Hans Mackowiak
580856bcaa Card: add extra check for DREAM counters 2023-03-22 21:00:54 +01:00
Paul Hammerton
90d230a98e Merge pull request #2730 from paulsnoops/quick_fix 
Update SCH
 2023-03-22 19:59:22 +00:00
paulsnoops
9de37f282f Update SCH 2023-03-22 19:52:40 +00:00
Simisays
f6d2a91117 Merge branch 'Card-Forge:master' into adventureupdatee 2023-03-22 15:04:23 +01:00
tool4ever
2c831f7f49 Update one_with_the_multiverse.txt 2023-03-22 10:05:04 +01:00
Anthony Calosa
a07c1f5934 Merge pull request #2729 from kevlahnota/newmaster2 
update dialog buttons
 2023-03-22 16:25:49 +08:00
Anthony Calosa
7a103e7e70 update dialog buttons 
- increase button_press volume
 2023-03-22 16:23:10 +08:00
Anthony Calosa
b2c1495fcb Merge pull request #2728 from Simisays/Fungus 
Create fungus.json
 2023-03-22 16:03:23 +08:00
Simisays
2d631346a0 Create fungus.json 2023-03-22 08:48:32 +01:00
Anthony Calosa
117112bc71 Merge pull request #2727 from kevlahnota/newmaster2 
update SFX, handle missing JSON deck definition
 2023-03-22 15:27:49 +08:00
Anthony Calosa
8749f9dc72 update 2023-03-22 15:00:22 +08:00
Anthony Calosa
4fa752b24c update SFX, handle missing JSON deck definition 
- add button_press, coins_drop, take_shard sfx
- update music timing
- adjust secondary audio volume
- adjust flipprocess prior to its sfx
- handle crash for missing deck/json definition
 2023-03-22 14:03:20 +08:00
Hans Mackowiak
dbd75ec08c CountersPutEffect: remove MaxFromEffect, let the CounterTable handle it 2023-03-22 06:22:47 +01:00
Anthony Calosa
a05e79fce8 Merge pull request #2723 from Simisays/adventure 
Adventure lootupgrade
 2023-03-22 08:04:06 +08:00
Anthony Calosa
402d6d1bd4 Merge pull request #2724 from EldritchBimbo/SpriteWalkdownFix 
Fix to Bug in PC Walk Down Animations
 2023-03-22 08:01:00 +08:00
Anthony Calosa
7d43ba42cd Merge pull request #2725 from tool4ever/crashfix 
Fix Mist of Stagnation
 2023-03-22 07:54:45 +08:00
tool4EvEr
08b0aad84f Fix Mist of Stagnation 2023-03-21 23:02:57 +01:00
Alwayssnarky
f1974e4302 Fix to Bug in PC Walk Down Animations 
Fix to bug in PC walking animations where the 3rd frame when walking directly down came from the idle animations instead of the walking ones.
 2023-03-21 16:58:01 -04:00
Simisays
8cd6655a67 lootupgrade 2023-03-21 20:00:59 +01:00
Simisays
833decd9ea commit 2023-03-21 17:26:08 +01:00