WohlSoft / LunaLua

LunaLua - LunaDLL with Lua, is a free extension mod for SMBX 1.3 game engine, core of the X2 project.
https://codehaus.moe/
GNU General Public License v3.0
33 stars 12 forks source link

Warp events #47

Closed MrDoubleA232 closed 1 year ago

MrDoubleA232 commented 2 years ago

Adds 3 new events:

Should make dealing with warps much easier, especially instant and portal warps, which were a hassle before.

Requires a change to main_events.lua to add the events and a change to editorevents.lua to make it work with portal warps.

MrDoubleA232 commented 2 years ago

I just noticed that this has 20 commits and 2000 changed files. I have no clue why.

Wohlstand commented 2 years ago

You got rid of 300k lines and added only 1.7k 👀

Wohlstand commented 2 years ago

You got rid of 300k lines and added only 3k 👀

Is that because you attempted to remove a part of Boost library?

MrDoubleA232 commented 2 years ago

The only files I intended to change were RuntimeHook.h, RuntimeHookHooks.cpp, and RuntimeHookGeneral.cpp. But obviously... something went wrong lol

Supermario1313 commented 2 years ago

Looks like the actual change is in the last commit, the other ones seem to be here because of a merge. There are even some duplicate commits for some reason.

image image

Bluenaxela commented 2 years ago

Yeah... that's a bit of a git history mess with the way you've merged things around in your branch there. Would probably be best to do a fresh branch (or git reset) based on 19cedde1693ca22aaf196c3e471fe5f57c5d7c66 then git cherry-pick 82742cf8182919a2a69af5372f64368be564524e Force-pushing that overtop of the MrDoubleA232:warp-events branch would clean up this pull request.

Bluenaxela commented 1 year ago

The Git history mess notwithstanding the intended commit looks good to me. I'm looking at clearing up some merge requests, so I performed a cherry-pick of 82742cf8182919a2a69af5372f64368be564524e from MrDoubleA232:warp-events and pushed it, so this is effectively merged now.