-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
Cherry-pick upstream's master #130
Conversation
Also worth noting that this reverts the readme to that on spen's repo. We haven't had a Chaos-specific readme anyways. We need to write one! |
https://docs.momentum-mod.org/entity/mapbase_enhancements/ |
|
Yup and we have the things we do have in FGDs currently. We just need to pull in the newer mapbase stuff at some point. |
Ah thanks for the heads up! <3 |
Unrelated to what the PR is bringing in, but I noticed it brought over changes for |
Oh yeah I dont see any entity basing off it as well so I will remove here |
34b75ae
to
d4c4e57
Compare
d4c4e57
to
db9fe81
Compare
This reads an entity keyvalue, and converts it to the appropriate Squirrel type.
- Rearrange some keyvalues between the base classes - Slight keyvalue name/description tweaks - Add ExitVehicle input to airboat (fixes #109) - Correct default script for cannon - Correct default script for crane and add model keyvalue # Conflicts: # fgd/point/prop/prop_vehicle.fgd # fgd/point/prop/prop_vehicle_airboat.fgd # fgd/point/prop/prop_vehicle_cannon.fgd # fgd/point/prop/prop_vehicle_choreo_generic.fgd
NPCs as well in some cases
…total time breaking
This allows Desolation to override the behaviour.
Looks like a Mesa base, and it is not used by anything
db9fe81
to
51554b3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From a quick glance this seems fine to me
Yeah a lot of minor tweaks. Not really a need to go into the new comp entities or scripts that spen's working on nor any of the materials. |
Closes #85
Taking over from #93 as that hasn't seen traction in awhile. This only includes changes in master, not spen's dev branch. Last commit being on January 12, 2022.
Changes intentionally not included:
Things we already have
Now I see that there are a couple commits (TeamSpen210@b76fd5f & TeamSpen210@7fbaedc) that seem to suggest
studioprop
is mainly for older games.. if that is the case we should replace them all withstudio
?A big commit I skipped over that needs special mention is one adding mapbase stuff TeamSpen210@e800a03. We should add this to Chaos at some point (if mapbase is compatible with our license???)