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

[WIP] Import Changes from Mapbase #171

Closed
wants to merge 3 commits into from

Conversation

halotroop2288
Copy link
Contributor

@halotroop2288 halotroop2288 commented Jan 9, 2023

Not exactly a "merge" because I would have liked to preserve commit history, but I (will) have imported all the changes at once since that is likely impossible.

This is a heavy work in progress. When it's done, it should allow Mapbase mods to be more easily ported to this engine.

Differences from Mapbase:

  • Duplicated fixes and additions ignored (easily noticed when doing this by hand)
  • Squirrel is a submodule of the official Git repo (reduces manual work)
  • Any newly added preprocessor block has a commented endif to help keep track in less featured editors
  • Ignored memoverride.cpp changes for fear of fucking it up

TO-DO:

  • Import all the code changes 320/1417 files addressed
  • Finish writing up wscripts
  • Working Waf Squirrel support for VScript
  • Fix build errors and solve other issues
  • Address contributor concerns

I highly recommend turning on the "ignore whitespace changes" setting while reviewing. VS Code auto-formatted trailing whitespace out of any modified file.

@nillerusr
Copy link
Owner

Well that's may be useful for sdk, not for engine

@nillerusr
Copy link
Owner

I have good script-helpers for doing task like that

@halotroop2288
Copy link
Contributor Author

Well that's may be useful for sdk, not for engine

What's the big difference? SDK is just supposed to be a subset of engine anyway, right? (Serious question. I'm not that familiar.)

@halotroop2288 halotroop2288 mentioned this pull request Jan 13, 2023
@halotroop2288
Copy link
Contributor Author

Well that's may be useful for sdk, not for engine

Would you still be interested in the minor bug fixes and optimizations Mapbase added (basically anything outside a preprocessor block)?

@nillerusr
Copy link
Owner

nillerusr commented Jan 14, 2023

@halotroop2288

Would you still be interested in the minor bug fixes and optimizations Mapbase added (basically anything outside a preprocessor block)?

I am not interesting in that for hl2 and master branch, because it have fixes from me and easily may break something.
But I am interesting in mapbase in separate branch for mods that's using mapbase like entropy zero 2

@nillerusr nillerusr force-pushed the master branch 8 times, most recently from f98db24 to a15db00 Compare January 14, 2023 12:54
@halotroop2288
Copy link
Contributor Author

halotroop2288 commented Jan 14, 2023

it have fixes from me and easily may break something.

Let's cross that bridge when we come to it. I'll check for bugs in the process of getting it merged, if you'll allow me.

But I am interesting in mapbase in separate branch for mods that's using mapbase like entropy zero 2

Oh gotcha. I can re-target this PR to a different upstream branch if you want.
Also, could you tell me more about those helper scripts?

@steadyfield
Copy link
Contributor

@halotroop2288 is this work of porting mapbase to nillerusr's source engine still active? or it is cancelled?

@halotroop2288
Copy link
Contributor Author

Is this work of porting mapbase to nillerusr's source engine still active?

Suspended for now, real life is in the way.

@nillerusr nillerusr force-pushed the master branch 2 times, most recently from e606bd0 to ff620bf Compare April 5, 2023 22:35
@IAhmadGT
Copy link

IAhmadGT commented Nov 4, 2023

still waiting :D

@halotroop2288
Copy link
Contributor Author

I'm not working on this anymore, I'm leaving it up so others can continue where I left off though.

halotroop2288 added 3 commits April 9, 2024 18:23
Ignores the default build out/ directory.
Adds a natural way to parse a single VPC file

Used in an upcoming commit.
@halotroop2288
Copy link
Contributor Author

We're getting shut down. Godspeed. o7

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.

4 participants