26289139a3
Utility/OBJParser: Prepare for saving
...
Former-commit-id: 89d82ac533c72033927557251278dd1544002a54 [formerly dc3b1ff5e00608ed0dfdee9b57ff6986a1d5ac33]
Former-commit-id: ee2b46fbfb0a0f7cd96ae1b35ec1af30342cd2fb
2016-07-08 08:34:45 +02:00
9a6de9f7ac
Math/Vector4: Fix w value when converting from Vector3
...
Former-commit-id: 0ad39219de839bb1de859baac059441e36c04444 [formerly d2516303dd597418bd2939f737617f0fad1f0da4]
Former-commit-id: 7d5223e4e34b50dbb4ec9e0d22c7801470099d2a
2016-07-07 09:01:08 +02:00
087c3b104b
Utility/OBJParser: Add saving
...
Former-commit-id: e05fec0cb2309c0a935ff1293b698433390675a7 [formerly bffd283b0c04e45df50adaa7b061aacdda10a0ec]
Former-commit-id: 7792044687e73fa8d5862aa15de373370023249a
2016-07-07 09:00:50 +02:00
84e9b3e148
Utility/OBJParser: Optimized loading
...
Former-commit-id: f84e73928d0596d5933cadea572465ded864192f [formerly 0621b0e5e8f674273190ed08e5d984c085d190a9]
Former-commit-id: 7dae4cbeff3644cdb0246ac3d077ddcb5bc7b51f
2016-07-07 09:00:35 +02:00
884c8528f4
Utility/MaterialData: Fix FaceCulling being used for FaceSide
...
Former-commit-id: c6dea66694fbcce15d266e280e8048048e2523fa [formerly be83776dfb6acd33b6e86bf4e8aa74eaf253826a]
Former-commit-id: 018a5d60be15d1e476ccd739a9b171cc997ee355
2016-07-07 08:57:11 +02:00
4f29015c05
Core/StringStream: Add Clear and GetBufferSize methods
...
Former-commit-id: 0efb57d6bbbe6f5a3ef96b1468428e99ec2f209e [formerly 831a749e3ce3a62e62dff8b5ec5a623ea15cd5fd]
Former-commit-id: ab163c4086613046227165aa01606a8ed6edad75
2016-07-07 08:56:45 +02:00
18cb5f9da3
Graphics/Material: Add SaveToParameters
...
Former-commit-id: 706770cc1eaf00e0849d9a6f6878b0ab9b69d3aa [formerly be281a7eaaa21f25c80ff65bf7b79c93c03e1e1d]
Former-commit-id: b54f61ec5be56a9ae51decaf625ff96b2ab5c62d
2016-07-07 08:56:18 +02:00
77cf413f6a
Renderer/RenderWindow: Fix visibility of OnWindow*() events
...
Former-commit-id: 9e756e4a50d8f14bbf9cded7b580bd6787515332 [formerly d8a7f7a52aec51b3480ddfe0e71ffb6568f35440]
Former-commit-id: 61e0ee78490dc00e64c8efd72953cfe5ceee195f
2016-06-20 13:12:09 +02:00
e0071b196a
Sdk/GraphicsComponent: Add Detach method
...
Former-commit-id: b80b7e52f4736f61c439a4242531adaefbdb75a2 [formerly 2c336b6480ae9a11ca1104ee1140e8f449bb2a02]
Former-commit-id: 54f77c634ce1f9bfc93a00d9a14567bd25a06b26
2016-06-20 13:11:31 +02:00
499f9e0dff
Core/ObjectRef: Add comparison operators
...
Former-commit-id: 87b6480dfad8fd49da249890c62e698afdcfca8e [formerly 3d82a1d9f1f0358975b23a25274ac4a8c75ef37f]
Former-commit-id: 9031aab557ae8c9b89025725fa65f0309b5b32ee
2016-06-20 13:10:09 +02:00
5970682035
Noise: First pass of refactoring
...
Former-commit-id: 77de49ee01fea466cb97b22771e4c625389fd95c [formerly edce9427bc009c8ea6a6df35d9ce134a83ab985c]
Former-commit-id: 76227519c8be75a45f6f65250a0870c2eb866953
2016-06-18 12:36:20 +02:00
81245a9c43
Noise: Refresh module using ZNoise
...
https://github.com/Overdrivr/ZNoise
Former-commit-id: 3f7be1c8fd14e074826ca667676412ea4989621c [formerly 882d0bdad12c264766dc00869ac07bbecbee7306]
Former-commit-id: b12a4654bb5b9ff3fdd474704d66aa10fd2d756d
2016-06-18 07:52:33 +02:00
819b46f5fc
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: c7792a7d5b1f85ab934da25324831b9daa3f47ff [formerly 3469974c48432be1f65808bff0ea39d9e22f5b50]
Former-commit-id: 5080815e9e1a3aebe237ff9a291b908ce0292eca
2016-06-13 21:09:55 +02:00
4841a1d7d4
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: a878fa4000900341bd6459265f514fd66709957f [formerly a5f65619bc7cf3c6893d16a67d2cb5f2490b98c7]
Former-commit-id: d33d62d24e29d4bca899464bff5cc9e8ca8cb484
2016-06-11 13:13:57 +02:00
116699a313
Math/Algorithm: Fix IntegralLog2Pot case with sizeof(T) > 4 and %32 bits
...
Former-commit-id: c354e6edf2bd2c69926ff7c2503ec65862eb70ca [formerly 0363386806402faccdfe600341d5d9de5afc26f3]
Former-commit-id: 294c14ea78a84558ecbbeeb3276117a411b3d9e5
2016-06-11 13:13:53 +02:00
8509c7c068
Network/RUdpConnection: Remove useless line
...
Former-commit-id: 8f55377c62171e3976f4d4d339da9c5e06df9d52 [formerly 4e8143782a1b3814596ce84a7108ebf623352674]
Former-commit-id: b58d42df10f79f54c2f104480cc897eaf943a1db
2016-06-10 12:40:31 +02:00
c2d0ebd15e
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: f8a87ba041804b41dbc35db1fb2f99ec51702b8e [formerly 0adbfb8a3baf6330953b0247f4ad5a72af051633]
Former-commit-id: 54fbeafa8fb8034f945086ea06a20c34fb2bfb4d
2016-06-09 08:49:14 +02:00
f80dc7cf45
Graphics/Material: Add errors when failed to query texture
...
Former-commit-id: b848a6552b442edf87260bbbb6b3703bf155a4b7 [formerly b4720a11771bd5f2e61f54afc69c361b7c412555]
Former-commit-id: b3aa1119d7ca9efe3030f40f1f5d1f0c79b416fd
2016-06-09 08:49:01 +02:00
cc49b559c3
Utility/MaterialData: Add Material name information
...
Former-commit-id: f680fd0d6e8c4a10a44ee8393e6b08e164fceabf [formerly b906d2ed5d98ee0bc0199f71d4955a93c18657f7]
Former-commit-id: 50620f9c773ecadec81a257b9c3ad280a97f0c24
2016-06-09 08:47:08 +02:00
63ac80c7ff
Utility/Mesh: Replace scale by transform matrix
...
Former-commit-id: b02de61fe0213f5fdd074dfa868db415e9c770c3 [formerly e185f2b410f2a3e04a0f11be28665cf6e8dcb617]
Former-commit-id: d0c7e88fe2b5f8a4aa97640d050751def83f3783
2016-06-09 08:46:44 +02:00
363299f4de
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine into Documentation-Update
...
Former-commit-id: 601bee6e41fcb3951f3ae9070a277896aeb52d80 [formerly ea8c1543b3df294643130613a6df14ad17bc1dd5]
Former-commit-id: 08bda7de77c7615d6ba76eed38075a0c667ff72d
2016-06-06 19:33:33 +02:00
baf9994675
Utility/PixelFormat: Fix ComputeSize for DXT formats
...
Former-commit-id: e16835382aa80ea53c7cdc747cc0b04c493cb645 [formerly 565512d61f3ef1131c89cc0c1ffc140ff1112f91]
Former-commit-id: 95e9c965e95176857452a7c270cbecd75e86cd8d
2016-06-02 19:10:41 +02:00
19a1cbb7e0
Vulkan/CommandBuffer: Fix warning for GCC
...
Former-commit-id: 702d3b186c232cdef5768631ad6e6a2e1feac516 [formerly 469a768929fb16bfd6dd72be91c883fa7bb9038a]
Former-commit-id: 8a805356facb558f23e25d59162eef04b528e067
2016-06-01 13:08:13 +02:00
d17d6e12da
Vulkan/Surface: Fix compilation under Linux
...
Former-commit-id: af4efdf4f46f7817f75ca5c2f83fbe72c84e9ecb [formerly 1a431ff653263d46079162f2626cc6a05b688859]
Former-commit-id: ac76a5219f0ed014a666bbc78eb1358afb254026
2016-06-01 13:06:32 +02:00
4ab05c2803
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
...
Former-commit-id: bdbe1aab7fe7f0241069aa2d9ab444897ba471cd [formerly 5fd04e51e2a7441252ef56f136bd9d81df380f75]
Former-commit-id: d326241827c4021980631a210603c4d5b77cf6f3
2016-06-01 08:42:58 +02:00
db8a222f62
Fix for problems signaled by clang static analyzer
...
Former-commit-id: 835f639c45509b0d55fe716e51e3285ea2a89da4
2016-05-31 21:50:31 +02:00
6557fedf47
Physics: Upgrade Newton to 3.13
...
Former-commit-id: 9e3777a39842ab18e103a75a590d8d58d25b10c5
2016-05-31 09:02:35 +02:00
0a99058c4d
Documentation for module: Network
...
Former-commit-id: d36042138d0883eb118cc9a70f94f3522214dd46
2016-05-30 14:22:31 +02:00
96b958d655
Documentation for module: Graphics
...
Former-commit-id: 5e3ee3c61779fbdd1a083117f537a45e1bad820b
2016-05-30 14:21:36 +02:00
6400ba2e28
Fix documentation for module: Core
...
Former-commit-id: a79bf956a2759c6056e4e4e2193b8b192c5727c5
2016-05-30 14:09:51 +02:00
8336c05522
Documentation for module: Audio
...
Former-commit-id: acb9e00a7af8bf1c36f42b45fe7e7df99e03c0f9
2016-05-30 13:36:52 +02:00
37ee034702
Graphics/DepthRenderTechnique: Fix typo in include name
...
Former-commit-id: f304f7bf1f0ecc2d58ce68d3b3a64802958bf2c7
2016-05-30 07:41:32 +02:00
0be81cfa5f
Merge branch 'master' into vulkan
...
Former-commit-id: 984d874e950bc6f0cb8d4ea2b217a51b07bc3c16
2016-05-29 19:21:07 +02:00
3e78dd40ad
Fix some GCC warnings
...
Former-commit-id: b3292fcfd4d029793cb70f97ab608aeb7d0579ef
2016-05-25 13:52:10 +02:00
9c08208de3
Vulkan/CommandBuffer: Add Begin/End overloads
...
Former-commit-id: c2681cf86c04cfba835204e87b386f3527f689c4
2016-05-19 18:34:03 +02:00
ecd4a7e4bb
Vulkan: Wrap vulkan queues
...
Former-commit-id: 50a37b90b8f95d3842442e41357c117099d2afda
2016-05-19 18:33:47 +02:00
602c39e8ba
Vulkan/Swapchain: Wrap images creation/getters
...
Former-commit-id: 50e5890c7aeb16408a460e6734301c6393c435e5
2016-05-19 09:07:31 +02:00
42fba6eee4
Vulkan/Device: Improve and rename GetDeviceQueue method
...
Former-commit-id: 7887f86989e9f19f315275bcb944147bca306afd
2016-05-19 09:04:29 +02:00
aa654b5caf
Vulkan/CommandBuffer: Fix crash when moving
...
Former-commit-id: fbb9c69e709109ca9f06def3bf8b35e112ee294c
2016-05-19 09:04:01 +02:00
358f0ea87b
Vulkan/CommandPool: Fix linking error
...
Former-commit-id: 89988bc96174b5531a7ed1478cf8486ef6c50289
2016-05-19 09:03:49 +02:00
e536f1c962
Vulkan/Surface: Add a few wrapper methods
...
Former-commit-id: 7c299cdd3964279dd6dafb25acc762d753c17ab0
2016-05-18 21:32:41 +02:00
1042ba6584
Merge branch 'master' into vulkan
...
Former-commit-id: 2de61dcc322505af741e4b7c09d375df6d5363e4
2016-05-17 20:25:51 +02:00
9036eb4804
Graphics/Light: Fix compilation
...
Former-commit-id: 39de337102ae862b74d5fe8fae9fdb7e19e32e06
2016-05-17 20:14:06 +02:00
549f37efb8
Core/Bitset: Fix OR/XOR with two bitset of similar size
...
Former-commit-id: df5c15cb0c1c4984c7bc142886843f8977379ec2
2016-05-17 17:08:45 +02:00
43895d29af
Core/Algorithm: Add ReverseBits function
...
Former-commit-id: fa37fcf64cfe6786b9906aa7a8b410e19a3079d1
2016-05-17 17:08:14 +02:00
1ebe1a8091
Utility: Rework PixelFormat (WIP)
...
Former-commit-id: 1ab609e753783d9767ba23fd4cab9390453bf729
2016-05-17 14:23:45 +02:00
e7f21b7a3d
Vulkan: Update global header
...
Former-commit-id: 3d67bedb8835c68706dd681e12074553b4947a0c
2016-05-15 00:11:26 +02:00
efc42b58cf
Vulkan: Add support for CommandPool and CommandBuffer
...
Former-commit-id: 85b1935a402b007a53ffbc080374a5028b6eaebc
2016-05-15 00:08:05 +02:00
68e3fd8db3
Vulkan: Allow Device Objects to be move-constructed
...
Former-commit-id: c7fb30b30d2242e19d531a6860b856660b6b0c01
2016-05-14 21:28:59 +02:00
1346c3e2c0
Vulkan/Swapchain: Fix compilation
...
Former-commit-id: 22679aa8e212c63360903f3094a60441323b488a
2016-05-14 15:41:26 +02:00
4996901816
Vulkan: Remove redundant headers
...
Former-commit-id: b3bd76e96cd3c1516123b08f45bd5ff706837717
2016-05-14 15:28:29 +02:00
a8fa5e1d12
Vulkan: Use a generic class helper for all device objects
...
This greatly reduce the amount of code required for wrappers around
Vulkan Objects
Former-commit-id: 885d0b39197ba41fd856c45571dbf06d8ae27d8c
2016-05-14 14:46:15 +02:00
ef66c09719
Merge branch 'master' into vulkan
...
Former-commit-id: 5e11ffb71a4deddeaa44a1b1e93aeea97525bd9c
2016-05-14 13:58:06 +02:00
a1644edf45
Merge branch 'NDK-ShadowMapping'
...
Former-commit-id: e77949168073f06d52d10785afb41bad2f7f86c0
2016-05-13 13:06:23 +02:00
9f6a311c07
Core/Color: Add IsOpaque method
...
Former-commit-id: 4e9dd99525a550af90a1de1a8c86e3120e33a5de
2016-05-13 12:47:53 +02:00
0bd8904878
Utility/*TextDrawer: Fix bounds starting at a negative position
...
Former-commit-id: 4954d0f3d1b10d4b7512c7b57936bc73c7ea69ae
2016-05-11 12:27:18 +02:00
f941a751b5
Core: Update global include
...
Former-commit-id: 40702153f3a811a8d01155094257c0a7e1d34918
2016-05-09 18:11:11 +02:00
e8a4be2039
Core/ObjectHandle: Fix movement
...
Former-commit-id: 8fd32af2b58e8f0d2146232c23a8405e3e012349
2016-05-09 18:10:58 +02:00
34bc2301a0
Core/Bitset: Fix infinite loop
...
Former-commit-id: 366ad4248a72e3e06637163b44a9a5cedbbaf195
2016-05-09 18:10:46 +02:00
7db8507874
Core/ObjectHandle: Add noexcept move constructor/assignment
...
Former-commit-id: 930de41518be74fff072e061f735afceb218138c
2016-05-09 09:03:11 +02:00
cc5d719a64
Vulkan/Device: Make Device a handled object
...
Former-commit-id: c21479718e2de1ade137635a2f7ac40ef6f060cd
2016-05-06 20:29:45 +02:00
e34c94343f
Core/Bitset: Fix value constructor
...
Former-commit-id: 44cfe386a985a4b449527a9fab3d5da49e30117c
2016-05-06 19:15:15 +02:00
f7b0496d62
UnitTests: Fix errors
...
Former-commit-id: 7d338bd57e8a083e63c5f6387ff37c81109903ed
2016-05-05 21:27:36 +02:00
9e3b99bb5a
Make mesh able to carry material informations
...
- Move OBJ Loader to Utility module, where it belongs
- Change Mesh material informations from a path to a parameterlist
- Improve Mesh code
Former-commit-id: 3c18901133fa5ac8281269822f6e2650ddcefd2d
2016-04-30 18:44:33 +02:00
6d824109f3
Core/ParameterList: Add support for color values and updated documentation
...
Former-commit-id: 4cd9faf2fe035b946afa1ba15243bdcf3255716a
2016-04-30 12:44:34 +02:00
8a8731f330
Vulkan: Add support for semaphores
...
Former-commit-id: 429c5b61dd3a8c9666e2cf0d94f17d353e4e59f0
2016-04-30 11:44:02 +02:00
d87b0587d7
Vulkan: Add support for Swapchains
...
Former-commit-id: 7eafa8f4d38fb3202c63bc42d5d5bb4febfd459a
2016-04-30 11:43:48 +02:00
cc9d2c6ab2
Vulkan/Device: Add proper support for all device functions and extensions
...
At least I hope that's all
Former-commit-id: acf25110dc4598f0bb59737d09521570ca39e4ef
2016-04-30 11:43:35 +02:00
0b725e1090
Vulkan/Surface: Add implicit conversion to VkSurfaceKHR
...
Former-commit-id: 83bd6ba118a3d5c3c2ea136b6cc0a0011d1d4c3d
2016-04-30 11:42:24 +02:00
3bcde868ef
Vulkan/Instance: Fix possible crash when not using layers or extensions
...
Former-commit-id: a429d0f1032f1a39ee50075b366d83cf4cba0823
2016-04-30 11:41:36 +02:00
72e849fa85
Vulkan/Surface: Move all of .cpp code to .inl
...
There's no point to have .cpp file of this class and others (swapchain,
fence, semaphore, etc.)
Former-commit-id: 82472312ac31bbe60683cf7e3c4b8f40bb5cd984
2016-04-29 23:20:44 +02:00
5bd08501e9
Vulkan/Surface: Add missing implementation
...
Former-commit-id: ca6008f2c717aee8cea80805f9f5f0c6ed950c32
2016-04-29 22:46:43 +02:00
3d09177795
Vulkan/Device: Add useful accessors
...
Former-commit-id: b2b6378b2b9a8de2ad1c47b72f2acd6dd86a087a
2016-04-29 22:46:25 +02:00
da3682149c
Vulkan: Move device-level extension to Vk::Device
...
Former-commit-id: a73c8cd9744517baea7a5fbd440ccb4d90e9bfc7
2016-04-29 22:45:54 +02:00
1742fa9457
Merge branch 'master' into vulkan
...
Former-commit-id: fd9f2f119e959847d4d9eabece7b678243b26bde
2016-04-29 20:12:27 +02:00
019c1f4a36
Core/File: Add SetSize method (currently missing Posix implementation!)
...
Former-commit-id: c9ffb545485d90940d620e94fd25a7256d62ab58
2016-04-29 14:20:22 +02:00
a3cc866bbd
Vulkan: Add support for surfaces
...
Former-commit-id: c4599c430add1bc54e9665d5bb0e0ca5071bcf41
2016-04-28 20:37:41 +02:00
e1d424e5f9
Vulkan: Add support for extensions
...
Former-commit-id: ab5742edc79815dd75473bf467c7b1dd46e2fecb
2016-04-28 20:37:30 +02:00
78469266fd
Core/File: Add OpenMode_MustExit
...
Former-commit-id: 1df10e230d3c6ef71244060845b1fc02f7b5a8e9
2016-04-27 18:10:45 +02:00
8700b21a96
Lua/LuaInstance: Add missing include
...
Former-commit-id: b2156b2c9cf515900c0e37f379104ffc6767a7e7
2016-04-25 18:33:28 +02:00
24a8fcee01
Optimize Lua binding
...
Optimize binding by removing a useless extra indirection and allowing to
move replying variables
Former-commit-id: 76728df1c3ab9a38a4304ae2b9f2fc6a000e0ebb
2016-04-24 19:54:46 +02:00
6d66063b2c
Core/MemoryHelper: Improve PlacementNew interface
...
Make it possible to deduce type from arguments
Former-commit-id: ed25b667fcacefcc39fddcb941ea11c40e6ce22b
2016-04-24 19:48:12 +02:00
da401af52c
Vulkan/VkLoader: Add EnumerateInstance[Extension|Layer]Properties helper
...
Former-commit-id: a7cfc73816266cef944f7cb3c668be0b86bbfcbf
2016-04-24 04:37:31 +02:00
22a31c72ed
Vulkan: Add loading of Instance/Device
...
Former-commit-id: 0184f78824900bd46cff94dbfe829b126b8c984d
2016-04-24 02:28:26 +02:00
4a948dfaa9
Merge branch 'master' into vulkan
...
Former-commit-id: 8e5cf8f5c93203818a1939df269593f8556019f0
2016-04-23 22:57:14 +02:00
d1e12a6d2e
Sdk/Binding: Bind Font::GetDefault
...
Former-commit-id: 5245ada09cd376dfaf69f06ca982c89dc438fae8
2016-04-23 22:48:14 +02:00
346e9d7081
Sdk/Binding: Fix binding initialization
...
Former-commit-id: e9dde83bcd950bf3a8f3665f88d253ef6e71ffc2
2016-04-23 22:38:47 +02:00
ab8e851f6f
Lua/LuaInstance: Fix pushing some types
...
Former-commit-id: eb74d0d039aa0919c81684b0abd3d2aa2d471cad
2016-04-23 22:19:08 +02:00
7b10bbaab0
Lua/LuaInstance: Rename automatic SetField/SetGlobal to PushField/PushGlobal
...
Former-commit-id: add576baa5ee7c12121925b5b4fb5fc37fe85042
2016-04-23 22:18:43 +02:00
16d1b83edb
Extlibs: Add Vulkan headers
...
Former-commit-id: 09fcbdfd488b2ba203245a1579f6665d2f0f9497
2016-04-21 17:27:16 +02:00
ddf75e852a
Vulkan: Add empty module
...
Former-commit-id: 89e01819b36aeda5bfadac35d8a4190256461eca
2016-04-21 13:38:58 +02:00
226d75a352
Core/Bitset: Add conversion from integer (to mimic internal representation, experimental)
...
Former-commit-id: 609a2bbed02cad13a3487b2a95c6f24c0756e829
2016-04-21 13:23:42 +02:00
de76b48fdd
Utility/Loaders: Fix and enable DDS loader (experimental)
...
Former-commit-id: 647e4527d47bc82b25eb713b8e6ffc4f424ba6c3
2016-04-21 13:23:11 +02:00
718713dbdd
Utility/PixelFormat: Add experimental IdentifyFormat method
...
Only supports RGBA8 for now
Former-commit-id: 8661dc7cab767de5d66efebe5e7038807ba712f7
2016-04-21 13:22:31 +02:00
e5f5d7ed11
Utility/PixelFormat: Add ComputeSize method
...
Former-commit-id: 8d9017541a812c98ba96c694cbd10da895338d1d
2016-04-21 13:21:39 +02:00
d6112c99f4
Renderer/OpenGL: Add loading of glCompressedTexSubImage*D
...
Former-commit-id: 34f19a2c8f640edace81a0f7cd211b06063fe8a3
2016-04-21 13:21:06 +02:00
3caeb91a32
Core/Endianness: Add SwapBytes shortcut
...
Former-commit-id: c345121453f38c9eb8c05e224db91f068440f729
2016-04-21 13:20:46 +02:00
43c1243b75
Fix merge problems
...
Former-commit-id: 899b541adea1719f558c52abfab51458249b6aaf
2016-04-17 20:22:29 +02:00
b3455e88ca
Graphics/DepthRenderTechnique: Add Clear method
...
Former-commit-id: 70e7cb5b59f0407c73766687b6a95e09b7eca589
2016-04-17 19:58:15 +02:00
37aa00b2e7
Merge branch 'master' into NDK-ShadowMapping
...
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
2016-04-17 19:57:15 +02:00
Lynix
Jérôme Leclercq
Gawaboumga