salmon-engine-projects/shadow-over-bishkek001
14
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
vottozi committed 2026-02-05 01:43:45 +06:00
2 parents c8076b6018 d425167dce
commit e799b4ec79
10 files changed
+6321 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Game.h
+1
View File
@@ -86,6 +86,7 @@ namespace ZL {
VertexDataStruct spaceshipBase;
VertexRenderStruct spaceship;
VertexRenderStruct cubemap;
std::shared_ptr<Texture> boxTexture;