Lynix
|
eaf1bb3601
|
Merge branch 'NDK-Refactor' into NDK
Conflicts:
examples/HardwareInfo/main.cpp
include/Nazara/Renderer/Enums.hpp
include/Nazara/Renderer/GpuQuery.hpp
include/Nazara/Renderer/OpenGL.hpp
include/Nazara/Renderer/RenderBuffer.hpp
include/Nazara/Renderer/RenderTexture.hpp
include/Nazara/Renderer/Texture.hpp
src/Nazara/Graphics/AbstractRenderTechnique.cpp
src/Nazara/Graphics/DeferredRenderTechnique.cpp
src/Nazara/Graphics/Material.cpp
src/Nazara/Graphics/SkyboxBackground.cpp
src/Nazara/Renderer/GpuQuery.cpp
src/Nazara/Renderer/OpenGL.cpp
src/Nazara/Renderer/RenderBuffer.cpp
src/Nazara/Renderer/RenderTexture.cpp
src/Nazara/Renderer/Renderer.cpp
src/Nazara/Renderer/Shader.cpp
src/Nazara/Renderer/ShaderStage.cpp
src/Nazara/Renderer/Texture.cpp
Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
|
2015-09-25 23:16:58 +02:00 |
|
Lynix
|
df8da275c4
|
Switch from Nz prefix to namespace Nz
What a huge commit
Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
|
2015-09-25 19:20:05 +02:00 |
|
Lynix
|
dea3fb4e39
|
Convert spaces to tabs
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
|
2015-09-24 00:55:57 +02:00 |
|
Lynix
|
505f1dbb03
|
Merge branch 'master' into NDK
Conflicts:
include/Nazara/Core/Algorithm.inl
include/Nazara/Core/ByteArray.hpp
include/Nazara/Math/Algorithm.inl
src/Nazara/Graphics/SkyboxBackground.cpp
Former-commit-id: 42f52f71989fa805f69527fd07edb8405df06566
|
2015-08-21 18:55:58 +02:00 |
|
Lynix
|
318da0d960
|
Fixed some warnings
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
|
2015-06-28 13:48:22 +02:00 |
|
Lynix
|
836e4af221
|
Utility/OBJParser: Fix material indexes being unstables
Former-commit-id: 10a3e37d9223359d45e3754ba69e6439be97852a
|
2015-06-14 22:44:21 +02:00 |
|
Lynix
|
1fc17c8b53
|
Separate NAZARA_API into multiple defines (one per module)
To fix inter-module dependency
Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0
|
2015-06-13 22:31:29 +02:00 |
|
Lynix
|
251e21f006
|
More VS fixes
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
|
2015-06-13 19:42:07 +02:00 |
|
Lynix
|
1a92fe331c
|
Rename and move loaders, expose parsers
Former-commit-id: 932ae2aab020f956d3fdb91107f6842ff292aa08
|
2015-06-13 17:13:55 +02:00 |
|