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.

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

Merged
merged 109 commits into from
Jun 30, 2022
Merged

Cherry-pick upstream's master #130

merged 109 commits into from
Jun 30, 2022

Conversation

braem
Copy link
Member

@braem braem commented Jun 17, 2022

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 with studio?

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???)

@braem
Copy link
Member Author

braem commented Jun 17, 2022

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!

@tmob03
Copy link
Member

tmob03 commented Jun 17, 2022

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???)

https://docs.momentum-mod.org/entity/mapbase_enhancements/
Some mapbase things are already in momentum

@TeamSpen210
Copy link

studioprop() isn't for older things, basically you want studioprop() for props representing the "real" appearance of ents, studio() for editor helpers and the like. studio() doesn't include the model in the bounding box, and some other things like that.

@braem
Copy link
Member Author

braem commented Jun 17, 2022

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???)

https://docs.momentum-mod.org/entity/mapbase_enhancements/ Some mapbase things are already in momentum

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.

@braem
Copy link
Member Author

braem commented Jun 17, 2022

studioprop() isn't for older things, basically you want studioprop() for props representing the "real" appearance of ents, studio() for editor helpers and the like. studio() doesn't include the model in the bounding box, and some other things like that.

Ah thanks for the heads up! <3

@AWildErin
Copy link
Member

Unrelated to what the PR is bringing in, but I noticed it brought over changes for fgd/bases/BMBaseHelicopter.fgd, do we even need this file? It seems to a Black Mesa Source related thing

@braem
Copy link
Member Author

braem commented Jun 26, 2022

Unrelated to what the PR is bringing in, but I noticed it brought over changes for fgd/bases/BMBaseHelicopter.fgd, do we even need this file? It seems to a Black Mesa Source related thing

Oh yeah I dont see any entity basing off it as well so I will remove here

TeamSpen210 and others added 19 commits June 30, 2022 11:29
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
The frustum helpers now rotate correctly, but they're still bugged in a bunch of other ways.
TeamSpen210 and others added 23 commits June 30, 2022 11:30
This allows Desolation to override the behaviour.
Looks like a Mesa base, and it is not used by anything
Copy link
Member

@AWildErin AWildErin left a 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

@braem
Copy link
Member Author

braem commented Jun 30, 2022

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.

@braem braem merged commit caec941 into master Jun 30, 2022
@braem braem deleted the chore/upstream-changes branch June 30, 2022 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Default game_text location to somewhere other than the center of the screen
5 participants