Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-19 22:27:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix test chamber 05

Browse source
This commit is contained in:
James Lambert 2023-09-06 19:55:59 -06:00
parent 2a643c5a73
commit 801583dd07
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -141,6 +141,8 @@ That will generate the rom at `/build/portal64.z64`
<br /> <br />
## Current New Feature TODO List ## Current New Feature TODO List
- [ ] clear sleeping object physics flag so buttons in savefiles remain pressed after loading
- [ ] test chamber 11 is broken
- [ ] rumble pak support? - [ ] rumble pak support?
- [ ] Change default controls - [ ] Change default controls
- [ ] Investigate crash after falling into death water on test chamber 8 - [ ] Investigate crash after falling into death water on test chamber 8
@ -150,6 +152,8 @@ That will generate the rom at `/build/portal64.z64`
- [ ] Adding loading notice between levels #45 - [ ] Adding loading notice between levels #45
- [ ] ball velocity in test chamber 11 - [ ] ball velocity in test chamber 11
- [ ] pausing while glados is speaking can end her speech early - [ ] pausing while glados is speaking can end her speech early
- [x] test chamber 4 has an inverted indicator light sign
- [x] test chamber 4 door doesnt close
- [x] Use a much nearer clipping plane when rendering the portal gun - [x] Use a much nearer clipping plane when rendering the portal gun
- [x] test chamber 04 has seams in a corner - [x] test chamber 04 has seams in a corner
- [x] Add puzzle element connections and additional signs - [x] Add puzzle element connections and additional signs

BIN
assets/test_chambers/test_chamber_02/test_chamber_02.blend
View file

Binary file not shown.

6
assets/test_chambers/test_chamber_02/test_chamber_02.yaml
View file

@ -21,7 +21,7 @@ cutscenes:
- q_sound SOUNDS_02_PART2_SUCCESS_1 CH_GLADOS - q_sound SOUNDS_02_PART2_SUCCESS_1 CH_GLADOS
- q_sound SOUNDS_02_PART2_SUCCESS_2 CH_GLADOS - q_sound SOUNDS_02_PART2_SUCCESS_2 CH_GLADOS
operators: operators:
- double_door = exit_2_0 and exit_2_1 - should_open_door = exit_2_0 and exit_2_1
- double_door = double_door or bad_person - should_open_door = should_open_door or bad_person
- not_in_room = not in_room - not_in_room = not in_room
- double_door = double_door and not_in_room - double_door = should_open_door and not_in_room

6
src/savefile/scene_serialize.c
View file

@ -155,6 +155,9 @@ void decorSerialize(struct Serializer* serializer, SerializeAction action, struc
action(serializer, &entry->rigidBody.angularVelocity, sizeof(struct Vector3)); action(serializer, &entry->rigidBody.angularVelocity, sizeof(struct Vector3));
action(serializer, &entry->rigidBody.flags, sizeof(enum RigidBodyFlags)); action(serializer, &entry->rigidBody.flags, sizeof(enum RigidBodyFlags));
action(serializer, &entry->rigidBody.currentRoom, sizeof(short)); action(serializer, &entry->rigidBody.currentRoom, sizeof(short));
entry->rigidBody.flags &= ~RigidBodyIsSleeping;
entry->rigidBody.sleepFrames = IDLE_SLEEP_FRAMES;
} }
} }
@ -274,6 +277,9 @@ void boxDropperDeserialize(struct Serializer* serializer, struct Scene* scene) {
serializeRead(serializer, &dropper->activeCube.rigidBody.angularVelocity, sizeof(struct Vector3)); serializeRead(serializer, &dropper->activeCube.rigidBody.angularVelocity, sizeof(struct Vector3));
serializeRead(serializer, &dropper->activeCube.rigidBody.flags, sizeof(enum RigidBodyFlags)); serializeRead(serializer, &dropper->activeCube.rigidBody.flags, sizeof(enum RigidBodyFlags));
dropper->activeCube.rigidBody.flags &= ~RigidBodyIsSleeping;
dropper->activeCube.rigidBody.sleepFrames = IDLE_SLEEP_FRAMES;
if (heldCube == i) { if (heldCube == i) {
playerSetGrabbing(&scene->player, &dropper->activeCube.collisionObject); playerSetGrabbing(&scene->player, &dropper->activeCube.collisionObject);
} }