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

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

braem pushed a commit that referenced this pull request Jun 26, 2022
@TeamSpen210 @braem
#130: Add back appearance and inputs to light_environment
9f45eb1
braem pushed a commit that referenced this pull request Jun 26, 2022
@TeamSpen210 @braem
#130: Add back appearance and inputs to light_environment
3298663
TeamSpen210 and others added 19 commits June 30, 2022 11:29
@TeamSpen210 @braem
Make skinset keyvalue description a bit more clear
e735cbe
@TeamSpen210 @braem
Switch these VTFs to the earlier 7.2 version
9f4f125
@TeamSpen210 @braem
Add 'keyvalue' option for comp_scriptvar_setter
98b8aae 
This reads an entity keyvalue, and converts it to the appropriate Squirrel type.
@TeamSpen210 @braem
#130: Add back appearance and inputs to light_environment
675f359
@TeamSpen210 @braem
Add the alternate classname for static props
a880ce5
@TeamSpen210 @braem
Improve rope slack computation with many segments
f2b4169
@TeamSpen210 @braem
Fix geo hole in dustpuff model
0dccd39
@braem
func_portal_orientation corrections, and note how to fix it in P2
943bdd4
@braem
Add Hover Turret FGDs
5ec4604
@braem
Fix #89: Duplicated model helpers on some entities
5fc8f9b
@braem
Hover turrets have a field of view
687a9e9
@braem
Flag point_teleport's model keyvalue as non-engine
d06f2b0
@braem
Clean up vehicle FGDs
78ed05d 
- 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
@braem
Clean up jeep FGD
27f4306
@braem
Sorta fix #98
909b1d7 
The frustum helpers now rotate correctly, but they're still bugged in a bunch of other ways.
@braem
Move generic_actor out of a folder
6d9709c
@braem
Actually fix prop_portal_stats_display's doubled rotation
0703bcb
@braem
Refer to players as "they" in keyvalue descriptions
98cdda2 
NPCs as well in some cases
@braem
Helicopters are genderless inanimate objects
f0c3840
TeamSpen210 and others added 23 commits June 30, 2022 11:30
@TeamSpen210 @braem
Round delay values
96b06ca
@TeamSpen210 @braem
Make this !name more recognisable.
9a83362
@TeamSpen210 @braem
Add description to readme
8be39c9
@TeamSpen210 @braem
Add warning if no OnSeq outputs provided (very likely a mistake).
434e6f3
@TeamSpen210 @braem
Add icon for sequential call
a558098
@TeamSpen210 @braem
Add inner radius to point_push
6fa6cba
@TeamSpen210 @braem
Add ability to make sequential call run in reverse, fix sequential + …
11ec625 
…total time breaking
@TeamSpen210 @braem
Add futbol physics to paint bomb editor model
932531e
@TeamSpen210 @braem
Add input to P2 antline entities for manually setting the antline frame.
d5a0927
@TeamSpen210 @braem
New comp_flicker entity, for automatically generating flicker sequences
cad0ea5
@TeamSpen210 @braem
Add icon for comp_flicker
7c4c0ff
@TeamSpen210 @braem
Move game_text default positions down to not block crosshair.
63ae461 
This fixes #85.
@TeamSpen210 @braem
Fix "interval" mode not working on sequential call
f8c505c
@TeamSpen210 @braem
Allow using the specified target ent instead of !seq
9c94318
@TeamSpen210 @braem
Extract this logic out into a function
14b7cee 
This allows Desolation to override the behaviour.
@TeamSpen210 @braem
Fix #155: Wrong type for point_viewproxy's attachment point keyvalue
d9e2fdd
@TeamSpen210 @braem
Tweak logic_register_activator descriptions
7f3955a
@TeamSpen210 @braem
Fix dropper instances using a custom material
4b69fc9
@TeamSpen210 @braem
Add safeguards so comp_relays still run if ctrl_type or value is miss…
a6d87cc 
…ing.

This fixes BEEmod/BEE2-items#4044.
@TeamSpen210 @braem
Update readme
6b0df6a
@braem
npc_clawscanner is in HL2, and switch to studioprop
8291829
@braem
Add hammer model keyvalue to npc_cscanner and add mine inputs
9745722
@braem
chore: remove BMBaseHelicopter
51554b3 
Looks like a Mesa base, and it is not used by anything
AWildErin
AWildErin approved these changes Jun 30, 2022
View reviewed changes
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
@braem braem mentioned this pull request Jun 30, 2022
Closed
@tmob03 tmob03 mentioned this pull request Jul 22, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AWildErin AWildErin AWildErin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
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
@braem @tmob03 @TeamSpen210 @AWildErin @darvil82