Lynix f10ed46035 Fix merge error ...

Former-commit-id: a608db04b5bf3f90567c87ef7fd709f71633b276 [formerly 74ea59dd0272dec9654a9545f019158a7ed1356c] [formerly a335e611a60e5dbc9331711433760ebe9fea9fc8 [formerly 4b23e4dc222a578292bc57b390438c6affe2145b]]
Former-commit-id: 45c8278e5496526640f9dc380ff9753dda6db0cb [formerly 6b2c2790026867f1870991200ac9bbe546b99a62]
Former-commit-id: 2fb15f949bf0fa1d20c222aeb64fe88a738132d5

2016-10-10 22:15:12 +02:00

..

Formats

Utility/OBJParser: Add Check() method to quickly check if any OBJ token is present at the beginning

2016-09-26 13:16:01 +02:00

AbstractAtlas.hpp

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

AbstractBuffer.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

AbstractImage.hpp

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

AbstractTextDrawer.hpp

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

Algorithm.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Animation.hpp

Utility: First code cleaning pass

2016-09-04 20:39:34 +02:00

Animation.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

Buffer.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Buffer.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

BufferMapper.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

BufferMapper.inl

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Config.hpp

Separate NAZARA_API into multiple defines (one per module)

2015-06-13 22:31:29 +02:00

ConfigCheck.hpp

Disable memory manager for every module

2015-09-28 00:41:24 +02:00

CubemapParams.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Cursor.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Debug.hpp

Updated copyright year

2015-01-21 20:53:01 +01:00

DebugOff.hpp

Updated copyright year

2015-01-21 20:53:01 +01:00

Enums.hpp

Utility: Rework PixelFormat (WIP)

2016-05-17 14:23:45 +02:00

Event.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

EventHandler.hpp

Utility/EventHandler: Add OnEvent signal

2016-08-28 18:02:07 +02:00

EventHandler.inl

Utility/EventHandler: Fix OnMouseButtonReleased event

2016-09-04 14:50:38 +02:00

Font.hpp

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

Font.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

FontData.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

FontGlyph.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

GuillotineImageAtlas.hpp

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

Icon.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Image.hpp

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

Image.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

IndexBuffer.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

IndexBuffer.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

IndexIterator.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

IndexIterator.inl

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

IndexMapper.hpp

Utility/IndexMapper: Makes it work without index buffers (sequential mode)

2016-07-08 08:35:36 +02:00

Joint.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Joystick.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Keyboard.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

MaterialData.hpp

Utility/MaterialData: Remove CustomDefined

2016-08-04 01:12:06 +02:00

Mesh.hpp

Utility: First code cleaning pass

2016-09-04 20:39:34 +02:00

Mesh.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

MeshData.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Mouse.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Node.hpp

Merge branch 'NDK-Refactor' into NDK

2015-09-25 23:16:58 +02:00

PixelFormat.hpp

Utility: Rework PixelFormat (WIP)

2016-05-17 14:23:45 +02:00

PixelFormat.inl

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

Sequence.hpp

Utility: First code cleaning pass

2016-09-04 20:39:34 +02:00

SimpleTextDrawer.hpp

Fix a shitload of warnings in 64 bits mode

2016-06-13 21:09:55 +02:00

SkeletalMesh.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

SkeletalMesh.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

Skeleton.hpp

Utility: First code cleaning pass

2016-09-04 20:39:34 +02:00

Skeleton.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

StaticMesh.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

StaticMesh.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

SubMesh.hpp

Utility: First code cleaning pass

2016-09-04 20:39:34 +02:00

TriangleIterator.hpp

Utility: Allow TriangleIterator and VertexMapper to take constant submesh

2016-07-08 08:36:42 +02:00

Utility.hpp

Utility: Add Parameters and NoWindowSystem option

2016-10-05 00:26:06 +02:00

VertexBuffer.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

VertexBuffer.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

VertexDeclaration.hpp

Improved declarations

2016-08-02 13:31:09 +02:00

VertexDeclaration.inl

Revert "Core/RefCounted: Remove persistent boolean"

2016-08-02 13:20:34 +02:00

VertexMapper.hpp

Utility: Allow TriangleIterator and VertexMapper to take constant submesh

2016-07-08 08:36:42 +02:00

VertexMapper.inl

Utility: First code cleaning pass

2016-09-04 20:39:34 +02:00

VertexStruct.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

VideoMode.hpp

Switch from Nz prefix to namespace Nz

2015-09-25 19:20:05 +02:00

Window.hpp

Utility/Window: Improve visibility of deprecated methods

2016-08-28 01:20:31 +02:00

Window.inl

Fix merge error

2016-10-10 22:15:12 +02:00

WindowHandle.hpp

Switch from Nz prefix to namespace Nz for linux

2015-09-27 15:58:49 +02:00