025d873228
Merge branch 'NDK' into NDK-ShadowMapping
...
Conflicts:
SDK/include/NDK/Systems/RenderSystem.hpp
SDK/src/NDK/Systems/RenderSystem.cpp
Former-commit-id: 2772ff703c9d68d536667c469aca85084be4b861
2015-09-19 14:47:02 +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
aa303f9028
Merge branch 'NDK' into NDK-ShadowMapping
...
Conflicts:
include/Nazara/Math/Matrix4.inl
Former-commit-id: e4b7d178a7acba17c03de2b585af86324b8d75a6
2015-09-13 12:10:30 +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
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
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
1398ed7ebc
Core/ObjectRef: Remove static_assert
...
Former-commit-id: 5050ce7a786053725d7e18fcc943bfb2ce3fee69
2015-07-02 13:01:23 +02:00
0cb4726bf5
Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping
...
Conflicts:
SDK/include/NDK/Systems/RenderSystem.hpp
SDK/src/NDK/Systems/RenderSystem.cpp
Former-commit-id: f62e9a27427d96893acd2381bb06ae928a1d3741
2015-06-29 21:05:09 +02:00
9c1441cc82
Core/MemoryManager: Implement allocation filling
...
Former-commit-id: 12e6c293e6d51663971e3da4c160b12a6710430e
2015-06-28 16:03:31 +02:00
b7b5458c79
Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping
...
Former-commit-id: 0c302477d672346eb50c12f8fa7e2b6a19d60779
2015-06-23 12:11:02 +02:00
179f30861d
Core/Bitset: Fix Bitset::FindNext
...
Former-commit-id: 20d18be6e8039fc386ef7c402878b3d29577b46d
2015-06-22 14:27:42 +02:00
80208b0dc5
Core/OffsetOf: Remove constexpr (cannot be used because of reinterpret_cast)
...
Former-commit-id: 78142eb9033a1969f20055b2cecf1bc78152e896
2015-06-17 23:32:48 +02:00
c74de36e77
Core/Color: Fix warning
...
Former-commit-id: 518409a0b6dabd068c13873e7ac4e4be950a8480
2015-06-15 13:42:28 +02:00
f4c3ec51ed
Final VS fixes
...
Former-commit-id: 6da44f94127f61de39710a52b8b3b73ce19c1269
2015-06-14 16:18:37 +02:00
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
251e21f006
More VS fixes
...
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
504eb96b93
Fix compilation under VS2015
...
Former-commit-id: fb7b3f377e34ea0c44a7fc65efbdb059581d772b
2015-06-13 17:14:19 +02:00
f60f8fa6a4
Core/Color: Fix warning
...
Former-commit-id: 7c91c17d9d9c1133e206154320032d554a15c26b
2015-06-12 00:18:24 +02:00
e97cc666a1
Core/Signal: Update comments
...
Former-commit-id: 3e802e6ae0b05c67cb7562567f733fd762e97eed
2015-06-08 01:00:25 +02:00
5ce3c5a0cb
Core/Signal: Fix disconnection while iterating
...
This is no longer an issue, you can now disconnect every signal as you
wish even while the iteration
Former-commit-id: 5caadaa860c62ce09f02f7555aa7c6adebc74fb9
2015-06-08 00:28:51 +02:00
a069b105e6
Fully replace listener system by signals
...
Former-commit-id: 032dfddd12cc3a792c71426148c758ffac3621f9
2015-06-07 20:42:41 +02:00
358fab7115
Core/Signal: Add const-variant of member functions Connect overload
...
I do speak english very wheel
Former-commit-id: 4d688897a65ff6fcf793af8d10219bac9b28424a
2015-06-07 18:25:04 +02:00
4e5cdea454
Core/Signals: Remove Connect/Disconnect macros
...
And make interface easier to use
Former-commit-id: 5b789c9acb694839cb173ae96392650d80d383b7
2015-06-07 17:28:19 +02:00
004b53c590
Renderer/Renderer: Replace listeners by signals
...
Former-commit-id: c1293f7f7cc31c4122ba866fc44d93188917ad93
2015-06-07 16:52:19 +02:00
fe25249136
Replace Listenable system by signals
...
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
2015-06-07 15:16:11 +02:00
261dffd931
Core/Signal: Make operator() const
...
Former-commit-id: 623f4908ca5e71d02365aea0b717d684a822ea5b
2015-06-07 03:36:41 +02:00
303cdbb0cb
Core/Signal: No longer return rvalue
...
Former-commit-id: 96ff0eb63fa0e22952783119be6b739a59cb422a
2015-06-07 03:35:54 +02:00
991c1af1ca
Core/Signal: Add default constructor and operators to ConnectionGuard
...
Former-commit-id: 0080c6bf19cab972945bf978c3d5461ee4228fce
2015-06-07 01:44:16 +02:00
0b14711cbf
Core/Signal: Add Connectionguard::GetConnection()
...
Former-commit-id: 78d0f6e72f15933fb4356d304a5a48ea3c163fbe
2015-06-07 01:31:57 +02:00
d43126eae5
Core/Signal: Fix incorrect forwarding
...
Former-commit-id: 4d437e98e89dcc52f44259371e18589a72fdbd27
2015-06-07 01:31:37 +02:00
1a0057313c
Core/Signal: Optimize
...
Former-commit-id: 36fee5057acabf1b6bb8ef93ad6741206e10121b
2015-06-07 01:08:08 +02:00
32e55c2e72
Core/Signal: Add Connection object and Disconnection
...
Former-commit-id: 19cda39e3e9fbc5e26c716c413bafe41deecf7ce
2015-06-07 00:51:43 +02:00
f8682d227b
More Cppcheck fixes
...
Former-commit-id: 62ab1caa04543da1a169812bb92a450d44f3aec1
2015-06-07 00:21:53 +02:00
d1258c2a6d
Core/Signal: Add move Connect method
...
Former-commit-id: 1874faf23299ebac3e433195faa03c9eb6bd9ed4
2015-06-05 14:45:11 +02:00
ea3e15d5d3
Core/Signal: Add Connect helpers
...
Former-commit-id: aae537bdc764b66735356a1d335be4b468eb9f77
2015-06-05 14:12:36 +02:00
0f27930467
Core/Signal: Add Signals (WIP)
...
Former-commit-id: eee55aa563f29c5604437f3c1a2b172af1a6410d
2015-06-04 15:20:16 +02:00
Lynix
Gawaboumga