70ea6912e1
Merge branch 'OpenGL3-upgrade' into NDK
...
Conflicts:
src/Nazara/Graphics/SkyboxBackground.cpp
src/Nazara/Renderer/RenderTexture.cpp
src/Nazara/Renderer/Renderer.cpp
Former-commit-id: e8914d4e32a689b7df365dca15a438f10722530c
2015-09-24 21:35:43 +02:00
b16abf0d09
Merge branch 'master' into NDK
...
Conflicts:
build/scripts/module/renderer.lua
build/scripts/module/utility.lua
include/Nazara/Renderer/OpenGL.hpp
src/Nazara/Core/String.cpp
Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
2015-09-20 23:41:21 +02:00
829b356ae2
First GLX implementation
...
Former-commit-id: 0f41eb0bd949899fce740879604f14a44f532d8a
2015-09-19 17:22:25 +02:00
e8cc3e357e
First xcb implementation
...
Former-commit-id: 483522109b8b63fa80b9152b04bca79a65809d4d
2015-09-19 17:20:01 +02:00
a4032abe63
Fix compilation on linux
...
Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498
2015-09-19 17:10:34 +02:00
67a9dc692a
Physics/Geom: Fix NullGeom InertialMatrix
...
Former-commit-id: ac5e0c6cd9f775c29e37a4bb5a072eee2b224d0f
2015-09-19 14:44:41 +02:00
2c752a38c3
Core/Bitset: Minor changes
...
Former-commit-id: 0d4e2007c83f34ca966615b55927cf34e88670af
2015-09-18 20:00:53 +02:00
b56a454a40
Core/ByteArray: Add missing implementation of Front()
...
Former-commit-id: 672b7bc1054d1a457245dcc15d4c5fafab9fc166
2015-09-18 14:10:24 +02:00
466720abec
Core/String: Fix IsNull() method (thanks to Unit tests)
...
Former-commit-id: dd4828c3c0e2d3423094cf018e70fd74deac0740
2015-09-18 14:10:15 +02:00
859544eaa7
Ndk: Add support for 2D rendering
...
Former-commit-id: bdf9257816c8f48b8c0679647978480785720053
2015-09-18 12:34:05 +02:00
03ee0a12ed
Make signals arguments clearer
...
Former-commit-id: c329f1fc5b8d8ffcf8e38ec4e4804454b31f685f
2015-09-14 22:40:38 +02:00
9f1c190985
Core/String: Replace manual memory management/COW by smart pointers
...
Former-commit-id: 27cab7f0642619ab47d53ed59c737992534f2979
2015-09-13 12:07:31 +02:00
91ec7c7dce
Core/ByteArray: Fix compilation/infinite recursion
...
Former-commit-id: 7e3dded8a79ca6110775891cf3f90f1ab5400483
2015-09-13 12:06:20 +02:00
ef511d9b11
Core: Temporary disable MemoryManager (its causing crashs during runtime with VS)
...
Former-commit-id: 317a3f6b4d8ac363393094d591550181c26e6f05
2015-09-13 01:16:25 +02:00
d73d935c82
Lua/LuaInstance: Fix warning + optimizations
...
Former-commit-id: 4191d942ed50058fba0d2a5ed533c41e993fd0eb
2015-09-13 00:56:53 +02:00
32829863aa
Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
...
Former-commit-id: 3cd50359629d58a4e61744b94f3b7fc47ad551e4
2015-09-11 21:47:03 +02:00
3d9da38e45
Core/Algorithm: Add Apply variant for methods
...
Former-commit-id: 6e34c37c56d916c040ef501190f02f35e9c734df
2015-09-11 14:09:59 +02:00
73e03073eb
Lua: Add automatic function binding
...
Former-commit-id: dcb1d3ca474c9e10f9a40428095a5ff752f5c4a9
2015-09-10 18:03:52 +02:00
5888949bf9
Fix merge files
...
Former-commit-id: 27058f380928319efcdd7af6104a776296b2093e
2015-08-21 22:43:53 +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
dea48a289d
Merge branch 'master' into NDK
...
Conflicts:
include/Nazara/Core/ConditionVariable.hpp
Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
2015-08-21 12:49:05 +02:00
8716daf73c
Debug axes
...
Former-commit-id: e7d93df67679d1e29014120aef5cc0c3421fd9c2
2015-08-21 12:14:35 +02:00
89e0f631d6
No problems
...
No problems found in Rect, Sphere, Vector2, Vector3 and Vector4
Former-commit-id: 6688608a2beaa9cf5328daf7e5108b6cfebd843d
2015-08-21 12:05:46 +02:00
cb8ab90300
Quaternion bug fix: missing 'x'
...
And indentation
Former-commit-id: 87e7cc0f69604f3c4593395b15068b9ded59ba1a
2015-08-21 12:04:46 +02:00
19e1cb05bb
OrientedBox no problem
...
Former-commit-id: ad1256baf4bf6d832cb376fe62b1b52f25479e67
2015-08-21 12:03:37 +02:00
9d7dc63574
Wrong place
...
Former-commit-id: 909750e9bca284c2a0096a51c782c1083b258cef
2015-08-21 12:02:55 +02:00
282bdf9864
Consequences of the plane change + change perspective
...
The perspective matrix now as in glm (because the near frustum plane was
wrong). So there is a factor "2" on the component w and the skybox must
be changed in consequence.
Former-commit-id: 09dd049c177532b9ace34a5a60b1b96014652297
2015-08-21 12:01:52 +02:00
077584ec49
EulerAngles simplification
...
Former-commit-id: 775b07a51077e6f17b9fe05773dc5c277c49919d
2015-08-21 11:53:16 +02:00
b4f926d3ca
Test box
...
No problem except indentation
Former-commit-id: 58d711b48164363fd672c51c005e16eb5ce55e9e
2015-08-21 11:52:44 +02:00
f0660d5da8
Fix operator== with infinite BoundingVolume
...
Former-commit-id: 47cee9fb8d8d2b8188d3918527aeebab56b03992
2015-08-21 11:52:05 +02:00
c2161f2a8b
Fix NumberEquals with unsigned
...
Former-commit-id: 30b573278e84991a9d76604a359bd3110f13d87c
2015-08-21 11:49:37 +02:00
2d07922478
Add Unit for vector2
...
Former-commit-id: 4a143363f24e08d0be12a5ef6bfb46c71b11be4a
2015-08-21 11:34:08 +02:00
376df6a3b7
Indentations
...
Former-commit-id: 0d82a4464cb9369bc4ca5cf2d7780c921eff953d
2015-08-21 11:32:29 +02:00
0b390e45a1
ByteArray rewritten
...
Now works internally with std::vector
Former-commit-id: 643f1d88b2959aed324743dbf91f831130a9198e
2015-08-21 11:28:04 +02:00
3dbcb25384
Transfert enumeration from file to enums
...
Former-commit-id: 0d9e191373affda50d0eb6c2376c7a23720e591b
2015-08-21 11:22:35 +02:00
8cda289b82
Indentation String
...
Former-commit-id: 86848a87089804d5152f80e960308f8b2eb12ff3
2015-08-21 11:11:04 +02:00
b51e151930
Suppression unused file
...
Former-commit-id: 60221e1d8486e6a17a7e5368fd932628d9c52b85
2015-08-21 11:09:18 +02:00
481a191693
Core/Algorithm: Replace UnpackTuple by Apply
...
Former-commit-id: dccf9a102e4287035184053e1d60abc0edaf1a1d
2015-08-20 13:35:51 +02:00
40d35fbe5f
Utility/SimpleTextDrawer: Fix movement
...
Former-commit-id: ac62391a2e28f50a0a61e984692a7a1e3444b28e
2015-08-20 00:00:16 +02:00
21ad09d626
Core/Utility: Fix font crash
...
Happened when the atlas was resizing while updating the text drawer, the
old invalid pointer was kept (now a dangling pointer).
Former-commit-id: d50153f81f1f2bdd80cfdac9dcee85eb7c28c35e
2015-08-17 13:54:07 +02:00
ba1073828f
Graphics: Improve code
...
Former-commit-id: d548b513aef5190e20bc065653178981c5d18f68
2015-08-16 01:44:17 +02:00
95ae8ed82c
Graphics: Add billboard class
...
Former-commit-id: bc898f00aa78dd42f61d34ce743ed9a73dce55f6
2015-08-16 01:43:17 +02:00
9c1441cc82
Core/MemoryManager: Implement allocation filling
...
Former-commit-id: 12e6c293e6d51663971e3da4c160b12a6710430e
2015-06-28 16:03:31 +02:00
318da0d960
Fixed some warnings
...
Former-commit-id: d7db2b471afac2d16f44a67e79842f8a7fc2100e
2015-06-28 13:48:22 +02:00
8648258ef7
Regenerate global headers
...
Former-commit-id: 60165296c6310b77b1954cba31a65d1bdd29a6b6
2015-06-24 13:56:18 +02:00
a4bd84a6e3
Graphics: Remove deprecated scene interface
...
Former-commit-id: 6b5d3c22827912d664c4f8c9c4051c824180bb51
2015-06-24 13:55:35 +02:00
58f91d6e39
Graphics/ParticleSystem: Update interface
...
Former-commit-id: b58c3f194a32411eba2e321b00987d3c76e03cb0
2015-06-24 12:41:54 +02:00
eddac5c0b6
Graphics/SkyboxBackground: Fixes
...
Former-commit-id: ab45a2efa957e33015e4d8dd57ebc8a5d028798c
2015-06-24 00:18:38 +02:00
4cd4055c3f
Graphics/Model: Fix includes
...
Former-commit-id: 27f0e51429ce1ddb9e35d849a296186d79b1cde6
2015-06-23 23:35:30 +02:00
6092b0692b
Graphics/Backgrounds: Update backgrounds to new coding-style
...
Former-commit-id: 9f96b93706fd8417d6262392f0ce9ab9ca1985c3
2015-06-23 23:35:11 +02:00
Lynix
Youri Hubaut
Gawaboumga