celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-21 20:08:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linux-dev'

Browse Source 
# Conflicts:
#	Editor/Editor.cpp
This commit is contained in:
Antoine Pilote
2023-10-02 01:40:04 -04:00
parent 890dbc34f6 4622be08e9
commit d749765e68
150 changed files with 11559 additions and 2084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/src/Misc/GizmoDrawer.cpp
View File

@@ -11,7 +11,7 @@
#include <src/Rendering/RenderList.h>
#include <src/Rendering/Renderer.h>
#include <dependencies/GLEW/include/GL/glew.h>
#include <glad/glad.h>
#include "src/Scene/Components/CapsuleColliderComponent.h"
#include <src/Scene/Components/CylinderColliderComponent.h>