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 |
|
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 |
|
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
|
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
|
27a73a25e3
|
Saving to document via UndoStack implemented.
|
2015-04-23 08:50:05 +10: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
|
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 |
|
cc9cii
|
a5a76cadca
|
Adding, deleting and moving pathgrid points work. However still not saving to the document.
|
2014-11-09 14:36:58 +11:00 |
|
cc9cii
|
b328aa1fb9
|
Multiple document support.
|
2014-11-01 18:57:39 +11:00 |
|
cc9cii
|
cb53e714f7
|
Convert PhysicsSystem to a singleton.
|
2014-10-24 19:14:02 +10:00 |
|
cc9cii
|
03a30c3f1d
|
Experimental, compiles but does not work.
|
2014-10-18 06:16:48 +11:00 |
|
Marc Zinnschlag
|
717c1b15f5
|
fixed drop implementation for unpaged worldspace (wasn't updating cell object)
|
2014-09-11 13:08:30 +02:00 |
|
Marc Zinnschlag
|
0db288ce07
|
generalising and cleaning up drop implementation of worldspace widget
|
2014-09-11 13:04:20 +02:00 |
|
Marc Zinnschlag
|
5a9376450b
|
some cleanup of the scene view drop code
|
2014-09-11 11:27:56 +02:00 |
|
Marc Zinnschlag
|
51128d2d57
|
added run button to scene subview toolbar
|
2014-09-06 16:11:06 +02:00 |
|
Marc Zinnschlag
|
439ba57d46
|
added visual element selector toolbar button
|
2014-07-31 14:06:04 +02:00 |
|
Marc Zinnschlag
|
a6626b94c8
|
added cell rendering in unpaged worldspaces
|
2014-06-29 14:19:10 +02:00 |
|
Marek Kochanowicz
|
f51f826dad
|
fixed compilation
|
2014-05-04 15:13:03 +02:00 |
|
Marek Kochanowicz
|
5e99381019
|
Drag and drop works.
|
2014-05-03 14:00:30 +02:00 |
|
Marek Kochanowicz
|
ea1aaef8ca
|
replace paged with unpaged (and vice versa)
|
2014-05-01 18:25:28 +02:00 |
|
Marek Kochanowicz
|
d00dbf47d5
|
working on worldspace drops
|
2014-05-01 15:09:47 +02:00 |
|
Marc Zinnschlag
|
205354ba30
|
some ambient light cleanup
|
2014-03-23 13:40:56 +01:00 |
|
Marc Zinnschlag
|
516a3b9abd
|
close interior cell view when cell is deleted
|
2014-03-06 16:40:08 +01:00 |
|
Marc Zinnschlag
|
4a119c8f46
|
ambient lighting in interior cells
|
2014-03-06 13:02:21 +01:00 |
|
Marc Zinnschlag
|
397921e457
|
specialising WorldspaceWdiget into paged and unpaged subclasses
|
2014-03-06 10:13:39 +01:00 |
|