mirror of
https://github.com/mwpenny/portal64-still-alive.git
synced 2024-10-20 10:37:37 -04:00
Work on test chamber 04
This commit is contained in:
parent
b578bf11f8
commit
8938c24ae7
3
Makefile
3
Makefile
|
@ -231,7 +231,8 @@ build/assets/models/props/combine_ball_catcher.h: assets/materials/ball_catcher.
|
|||
|
||||
build/assets/models/props/combine_ball_launcher.h: assets/materials/ball_catcher.skm.yaml
|
||||
|
||||
ANIM_TEST_CHAMBERS = build/assets/test_chambers/test_chamber_03/test_chamber_03_anim.o
|
||||
ANIM_TEST_CHAMBERS = build/assets/test_chambers/test_chamber_03/test_chamber_03_anim.o \
|
||||
build/assets/test_chambers/test_chamber_04/test_chamber_04_anim.o
|
||||
|
||||
build/anims.ld: $(ANIM_LIST) $(ANIM_TEST_CHAMBERS) tools/generate_animation_ld.js
|
||||
@mkdir -p $(@D)
|
||||
|
|
|
@ -591,19 +591,10 @@ materials:
|
|||
filename: ../../portal_pak_modified/materials/nature/hazard_liquid.png
|
||||
siz: G_IM_SIZ_16b
|
||||
|
||||
gSPGeometryMode:
|
||||
set: [G_SHADE]
|
||||
clear: [G_LIGHTING]
|
||||
|
||||
gDPSetCombineMode:
|
||||
color: ["TEXEL0", "PRIMITIVE", "SHADE", "PRIMITIVE"]
|
||||
color: ["0", "0", "0", "TEXEL0"]
|
||||
gDPSetCycleType: G_CYC_1CYCLE
|
||||
|
||||
gDPSetPrimColor:
|
||||
r: 217
|
||||
g: 71
|
||||
b: 24
|
||||
|
||||
properties:
|
||||
tileSizeS: 4
|
||||
tileSizeT: 4
|
||||
tileSizeS: 2
|
||||
tileSizeT: 2
|
Binary file not shown.
Binary file not shown.
|
@ -158,7 +158,7 @@ static void gameProc(void* arg) {
|
|||
dynamicSceneInit();
|
||||
contactSolverInit(&gContactSolver);
|
||||
portalSurfaceCleanupQueueInit();
|
||||
levelLoad(3);
|
||||
levelLoad(4);
|
||||
cutsceneRunnerReset();
|
||||
controllersInit();
|
||||
initAudio(fps);
|
||||
|
|
|
@ -59,7 +59,7 @@ enum LevelWarnings {
|
|||
LevelWarningsCake = (1 << 9),
|
||||
};
|
||||
|
||||
char gLevelWarnings[] = {
|
||||
short gLevelWarnings[] = {
|
||||
LevelWarningsCubeDispense | LevelWarningsCubeHit,
|
||||
0,
|
||||
0,
|
||||
|
@ -68,6 +68,7 @@ char gLevelWarnings[] = {
|
|||
LevelWarningsCubeHit,
|
||||
LevelWarningsBallHit | LevelWarningsBallCollect,
|
||||
LevelWarningsBallHit | LevelWarningsBallCollect,
|
||||
LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking,
|
||||
};
|
||||
|
||||
static struct Coloru8 gSignageOnColor = {0, 0, 0, 255};
|
||||
|
|
Loading…
Reference in a new issue