Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

GI#66, CF#243 - Background Layer Improvements - #399

Merged
garethyr merged 102 commits into
developmentfrom
GI66-CF243-Background-Layer-Improvements
Jul 24, 2022
Merged

garethyr merged 102 commits into
developmentfrom
GI66-CF243-Background-Layer-Improvements

Conversation

@MaximDude

@MaximDude MaximDude commented Dec 29, 2021 •

Copy link
Copy Markdown

This will need pre4 testing branch merged into dev and dev merged into this after pre4 is out.

# Conflicts:
#	Entities/SLTerrain.cpp
Resolved manually
…whole backbuffer so background layers are displayed correctly in splitscreen
… when the viewport is on the right edge of a non-wrapping scene
# Conflicts:
#	Entities/Material.cpp
#	Entities/SLTerrain.h
#	Entities/SceneLayer.h
#	Entities/TerrainObject.h
#	Lua/LuaBindingsManagers.cpp
#	Managers/MovableMan.cpp
#	Menus/SceneEditorGUI.cpp
Resolved manually

@garethyr garethyr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Good job on the whole. Bunch of comments and questions though, we'll probably have to chat about some stuff cause there are things I definitely don't really understand haha

Comment thread Activities/SceneEditor.cpp
Comment thread Entities/BunkerAssembly.cpp
Comment thread Entities/BunkerAssembly.cpp Outdated
Comment thread System/Entity.h
Comment thread Entities/Material.h
Comment thread Entities/SLTerrain.cpp Outdated
Comment thread Entities/SLTerrain.cpp
Comment thread Entities/SLTerrain.cpp
Comment thread Entities/SLTerrain.cpp Outdated
Comment thread Entities/SLTerrain.cpp
@garethyr
garethyr merged commit 140f130 into development Jul 24, 2022
@garethyr
garethyr deleted the GI66-CF243-Background-Layer-Improvements branch July 24, 2022 00:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

bug Something isn't working enhancement New feature or request refactor Code needs to be refactored

Projects

None yet

2 participants