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

I guess we're doing UI again #345

Merged
merged 32 commits into from
Oct 14, 2023
Merged

I guess we're doing UI again #345

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
43fc95c
add levelgen flags
Dregu Oct 8, 2023
6767fa8
Merge branch 'main' into UI
Dregu Oct 11, 2023
b166e9f
Use destroy_grid in ui delete
Dregu Oct 11, 2023
ff63713
hitbox color fixes
Dregu Oct 11, 2023
3be15a4
Merge branch 'main' into UI
Dregu Oct 11, 2023
2dd67d9
add ui warp buttons to special game screens
Dregu Oct 11, 2023
26e3165
Add unload level callbacks
Dregu Oct 11, 2023
eeeeabf
rename unload_level and add pre_spawn_level
Dregu Oct 11, 2023
fdfd1ad
layer init hooks
Dregu Oct 11, 2023
0c3b6c7
add set_death_enabled
Dregu Oct 11, 2023
28337d4
add ui options to disable death and respawn players
Dregu Oct 11, 2023
6560ecb
Merge branch 'main' into UI
Dregu Oct 12, 2023
0e3294e
fix get_procedural_chance logic
Dregu Oct 12, 2023
c19bb9d
add procedural chances to ui
Dregu Oct 12, 2023
646a07b
ui chances fixes
Dregu Oct 12, 2023
e70b5cb
thank you for the useless warning
Dregu Oct 12, 2023
54a993a
run level gen callbacks for transitions
Dregu Oct 12, 2023
a312d78
testing cutscene_behavior
Dregu Oct 13, 2023
f3cdf00
fix spawn_player position
Dregu Oct 13, 2023
a9c1f3e
add layer hack to spawn_player
Dregu Oct 13, 2023
20eeb43
uglier hack that works better
Dregu Oct 14, 2023
07f6968
make it not stupid
Dregu Oct 14, 2023
a449568
remove defaults
Dregu Oct 14, 2023
5425ab7
fix docs
Dregu Oct 14, 2023
3b62a27
add patterns for new patterns
Dregu Oct 14, 2023
55584e9
fix clear_callback in movable virtual hooks
Dregu Oct 14, 2023
0aedff0
change some patterns to vtable offsets
Dregu Oct 14, 2023
27df88c
fix spawn_player uid
Dregu Oct 14, 2023
2fd3f4b
update docs
Dregu Oct 14, 2023
d375795
remove cutscenes, add some input helpers
Dregu Oct 14, 2023
1a100fd
fix crash when destroying layer with players
Dregu Oct 14, 2023
56a7322
rename and document death
Dregu Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/game_api/script/usertypes/vtables_lua.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ void register_usertypes(sol::state& lua)
{
Entity* ent = get_entity_ptr(uid);
entity_vtable.unhook(ent, callback_id);
movable_vtable.unhook(ent, callback_id);
floor_vtable.unhook(ent, callback_id);
door_vtable.unhook(ent, callback_id);
Comment on lines +117 to +119
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this template jungle, but clear_callback didn't work and this fixed it.

});

HookHandler<RenderInfo, CallbackType::Entity>::set_hook_dtor_impl(
Expand Down Expand Up @@ -150,6 +153,9 @@ void register_usertypes(sol::state& lua)
[](Entity* ent, std::uint32_t callback_id)
{
entity_vtable.unhook(ent, callback_id);
movable_vtable.unhook(ent, callback_id);
floor_vtable.unhook(ent, callback_id);
door_vtable.unhook(ent, callback_id);
});
}
}; // namespace NVTables