Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Episode 2 #292

Merged
merged 80 commits into from
Aug 16, 2024
Merged

Episode 2 #292

merged 80 commits into from
Aug 16, 2024

Conversation

ZehMatt
Copy link
Collaborator

@ZehMatt ZehMatt commented May 25, 2024

No description provided.

@ZehMatt ZehMatt force-pushed the ep2-part branch 2 times, most recently from bfd38f7 to e2dd2f8 Compare May 28, 2024 18:33
knoxed and others added 24 commits July 21, 2024 11:32
@knoxed
ep2_outland_01 mapscript
0f4d3ae
@ZehMatt @knoxed
Start ep2_outland_01a, handle the elevator
c625eaa
@ZehMatt @knoxed
Merge animations/gestures/postures for kleiner and eli
e1c8257
@ZehMatt @knoxed
Improve starting part of ep2_outland_01
b5c6067
@ZehMatt @knoxed
Add another checkpoint in ep2_outland_01
b76f3a3
@ZehMatt @knoxed
Removed the entity from filters, collisions got fixed in dev
d78c603
@ZehMatt @knoxed
Get rid of the flashlight sound when there is none
d029948
@ZehMatt @knoxed
Shitty improvement to ep2_outland_01
f6b849d
@ZehMatt @knoxed
Add default loadout for each ep2 map script
32fd12e
@ZehMatt @knoxed
Use a more suitable spawn location during fight
e9e3c12
@ZehMatt @knoxed
Adjust player spawn for ep2_outland_02
cdf1e8c
@ZehMatt @knoxed
Modify loadout after meeting alyx
707b40b
@ZehMatt @knoxed
Handle jalopy
863b965
@ZehMatt @knoxed
Make jalopy work, increase despawn distance
96e0fa8
@knoxed
Elevator at the end should wait for players
d86e835
@knoxed
Improve outland_01a
f070f53
@knoxed
Add important NPC names to 02
3f0e000
@knoxed
Improve outland_03
965f120
@ZehMatt @knoxed
Fix the CI
d22c682
@ZehMatt @knoxed
Use correct map order
44e9d2a
@ZehMatt @knoxed
Sort of working companion logic, vehicle outputs are still messy
0a511e3
@ZehMatt @knoxed
Fix loading a save game messing up dt vars
ead7677
@ZehMatt @knoxed
Extend the hull for collision activation check
f209531
@ZehMatt @knoxed
Allow the use of conditions for checkpoints specified with data
57d72f5
ZehMatt and others added 17 commits July 21, 2024 19:34
@ZehMatt
Implement MakeMultipleNPCS in npc_template_maker
d6c2abc
@knoxed
Add eli and lamarr anims
9f4074d
@knoxed
outland_11 mapscript
aee5439
@knoxed
Remove npc clip on _11
5b93d51
@knoxed
Removed lamarr content because it does not work
f4b67e8
@ZehMatt
Add a way to remap models, add ep2 advisor model remapping
ed1510d
@ZehMatt
Add model remapping for ep2 lamarr
739d81a
@ZehMatt
Fix outputs being cleared on persistent entities
9863148
@ZehMatt
Fix trigger_changelevel not firing OnChangeLevel output
6fc9527
@ZehMatt
Further delay the change level request, fixes random vorts showing up
809f041
@ZehMatt
Change logic to how vehicles are spawned
85217a8
@ZehMatt
Stop cleaning up vehicles more often than needed
998b118
@ZehMatt
Adjust the map scripts, we rely on the map spawning the vehicle now
e443868
@ZehMatt
Add a better way to control for alyx vehicle entering/exiting
232b68c
@ZehMatt
Fix player collision check, only trace against other players
57f26fe
@knoxed
Fixes for maps 11a,11b,12
fb3f13b
@knoxed
Last map script and attempt at fixing ending scene
9b80ff3
@ZehMatt ZehMatt merged commit 1156ec1 into develop Aug 16, 2024
1 check passed
@ZehMatt ZehMatt deleted the ep2-part branch August 16, 2024 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ZehMatt @knoxed