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

Modpocalypse - stuff still broke but at least we can build #1918

Merged
merged 6 commits into from
Dec 14, 2022

Conversation

Measurity
Copy link
Collaborator

No description provided.

Coding-Hen and others added 6 commits December 7, 2022 13:43
* Fixed remaining compile issues and transpilers

* Fixed conflicts

* Changed join menu to use new addressables

* Updated harmony

* Updated Build.targets

* Reworked ResourceAssetsParser logic

The lock on the assemblies would otherwise block starting an SN instance

* Detach Placeholder matching from transform comparison

Before BatchEntitySpawner.ConvertComponentPrefabsToEntities() matched placeholders and their prefabs by same transform, now it's done with classId

* Display AA Scenes in SceneDebugger

* Make remote player signal getting to aa and async

* Fix LoadingScreenVersionText

* Fixed ping instances

* Added builder changes and minor base changes

Co-authored-by: Jannify <23176718+Jannify@users.noreply.github.com>
Revert "Changed OnLateUpdate to UpdatePings (#1913)"
iTween reference is embedded into Assembly-Csharp-firstpass
OnLateUpdate is renamed back to UpdatePings in uGUI_Pings_UpdatePings_Patch
@Measurity Measurity merged commit b78f004 into master Dec 14, 2022
@Measurity
Copy link
Collaborator Author

@Coding-Hen I merged this now so we can build Nitrox again. The branch is still available just in case you were mid-way with work.

@Measurity Measurity deleted the modpocalypse branch January 4, 2023 04:51
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.

None yet

2 participants