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
cc9cii
f7598a67f4
Merge branch 'pathgrid-edit' into Feature-1278
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
2015-11-07 11:56:34 +11:00
Marc Zinnschlag
ce34daa64b
removed indirection in OpenMW-CS land record
...
(cherry picked from commit 85f6bb892b
2015-11-01 18:56:07 +11:00
Marc Zinnschlag
44020df65f
made return type of ESMTerrain::Storage::getLand const
...
(cherry picked from commit febf611c82
2015-11-01 13:40:56 +11:00
scrawl
402f1ff5d8
Fix the ESM::LandTexture NAME being discarded on loading
2015-09-08 06:42:45 +10:00
scrawl
f8f66bffb0
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-09-08 06:40:06 +10:00
cc9cii
b920e1bde7
Support MSVC 2015. Tested(*) with updated dependencies:
...
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763
(*) only tested compilation and startup of the each app
2015-08-12 06:50:22 +10:00
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
2015-06-12 15:13:42 +02:00
cc9cii
610e659121
Fix physics model not being moved since commit ec80884.
2015-06-12 21:38:53 +10:00
cc9cii
a02448f0ba
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
2015-05-31 11:12:39 +10:00
cc9cii
193873b829
Feature #1278 : Editor: Mouse picking in worldspace widget
...
- With the move to OSG (see: https://forum.openmw.org/viewtopic.php?f=7&t=2755&p=31850#p31839 ) all the work done so far will soon be removed from the master branch.
- The pathgrid editing and integration to the model, as well as other improvements made, are unlikely to be accepted to the master.
- These will be maintained here until they can be ported to OSG. It is easier to port when there is a working code base, anyway.
2015-05-31 10:28:45 +10:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
Marc Zinnschlag
048d7be87c
Adjusted terminology for references/referenceables in OpenMW-CS user-interface ( Fixes #2516 )
2015-05-03 16:35:10 +02:00
cc9cii
3102a17522
Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget.
2015-04-24 04:00:49 +10:00
cc9cii
e7bd298739
Undo now working via signals.
2015-04-24 01:28:49 +10:00
cc9cii
1a31aecc2f
Undo rendering works, but not using signals yet.
2015-04-23 22:20:45 +10:00
cc9cii
27a73a25e3
Saving to document via UndoStack implemented.
2015-04-23 08:50:05 +10:00
cc9cii
68dbf929a2
Add updated pathgrid marker nif file and fix merge issues.
2015-04-18 16:14:25 +10:00
cc9cii
03578129c7
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
2015-04-18 15:47:45 +10:00
Marc Zinnschlag
a9a8b5ad47
improved performance of CSVRender::Cell::addObjects by bypassing Qt model
2015-03-31 14:25:27 +02:00
cc9cii
17e6244bd6
Yet more warnings suppressed.
2015-03-14 12:42:46 +11:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
scrawl
f6509fe53e
Another crash fix for land record without data
2015-03-02 22:23:00 +01:00
cc9cii
7f7c3d57bd
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/cell.hpp
2015-02-16 16:46:52 +11:00
Alexander "Ace" Olofsson
62acb03735
More Ogre + recent Boost build fixes
2015-01-27 21:07:26 +01:00
Marc Zinnschlag
c55e9b9c58
one more potential 0-pointer fix
2015-01-15 15:00:16 +01:00
Marc Zinnschlag
7b8e6f9dda
addressed potential 0-pointer issue
2015-01-15 12:04:23 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
cc9cii
4c3c674223
Resolve merge issues.
2014-12-09 19:37:37 +11:00
cc9cii
84f0ddd51c
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/object.cpp
apps/opencs/view/render/object.hpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/unpagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
2014-12-09 14:02:26 +11:00
Marc Zinnschlag
f771b95a15
Merge remote-tracking branch 'cc9cii/master'
2014-12-04 20:04:19 +01:00
Marc Zinnschlag
406cf2b981
disable element visibility buttons that do not apply to the respective cell type
2014-12-02 11:17:39 +01:00
cc9cii
3b5cd286f6
Do not destroy overlay if it was never created (e.g. due to an Ogre exception).
2014-12-01 14:09:22 +11:00
cc9cii
44b11163d1
Do not delete physics objects if it was never created (e.g. preview window)
2014-12-01 10:07:02 +11:00
cc9cii
2d229c70cb
Another missed null shared_ptr conversion for gcc.
2014-12-01 09:41:03 +11:00
cc9cii
9fb4b1f499
Initialise null shared_ptr
2014-12-01 08:15:17 +11:00
cc9cii
2720e5ea9d
Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application.
2014-12-01 06:44:12 +11:00
Marc Zinnschlag
e177b66c1d
moved fog button from unpaged worldspace to worldspace
2014-11-28 09:16:39 +01:00
Marc Zinnschlag
e04ead2bd5
new element visibility button icons
2014-11-28 09:14:02 +01:00
Marc Zinnschlag
50a489321f
updated run button
2014-11-27 09:27:29 +01:00
cc9cii
9703fd95ac
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
2014-11-14 18:03:53 +11:00
Marc Zinnschlag
5eb9fd81e1
use placeholder icons in OpenCS when no proper icon is available
2014-11-13 12:09:10 +01:00
Marc Zinnschlag
a60e4c036f
Merge branch 'mode'
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
2014-11-13 11:12:20 +01:00
Marc Zinnschlag
b7f8f848a8
added edit modes for exteriors
2014-11-13 10:45:59 +01:00
cc9cii
0a66877cf1
Remove no longer needed code.
2014-11-13 07:47:32 +11:00
cc9cii
ba1a42ec05
Don't delete physics object if it was never created.
2014-11-13 07:41:31 +11:00
cc9cii
0e0ad97a91
Pathgrid edge resource management for editing multiple cells or multiple documents.
2014-11-13 06:36:47 +11:00
cc9cii
e430dcfd8a
Check the resource group's existence before destroying it.
2014-11-13 05:59:04 +11:00
cc9cii
12511778d1
Remove duplicate parameter.
2014-11-12 22:43:22 +11:00
cc9cii
8c6890c682
Move element filtering back out of castRay().
2014-11-12 22:28:41 +11:00
