Marek Kochanowicz
|
6416ae90d2
|
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
|
2014-03-19 10:23:15 +01:00 |
|
Marc Zinnschlag
|
c36dfef972
|
prewview subview
|
2014-03-16 12:44:01 +01:00 |
|
Marek Kochanowicz
|
2e6b45dafb
|
edit view, savind works
|
2014-03-07 22:17:40 +01:00 |
|
Marek Kochanowicz
|
020e3f8fc5
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3
|
2014-03-07 17:16:38 +01:00 |
|
Marek Kochanowicz
|
f0a45fa15f
|
just saved progress
|
2014-03-07 17:15:43 +01:00 |
|
Marc Zinnschlag
|
397921e457
|
specialising WorldspaceWdiget into paged and unpaged subclasses
|
2014-03-06 10:13:39 +01:00 |
|
Marc Zinnschlag
|
a264e86e13
|
subclasses scene widget for worldspace scenes
|
2014-03-04 14:47:43 +01:00 |
|
Marc Zinnschlag
|
536a0e0ab0
|
added orbit navigation mode
|
2014-03-01 14:15:04 +01:00 |
|
Marc Zinnschlag
|
4eea2c7a86
|
added free navigation mode
|
2014-02-27 15:42:59 +01:00 |
|
Marc Zinnschlag
|
c977b2a756
|
moved implementation of the 1st person camera into a separate file
|
2014-02-27 15:23:14 +01:00 |
|
Marc Zinnschlag
|
14c3bfcf62
|
added navigation class
|
2014-02-27 14:46:06 +01:00 |
|
Marc Zinnschlag
|
02c6c65705
|
Merge remote-tracking branch 'sirherrbatka/DragDrop'
|
2014-02-17 09:55:50 +01:00 |
|
Marc Zinnschlag
|
6ac64bbe15
|
Merge branch 'script'
Conflicts:
readme.txt
|
2014-02-16 12:12:56 +01:00 |
|
Marek Kochanowicz
|
97fe5465bf
|
created new files
|
2014-02-15 17:55:18 +01:00 |
|
Marc Zinnschlag
|
e17af4231a
|
added script verifier
|
2014-02-14 13:38:30 +01:00 |
|
Marek Kochanowicz
|
c142089bfe
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
|
2014-02-12 13:13:32 +01:00 |
|
Marek Kochanowicz
|
423b2906be
|
Yes, you can drag. But not drop.
|
2014-02-04 11:40:48 +01:00 |
|
Marc Zinnschlag
|
bf1a37dc38
|
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
|
2014-01-15 14:29:54 +01:00 |
|
Scott Howard
|
2f082ef796
|
remove unneeded libraries
|
2013-12-29 16:25:49 -05:00 |
|
Marek Kochanowicz
|
8085fcc792
|
Added Referencable checks class, added method to get refidcontainer, added method to get mBooks.
Currently only books are checked, and only if name is present.
|
2013-12-20 20:02:42 +01:00 |
|
Marc Zinnschlag
|
04b1657d98
|
Merge branch 'openmw-27'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
|
2013-11-30 09:45:41 +01:00 |
|
Nikolay Kasyanov
|
dafe80874a
|
Added empty line
|
2013-11-10 22:24:31 +04:00 |
|
Nikolay Kasyanov
|
fa13818360
|
OS X: OpenCS packaging
|
2013-11-10 22:04:13 +04:00 |
|
Nikolay Kasyanov
|
df5b52b45b
|
OpenCS.app icon & bundle properties
|
2013-11-10 20:11:53 +04:00 |
|
Nikolay Kasyanov
|
04edd25add
|
OpenCS as a separate app bundle
|
2013-11-10 19:09:05 +04:00 |
|
Marc Zinnschlag
|
8c4303399f
|
Merge branch 'master' into dialogue
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loadinfo.hpp
|
2013-11-10 13:21:39 +01:00 |
|
Marc Zinnschlag
|
b7bb7d6902
|
Merge remote-tracking branch 'scrawl/master'
Conflicts:
apps/opencs/editor.cpp
|
2013-11-10 11:49:48 +01:00 |
|
Marc Zinnschlag
|
0745a86039
|
added InfoCreator
|
2013-11-08 11:51:59 +01:00 |
|
Bret Curtis
|
5a071b0f81
|
necessary dpkg rules to get opencs building and packaged on dpkg systems
|
2013-11-08 09:08:56 +01:00 |
|
Bret Curtis
|
36efe9605f
|
necessary dpkg rules to get opencs building and packaged on dpkg systems
|
2013-11-07 23:05:45 +01:00 |
|
scrawl
|
e6960d915a
|
Add simple Ogre widget
|
2013-11-02 02:51:38 +01:00 |
|
Marc Zinnschlag
|
15b7d3263c
|
subclass ESM::DialInfo to keep track of parent topic
|
2013-11-01 17:43:45 +01:00 |
|
Marc Zinnschlag
|
ba88c94d58
|
first attempt at an info record collection
|
2013-10-29 13:18:22 +01:00 |
|
graffy76
|
9ce4a04a2d
|
merge from saving
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
|
2013-10-25 14:44:22 -05:00 |
|
graffy76
|
16d87ea1d1
|
Merge branch 'master' into esxSelector
|
2013-10-25 08:11:24 -05:00 |
|
graffy76
|
f9591ddda6
|
Reimplemented constentselector view class
|
2013-10-22 21:52:35 -05:00 |
|
Marc Zinnschlag
|
c995533e07
|
Merge branch 'dialogue' into saving
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
|
2013-10-21 16:45:43 +02:00 |
|
Marc Zinnschlag
|
0be157efea
|
set dialogue type for newly created dialogue records
|
2013-10-21 13:39:13 +02:00 |
|
graffy76
|
00c78a4aa1
|
Implementing ContentSelector class in DataFilesPage
Moved AdjusterWidget / FileWidget to ContentSelectorView
|
2013-10-01 21:29:45 -05:00 |
|
Marc Zinnschlag
|
0c5f07a65a
|
added SceneToolMode class
|
2013-09-28 11:27:24 +02:00 |
|
Marc Zinnschlag
|
84cadc10f4
|
added scene toolbar buttons (still not doing anything)
|
2013-09-28 11:06:56 +02:00 |
|
Marc Zinnschlag
|
9ea092927f
|
added basic scene subview (no functionality yet)
|
2013-09-28 09:25:54 +02:00 |
|
Marc Zinnschlag
|
d4b2a6b9f1
|
Merge remote-tracking branch 'graffy76/esxSelector' into saving
|
2013-09-23 10:09:43 +02:00 |
|
Marc Zinnschlag
|
1c4a4b4f26
|
generalised RefIdTypeDelegate into IdTypeDelegate
|
2013-09-22 13:39:44 +02:00 |
|
Marc Zinnschlag
|
3d2281fe80
|
added signals and functions to Data for handling ID list changes
|
2013-09-19 12:11:27 +02:00 |
|
Marc Zinnschlag
|
8326ac9b6f
|
replaced dummy save implementation with a threaded dummy save implementation
|
2013-09-15 12:53:59 +02:00 |
|
Marc Zinnschlag
|
b7bffc8a79
|
removed Verifier class (using Operation class without subclassing now)
|
2013-09-14 15:16:31 +02:00 |
|
Marc Zinnschlag
|
077a157841
|
moved Operation and Stage from model/tools to model/doc
|
2013-09-14 14:56:23 +02:00 |
|
Marc Zinnschlag
|
e9f14449eb
|
added AdjusterWidget
|
2013-09-10 16:45:01 +02:00 |
|
Marc Zinnschlag
|
25b7cd33ea
|
added FileWidget; fixed OpenCS configuration
|
2013-09-08 14:31:20 +02:00 |
|