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
df8da275c4
Switch from Nz prefix to namespace Nz
...
What a huge commit
Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
c183102784
Examples: Fix HardwareInfo
...
Former-commit-id: f11e0b1f012fedd2be903cc3da91af72ca036e10
2015-09-24 21:36:59 +02:00
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
3dbcb25384
Transfert enumeration from file to enums
...
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
debe39501e
Added experimental new build system
...
Former-commit-id: ab7fb35db6be4b975d0558680c840d72e38562f9
2015-01-20 23:37:49 +01:00
eceabcd241
Fixed some of the pull request code in order to merge it
...
Former-commit-id: 76d71f15b335535e7dfcaf986440a00e85e45c1b
2014-06-15 01:55:07 +02:00
676ed6c9d8
Correction of mathematical functions.
...
BoundingVolume: Add of constructor and setter OrientedBox. Extend is now
up to date.
Box: Use of <T>. Return this
Frustrum: Use of <T>
Matrix: Use of <T>
OrientedBox: m_corners is up to date
Rect: Add of operators /= and /. Return this
Sphere: Add of Intersect and Contains with box. Little corrections.
Vector2: Return
TaskSchedulerImpl: Add of include header cstdlib to compile because of
std::div
HardwareInfo/main: use of accentAigu
Former-commit-id: a5a7f8e8c45448e5683eb13bff453d6f67478d03
2014-06-14 22:10:37 +02:00
e9fe3440e5
Added header to demos
...
Former-commit-id: fd9b0ddd666a99ba67e519b41186828fb4272cc4
2013-06-13 20:37:42 +02:00
f53f556e58
Fixed HardwareInfo
...
Former-commit-id: 49ac30c152913f6ace3732c394fc4a38cccd87c4
2013-03-02 00:32:55 +01:00
668288265e
Removed useless braces
...
Former-commit-id: f43934e0a2a0c125820f3bcea0a923165ca0ade3
2013-02-16 20:07:10 +01:00
be12026a30
Fixed HardwareInfo not compiling
...
Former-commit-id: 70f193cc041f431970c4dd6a0d9993ff5fedc659
2013-02-13 01:33:40 +01:00
692c578673
Fixed comment
...
Former-commit-id: cc18a8a6fa5b7e58cca26910a83c42e81aead576
2013-01-30 01:35:47 +01:00
0671154f29
Added HardwareInfo demo
...
Former-commit-id: 8b7bc7f4d45d11702bf28c1aa76fa2c2b47f0918
2012-12-29 14:59:32 +01:00
Lynix
Gawaboumga