Lynix
|
496cdfd32c
|
Merge branch 'master' into reflection-mapping
|
2017-02-23 00:08:57 +01:00 |
Gawaboumga
|
c2e4ccaf72
|
Various little fixes (#118)
* Add missing override qualifier
* Mostly shadowing, virtual destructor and other little things
|
2017-02-19 23:15:13 +01:00 |
|
Lynix
|
ead54e1c30
|
Merge branch 'master' into reflection-mapping
|
2017-02-18 15:07:17 +01:00 |
|
Lynix
|
dc158d06a8
|
Fix warnings reported by Clang
|
2017-02-17 00:21:28 +01:00 |
|
Lynix
|
7d5d21f025
|
Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping
|
2017-01-21 15:56:37 +01:00 |
|
DrLynix
|
f383eca19a
|
Update copyright year
|
2017-01-20 12:58:35 +01:00 |
|
Lynix
|
6b949afb9b
|
Graphics: Add support of skins to InstancedRenderable + big clean up
|
2017-01-09 01:52:00 +01:00 |
|
Lynix
|
d2ee4744a9
|
Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping
|
2017-01-06 17:29:54 +01:00 |
|
Lynix
|
a00dd39c51
|
Graphics/MaterialPipeline: Fix error when failing to override a shader
|
2016-12-21 18:25:22 +01:00 |
|
Lynix
|
adf5cd32b8
|
Graphics/ForwardRenderTechnique: Remove useless uniform sending
|
2016-12-19 18:45:42 +01:00 |
|
Lynix
|
69296daac0
|
Graphics/SkyboxBackground: Reverse Z axis to match reflections
There's something wrong about skyboxes at the moment.
|
2016-12-19 18:25:19 +01:00 |
|
Lynix
|
37d36a89a6
|
Graphics: Add basic reflection mapping
|
2016-12-18 01:18:48 +01:00 |
|
Lynix
|
459c5e7a09
|
Graphics/Shaders: Add possibility to override Über-shaders at runtime
|
2016-12-18 01:16:26 +01:00 |
|
Lynix
|
682dab32b3
|
Graphics/Shader: Make texture units statics
Provides better performances and prevents the sampler type bug to happen
|
2016-12-18 01:13:46 +01:00 |
|
Lynix
|
5aa0c362a6
|
Graphics/DepthRenderTechnique: Fix SceneAmbient uniform not being sent
|
2016-12-15 23:08:56 +01:00 |
|
Lynix
|
ff5b72b469
|
Graphics/DepthRenderTechnique: No longer require a viewer
Fixes crash
|
2016-12-15 14:37:12 +01:00 |
|
Lynix
|
d62720d610
|
Utility/Buffer: Refactor Buffer classes
|
2016-12-09 08:56:46 +01:00 |
|
Lynix
|
fd196cf0ae
|
Graphics/TextSprite: Fix undefined behavior
|
2016-12-03 00:36:24 +01:00 |
|
Lynix
|
e6e4a437bd
|
Merge remote-tracking branch 'refs/remotes/origin/master' into gui
|
2016-11-30 13:08:08 +01:00 |
|
Lynix
|
3c5594c206
|
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
|
2016-11-28 17:27:12 +01:00 |
|
Lynix
|
3ae5bfad63
|
Graphics/TextSprite: Fix scale not affecting bounding volume
|
2016-11-24 09:40:04 +01:00 |
|
Lynix
|
8d86306933
|
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
|
2016-11-23 14:07:52 +01:00 |
|
Lynix
|
cd0e9d97b8
|
Graphics/Sprite: Add SetMaterial and SetTexture overloads for searching a resource name
|
2016-11-17 18:24:36 +01:00 |
|
Lynix
|
7f445def13
|
Fix some warnings from MSVC
|
2016-11-10 16:44:29 +01:00 |
|
Jérôme Leclercq
|
9e84c397ba
|
Merge branch 'master' into culling
|
2016-11-07 11:26:48 +01:00 |
|
Jérôme Leclercq
|
e087129d4a
|
Fix many errors and warnings found out by MinGW
|
2016-11-04 18:14:52 +01:00 |
|
Lynix
|
736b31af1b
|
Utility/SimpleTextDrawer: Whitespaces are now glyphs too
|
2016-10-28 17:44:59 +02:00 |
|
Lynix
|
725dc6cdbc
|
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
|
2016-10-19 11:17:12 +02:00 |
|
Lynix
|
4c6f049e0d
|
Fix another lot of warnings from Clang
Closes #90
Closes #91
Closes #92
Closes #93
|
2016-10-17 16:01:05 +02:00 |
|
Lynix
|
7e594a861f
|
Graphics: Fix EnableInstancing(bool) having no impact
|
2016-10-17 14:47:15 +02:00 |
|
Lynix
|
5a07bbd001
|
Fix a lot of warnings from Clang/GCC
|
2016-10-17 14:46:53 +02:00 |
|
Lynix
|
4ba744c1bc
|
Fix merge fails
|
2016-10-12 17:29:08 +02:00 |
|
Lynix
|
561c0cf51f
|
Merge remote-tracking branch 'refs/remotes/origin/master' into culling
|
2016-10-12 16:51:18 +02:00 |
|
Lynix
|
e9deac3802
|
Graphics/ParticleStruct: Add size member to ParticleStruct_Billboard
Former-commit-id: c8578baad436d18d609d4cc7cf1d773ba01b8616 [formerly fff8b8fce1a6b0a5330dc983e46676d9de6bc810] [formerly 9d584febdb50e4680d4beb24c5fb65371b838ffa [formerly cdbfc358e3c66ade396353c5d996c6d5c7fba313]]
Former-commit-id: 54ab0d22f7e947a2ee01fa9f36bd0e81af40e91d [formerly fc75d5fcd8351f4c9bccfd4c3a57131365d52ea4]
Former-commit-id: 79f3c8b08ad0089988e59139baaf87bf2aa5460b
|
2016-09-26 13:19:30 +02:00 |
|
Lynix
|
e5218301b5
|
Graphics/TileMap: Add support for isometric tilemaps
Former-commit-id: f89318c22ae2dcdab159f46dcfcbdb778af00ae6 [formerly 9912b85867bbb46cd785af9f3fe3a1dc72180149] [formerly a82344e574762f14805ea6c831a0a314cfe36a20 [formerly c234ec3cebd016381a38cd13f7d411511ae98164]]
Former-commit-id: d170f0897b77bf29f984a8ddf9e5b193d63a5e60 [formerly 54a8819656b3c626c1485dbf5ccc8f015ad005f4]
Former-commit-id: 0b0bf65c250219c29b27067b315a3735d8fbbd70
|
2016-09-19 13:07:55 +02:00 |
|
Lynix
|
8ec377e72f
|
Culling: Fix some issues
Former-commit-id: cc91c0e8a7f0651743439ce8ac19efacae1aed69 [formerly d7463103fce8210ea8e495a627e5d84e3e4d430b] [formerly 274c2b2c16df1784823027f3f50c6d7024640eee [formerly d5baf025e09e3ef48f5c1db64a07775c75594a8a]]
Former-commit-id: 15230bf754acd065e6db4ba8dd79d37f43ba8a02 [formerly 81b85f2234f378de5eed976d4924ce8ccb08296f]
Former-commit-id: 3cdd9b2416ada3c6ae9bc8bdc527da83c46e0459
|
2016-09-16 00:40:01 +02:00 |
|
Lynix
|
7c3d9c563c
|
Graphics/Sprite: Allows to set sprite corner color
Former-commit-id: 0b892e363a4fbb18c729d289f543403d897b03c0 [formerly 28fcd5a7269c63b1f8c4c8c80c82e5dce9e17d1b] [formerly f8022fe7d864a6c1773c4e19843d7fc46590d328 [formerly 33fbfb6cd1700a3e05bc82875546cd57cfe6f6aa]]
Former-commit-id: 3ef8f144f07c0cf7666b59cdcc135fc74348caf9 [formerly 8bae7631b9aaf2565ec52d68f9c0c1a7a81dc69f]
Former-commit-id: 6eba237772ab4773180e3a86e9fe4f9b6b8e348d
|
2016-09-07 13:04:58 +02:00 |
|
Lynix
|
614c1556ef
|
Graphics/Sprite: Allows to set sprite corner color
Former-commit-id: 66ca16acbb25da23a8a85b77d1bd4c4ca412e82f [formerly d4f67e512d1e7edd31c049045cc9069a8926d794] [formerly 7b9ca802280f114492d4e1aaa068c241802f3c25 [formerly 068f737047936c99b79057674bd453a54fe44960]]
Former-commit-id: e92d6bb1bd4668a2f94f0311f887f38c00544277 [formerly da0e5d605a0b9197a767e48d8a5dbd94dd83872b]
Former-commit-id: a4ce87c4974513dbe3890ac3f316ed14b74919eb
|
2016-09-07 13:04:58 +02:00 |
|
Lynix
|
560825fa8e
|
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 81dfaea9fd265b8a2610fda2a155cef4a73695b3 [formerly 4ca561497c773dd88058e448f1e1901ce558eb0b] [formerly 5ae1e8f8d0bd13c6ee275b655ec82e66435ae5b1 [formerly 2ea9e9744d6877a1192e6cb844e3172ae8db7218]]
Former-commit-id: d8944c28fa76195f7fdbd682b0d6113d0ae3c487 [formerly a81b6d5a73db2fbe5b0428cb7a8bc3388432c06c]
Former-commit-id: 50f7995003fd968d85a0f3f020313c7d6d9f5d68
|
2016-09-04 20:02:34 +02:00 |
|
Lynix
|
82f39221f7
|
Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: d40335a1d84793068db6d9ea7291e4053d00b349 [formerly 60aa10a46378c238c40f700bfd6c6e5585558da2] [formerly 0133433740741edc53e2070b8c2fdf5a4b831361 [formerly deb7b7432d4e327e8f9438814eafaa25dd3d9a51]]
Former-commit-id: f1eea3bf4fe3d0024217f5e9b38046cf2517b0cc [formerly 6a21f03e56a7d5c8d4aa9855f2aa50e9e7b30ae3]
Former-commit-id: 124f40eb3bbd24740ca15338a99153bab98846a4
|
2016-09-04 20:02:34 +02:00 |
|
Lynix
|
ba6c562367
|
Sdk/GraphicsComponent: Allows to setup an offset to renderables
Former-commit-id: a5e9ceb3f30e79a0d3b96b6866a06441cbc0b463 [formerly 8af071cedec0a6aca00ff9c12d66e8a0817049c6] [formerly cd7e7040fd68dd5a74a0b458a3a305c251257b51 [formerly 0f9382c169a260d5fa34fe9b1ab64c3d19dbd385]]
Former-commit-id: 774af2326cb64824f85835c83464bc19884005e1 [formerly 4b676844f6dd56940b4f503c6a943905ea8a54c3]
Former-commit-id: 0673e4d4cd88c99d24e0e153a61d2726e2e2c039
|
2016-09-04 20:02:23 +02:00 |
|
Lynix
|
f2aa4e0e19
|
Sdk/GraphicsComponent: Allows to setup an offset to renderables
Former-commit-id: fd1f70010f950dd4a4194e049ddff317c0d8b4b9 [formerly 8fee96f11b7bef08351110bef74643fa0be8b17d] [formerly ec5d6ad819cf325dac0ae61d983003cf99c78aac [formerly 2610a17ba67d61080254ce4bc3e9176e315dfbe5]]
Former-commit-id: 7683be7fa9a565dc3fb59be401ecff5580a6de15 [formerly 80ac7628f5119f58cf4518b5b1a44aff5b6d6b20]
Former-commit-id: d1604af612715688e7b1fc451d8561f79e100541
|
2016-09-04 20:02:23 +02:00 |
|
Lynix
|
a311ff4cf1
|
Graphics/DeferredRenderQueue: Fix crash on layer removal
Former-commit-id: 87fdfb051158d241754eb6f1f811d12e88811a47 [formerly c5ae03d7168851330dd2c087c515c7d30ad863c7] [formerly 0f5debff94e6a37dde830975fd219daf82382d9d [formerly 42297b9b5af5b42e4c12146d930b6641425de8f4]]
Former-commit-id: b93ecd34f72724806ea06c6d335a41c7dd1afacb [formerly ad14d199f3ee381221df118b4af2cd647ab8fc24]
Former-commit-id: 805f20df11668bf73d35065e23c4912800850427
|
2016-09-03 21:13:00 +02:00 |
|
Lynix
|
88615eae85
|
Graphics/DeferredRenderQueue: Fix crash on layer removal
Former-commit-id: 42859917e1603acb297e0dec88d91ea673698bc7 [formerly 416ca6e56e3d19c57bbd22df7c0ee760bdc85449] [formerly b405620cd6b4ebe4413d13abd1082d68eb9d7203 [formerly 38b249271c7366e767111de1bb98bb63e0b86e93]]
Former-commit-id: fb61d2d9bb16752c0e2ea9fbba3d8e61a138039d [formerly 5ef5905f3c64859d87425b76342acd6cc562ce5d]
Former-commit-id: 36ab2a4d8a66737af06634dc2f79da1f9d6b5662
|
2016-09-03 21:13:00 +02:00 |
|
Lynix
|
7781a27641
|
Graphics: Clear instances in Clear method
Former-commit-id: 66b0db92e353312b6cf3d68526417b5fb77c0bef [formerly 897579017072102b658dc637b91bc52d80a061cd] [formerly 7685fb2c3c18c030ce5a3ac6a29129bd39de88c8 [formerly 7ba2bc156951247f5f7ba7ebfb3d65bced1731e7]]
Former-commit-id: a1eb128bba2d28589a7988f6f98a860839c07cfe [formerly 1fed3d7b8cbc84c528ce27db61123ce8fc562e97]
Former-commit-id: cc56728a6e0a6b84c4969850287109c8e92281cd
|
2016-09-01 13:02:46 +02:00 |
|
Lynix
|
32aeb96378
|
Graphics: Clear instances in Clear method
Former-commit-id: 8f116c954577de1e231efe5d0c6c34458e7c195c [formerly 0b07a41900b0cad6305956370a045dd1539e5634] [formerly 4eb1b81cf3b3e2badcf61032988f61ffe511a001 [formerly f016c785f246cead41c81130d04ffb2dfe61e42d]]
Former-commit-id: 4f7fd53326b8b60c91d4e4edf53451561c7da7ad [formerly c80c94219ed09321ff35472cc9209e383f14cb59]
Former-commit-id: 8e2ec06ccf7bee67a47ad73dce1132c33cc91a5e
|
2016-09-01 13:02:46 +02:00 |
|
Lynix
|
3755fc2487
|
Graphics/Sprite: Add Origin parameter
Allows you to change center of translation/rotation/scale
Former-commit-id: c5e8b3cf4b67e8a2765a4f0984d08bda3d1dc0ec [formerly 20f58bfa832c85f4837f325c3d74b0eef264b2bf] [formerly 830cae0d17c4cef7b538734d6cfe83539689dab3 [formerly 4dc889bfa34a04c59844969bb0d6b08599c1189a]]
Former-commit-id: 949b6b78762b7b804e357ee5b3afe35456fd7f2d [formerly 92beb7207e1271941f4053255091d32806a19e9b]
Former-commit-id: 5b1d9b37251f0bc3be87aef0ef0c3252ff82b4d0
|
2016-08-31 20:53:27 +02:00 |
|
Lynix
|
5d13fa664b
|
Graphics/Sprite: Add Origin parameter
Allows you to change center of translation/rotation/scale
Former-commit-id: 6045c6f78ec81db54629883927a203e8c50bb561 [formerly 8ab1e1e5785a9be67b76364f62fe4b767dca341f] [formerly f17a5c8c4d5e5cef8dd4ee76734609a6651384e7 [formerly 4a932134b130d64deb88f018332f5414b1370435]]
Former-commit-id: 8311f12a2e6a28bec5e22f5ca5ce7d3f551d52ba [formerly 412800a9b5afb15fb21f2428e2e9b3b9eb34c0ab]
Former-commit-id: 80d03c5581adbe47ccbe33649787a5698774cdd3
|
2016-08-31 20:53:27 +02:00 |
|
Lynix
|
1f2719fd17
|
Revert "Core/HardwareInfo: Fix indentation (Windows)"
This reverts commit a4019076ff9afd3cb7e2d98a54c9788fd2df1457 [formerly 3a39cd2e8a3aa8bb46f9f1465923f2abb8fc19a1] [formerly a23f6beee25e408579609874672806b124bf5fc0 [formerly be4cec088d5683bc18e54fd5daa2805134a88bb9]] [formerly dd94bfecaf16a96cdc39de9abd3c0749f17bf824 [formerly 539605da0eb694cbad2fb52fdb49b9a79c3a0d04] [formerly 00917e0bb4766a6f19f303040241c81a92778185 [formerly 48c4b5219e3d1f74f04099f164712c2baddf1d4b]]].
Former-commit-id: 153fd6ac243aee3971fda0a4a2ec9bed51a4ecbf [formerly 83b196ee86d8689cd331b8ac1e9256fc4158f4bb] [formerly 76dceaeb34c1e3156537ebaa3ba0a73950b03805 [formerly 10f813a3f75ef706c37c3e312ccc58a556b5e1f5]]
Former-commit-id: 9e2e56623d1f2b95f013ee0f565a5ffdf0f450b9 [formerly 1e58bd22e6b1070954227f669d92794ce56581a6]
Former-commit-id: c5ccf208507c40c8939ce9a92c8f4def6e231b79
|
2016-08-31 19:16:03 +02:00 |
|
Lynix
|
486d4fc015
|
Revert "Core/HardwareInfo: Fix indentation (Windows)"
This reverts commit a4019076ff9afd3cb7e2d98a54c9788fd2df1457 [formerly 3a39cd2e8a3aa8bb46f9f1465923f2abb8fc19a1] [formerly a23f6beee25e408579609874672806b124bf5fc0 [formerly be4cec088d5683bc18e54fd5daa2805134a88bb9]] [formerly dd94bfecaf16a96cdc39de9abd3c0749f17bf824 [formerly 539605da0eb694cbad2fb52fdb49b9a79c3a0d04] [formerly 00917e0bb4766a6f19f303040241c81a92778185 [formerly 48c4b5219e3d1f74f04099f164712c2baddf1d4b]]].
Former-commit-id: 8c12c9823e95088e92a5fbcb77b7b4feb175d3d9 [formerly 137a3a93c7be0cbcc8b82939c0ba5f3844fa1e24] [formerly a76f30044d61a5e815ed2b1d0ebbcd05feaad994 [formerly 71b63053a8db0e880844044f849f1029c70a6b25]]
Former-commit-id: 596d78e1e8fd79e5dc8aa3fbb514c1d6444ce978 [formerly e5089919c76e32c64bda7a1186550a65a6b6d8b3]
Former-commit-id: bca999978415a972625367d087320cc016f4774b
|
2016-08-31 19:16:03 +02:00 |