cc9cii 9716b671f1 Merge branch 'cc9cii' into Feature-1278 ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/nestedcoladapterimp.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/worldspacewidget.cpp

2015-11-07 12:04:09 +11:00

..

cell.cpp

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

cell.hpp

Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget.

2015-04-24 04:00:49 +10:00

editmode.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

editmode.hpp

added edit mode button to scene toolbar

2014-11-11 15:58:22 +01:00

elements.hpp

new element visibility button icons

2014-11-28 09:14:02 +01:00

lighting.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

lighting.hpp

added lighting switching

2014-03-23 15:14:26 +01:00

lightingbright.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

lightingbright.hpp

added bright lighting mode

2014-03-26 18:29:15 +01:00

lightingday.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

lightingday.hpp

added day lighting mode

2014-03-26 17:47:56 +01:00

lightingnight.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

lightingnight.hpp

added night lighting mode

2014-03-26 17:59:42 +01:00

mousestate.cpp

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

mousestate.hpp

Merge branch 'master' into pathgrid-edit

2014-12-09 14:02:26 +11:00

navigation1st.cpp

Fix for issue #2051. Not perfect (can get into a lock in some situations) but usable.

2014-11-12 14:02:08 +11:00

navigation1st.hpp

rolling

2014-02-28 11:58:03 +01:00

navigation.cpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

navigation.hpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

navigationfree.cpp

rolling

2014-02-28 11:58:03 +01:00

navigationfree.hpp

rolling

2014-02-28 11:58:03 +01:00

navigationorbit.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

navigationorbit.hpp

added orbit navigation mode

2014-03-01 14:15:04 +01:00

object.cpp

Fix physics model not being moved since commit ec80884.

2015-06-12 21:38:53 +10:00

object.hpp

Merge branch 'master' into pathgrid-edit

2015-04-18 15:47:45 +10:00

overlaymask.cpp

Support MSVC 2015. Tested(*) with updated dependencies:

2015-08-12 06:50:22 +10:00

overlaymask.hpp

Remove override (c++11)

2014-10-13 16:42:50 +11:00

overlaysystem.cpp

fixed overlay singleton

2014-10-17 14:23:27 +02:00

overlaysystem.hpp

fixed overlay singleton

2014-10-17 14:23:27 +02:00

pagedworldspacewidget.cpp

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

pagedworldspacewidget.hpp

Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget.

2015-04-24 04:00:49 +10:00

pathgridpoint.cpp

Undo rendering works, but not using signals yet.

2015-04-23 22:20:45 +10:00

pathgridpoint.hpp

Resolve merge issues.

2014-12-09 19:37:37 +11:00

previewwidget.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

previewwidget.hpp

fixed some function names

2014-06-27 10:35:00 +02:00

scenewidget.cpp

Multiple document support.

2014-11-01 18:57:39 +11:00

scenewidget.hpp

Add function to cancel drag by pressing ESC. Remove debug code.

2014-11-03 21:24:47 +11:00

terrainstorage.cpp

removed indirection in OpenMW-CS land record

2015-11-01 18:56:07 +11:00

terrainstorage.hpp

made return type of ESMTerrain::Storage::getLand const

2015-11-01 13:40:56 +11:00

textoverlay.cpp

Support MSVC 2015. Tested(*) with updated dependencies:

2015-08-12 06:50:22 +10:00

textoverlay.hpp

Minor visual improvements.

2014-10-14 17:34:10 +11:00

unpagedworldspacewidget.cpp

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

unpagedworldspacewidget.hpp

Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget.

2015-04-24 04:00:49 +10:00

worldspacewidget.cpp

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

worldspacewidget.hpp

Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget.

2015-04-24 04:00:49 +10:00