Merged base and d3xp together. #29
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
After this commit, all of the DOOM 3 base code and Resurrection of Evil SDK code exist as one unified codebase, producing two DLLs but sharing 90% of the same code. Anything that is different between them (should) be `#ifdef`'d out. The primary motivation for doing this is to eliminate code reuse. I want to develop a mod for both Resurrection of Evil and the base game, but I don't want to make my changes twice. Thus, having a unified codebase like this makes a lot of sense.
Author
|
Particle effects are currently not moving. Will need to fix that before this gets merged in. |
Author
|
This should be ready to merge whenever someone has the chance to review it. |
|
I've checked the code myself but there's one weird thing i have notice with stock and merged codebase: This is Mars City 2 map loaded throught console: And this is the same map on stock pre merge codebase: It seems like in vanilla the game its supposed to give you the shotgun but you never get the shotgun at all other than that it seems solid |
|
Enpro Plant has the same issue has Mars City 2 Merge Code: Stock: |
|
Seems like something is off with the player inventory / weapons pickup after the merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After this commit, all of the DOOM 3 base code and Resurrection of Evil SDK code exist as one unified codebase, producing two DLLs but sharing 90% of the same code. Anything that is different between them (should) be
#ifdef'd out.The primary motivation for doing this is to eliminate code reuse. I want to develop a mod for both Resurrection of Evil and the base game, but I don't want to make my changes twice. Thus, having a unified codebase like this makes a lot of sense.