cc9cii
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
2015-03-16 10:30:54 +11:00
Marc Zinnschlag
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
2015-03-14 12:00:24 +01:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
cc9cii
727b68dd15
Reduce difference with the master branch where possible.
2015-03-06 19:20:50 +11:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
Marc Zinnschlag
0b70fdac57
added start script verifier
2015-03-05 11:24:01 +01:00
cc9cii
fb2ba7610c
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
2015-03-04 11:22:42 +11:00
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
2015-02-15 09:52:13 +01:00
Kamil Bar
e1314d6211
Implement OpenCS reference validation (Feature #831 )
2015-02-13 04:45:18 +01:00
slothlife
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
2015-02-11 21:46:00 -06:00
Nikolay Kasyanov
5534306eb3
Few rename fixes
2015-02-06 08:59:00 +02:00
scrawl
0b7b627443
CMake fix for opencs rename
2015-02-03 13:57:40 +01:00
Marc Zinnschlag
0557d45bd1
renamed opencs into openmw-cs
2015-02-03 13:18:03 +01:00
Marc Zinnschlag
3a847732b4
abstracted message collection into a class
2014-12-07 18:57:47 +01:00
Marc Zinnschlag
7c59ea6296
added specialised report table
2014-12-06 13:01:55 +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
e04ead2bd5
new element visibility button icons
2014-11-28 09:14:02 +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
2acf446f18
added edit mode button to scene toolbar
2014-11-11 15:58:22 +01:00
Marc Zinnschlag
4dd645559d
added ModeButton specialisation of PushButton for use in SceneToolMode
2014-11-06 13:26:19 +01:00
cc9cii
8b4651f055
Move mouse related functions and states out of WorldspaceWidget.
2014-11-02 08:22:27 +11:00
cc9cii
b328aa1fb9
Multiple document support.
2014-11-01 18:57:39 +11:00
cc9cii
03a30c3f1d
Experimental, compiles but does not work.
2014-10-18 06:16:48 +11:00
cc9cii
094f046087
Convert OverlaySystem to a OpenCS style singleton.
2014-10-16 07:29:46 +11:00
cc9cii
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-10-13 20:45:30 +11:00
cc9cii
e58e5c2bf5
Update overlays independently from multiple viewports.
2014-10-13 15:57:01 +11:00
scrawl
9323f96211
Move terrainstorage to opencs_units_noqt
2014-10-12 17:18:27 +02:00
cc9cii
809b8c6d5b
Conflicts:
...
apps/opencs/view/render/pagedworldspacewidget.cpp
2014-10-12 05:54:21 +11:00
Marc Zinnschlag
21b16f8425
Merge branch 'tables'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
2014-10-10 16:11:54 +02:00
cc9cii
406135ee96
Merge remote-tracking branch 'upstream/master' into terrain
2014-10-09 23:47:30 +01:00
scrawl
8786fb639f
Implement terrain rendering in OpenCS ( Fixes #1597 )
2014-10-08 17:17:31 +02:00
cc9cii
85d93807c5
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
2014-10-05 19:25:37 +11:00
Marc Zinnschlag
be3b229a5f
fixed pathgrid loading
2014-10-04 15:36:52 +02:00
cc9cii
3aea1bf5f9
CMake changes for using Ogre Overlay.
2014-10-04 05:48:56 +10:00
Marc Zinnschlag
d64127106b
load and save pathgrid records
2014-10-02 12:30:15 +02:00
Marc Zinnschlag
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
51128d2d57
added run button to scene subview toolbar
2014-09-06 16:11:06 +02:00
cc9cii
6d12374ace
Move windows platform specific files into a common directory.
2014-09-05 22:36:33 +10:00
Marc Zinnschlag
cf05d3c69f
added run log
2014-09-05 13:49:34 +02:00
cc9cii
fa0b3eb298
Add an icon to opencs.exe as well
2014-09-05 20:30:50 +10:00
Marc Zinnschlag
a728d6d77a
full implementation of global run menu item (replaces earlier placeholder implementation)
2014-09-04 17:45:43 +02:00
Marc Zinnschlag
1b4ab6e130
added OpenMW runner
2014-09-02 10:21:17 +02:00
Stanislav
bdfb0c8351
Feature #1616 : Body part record verifier
2014-08-26 21:55:31 +06:00
Marc Zinnschlag
fa9c6b19c2
removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on)
2014-08-10 21:03:45 +02:00
Marc Zinnschlag
a54efbcfa0
made FilterCreator redundant by generalising GenericCreator
2014-08-10 18:46:32 +02:00
Marc Zinnschlag
828536e999
generalised the concept of record scope
2014-08-06 09:53:10 +02:00
Marc Zinnschlag
92d322cbd1
added visibility flags
2014-07-31 13:25:30 +02:00
Marc Zinnschlag
71ce78f949
added scene toolbar toggle widget
2014-07-31 13:05:08 +02:00
Marek Kochanowicz
cdac934315
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-07-25 11:13:52 +02:00
Marek Kochanowicz
c4598d6200
added inventory helper (since npc and containers share same way of
...
handling items)
2014-07-21 14:10:04 +02:00
Marc Zinnschlag
a9f9dec923
consider script blacklist in OpenCS verifier
2014-07-21 12:15:21 +02:00
Marek Kochanowicz
87eed066c2
undo works now
2014-07-20 22:39:39 +02:00
Marek Kochanowicz
1ff8abb240
store whole container representing the nested table inside of the
...
command
Static nature of C++ forced me to use templates. Bit frustraiting.
2014-07-18 18:26:22 +02:00
Marek Kochanowicz
4b4a72c3b6
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
2014-07-13 10:52:39 +02:00
Marc Zinnschlag
dd0aa20390
custom push button
2014-07-10 11:03:55 +02:00
Marc Zinnschlag
03f67cd6bd
moved low level widgets from CSVWorld into a separate namespace/directory
2014-07-08 12:39:12 +02:00
Marc Zinnschlag
b2c957a56f
added resources tables
2014-07-05 15:50:47 +02:00
Marc Zinnschlag
1b1f1bade3
injected new class IdTableBase between QAbstractItemModel and IdTable
2014-07-04 13:25:56 +02:00
Marc Zinnschlag
879ab49e9c
added resources manager
2014-07-04 12:46:57 +02:00
Marek Kochanowicz
172f1a1301
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
2014-06-30 20:06:44 +02:00
Marek Kochanowicz
5eac32e3d3
added nestedtable for displaying nested content.
2014-06-30 13:09:10 +02:00
Marc Zinnschlag
74ed9cbb2d
added cell rendering class
2014-06-29 14:18:46 +02:00
Marc Zinnschlag
0c1ad54e68
refactored object rendering into a separate class
2014-06-27 09:12:26 +02:00
Marek Kochanowicz
1fb18873cb
adding proxy model that is ment to be used by the dialoguesubview
2014-06-18 15:35:31 +02:00
Marc Zinnschlag
c23e9e03fd
Merge branch 'refs'
2014-06-11 11:44:43 +02:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
greye
8f9091550e
require boost::locale only on Windows
2014-05-22 15:42:47 +04:00
greye
b728a919a2
write dependency on boost::locale to CMake files
2014-05-20 12:59:58 +04:00
Marc Zinnschlag
6eff5ecaad
Merge branch 'operations' into load
...
Conflicts:
apps/opencs/main.cpp
apps/opencs/model/doc/document.cpp
2014-05-08 13:17:24 +02:00
Marc Zinnschlag
21142711f0
Merge remote-tracking branch 'graffy76/master'
2014-05-07 10:35:11 +02:00
graffy76
a17cb1f389
Fixed opencs.ini formatting
2014-05-06 07:37:52 -05:00
Marc Zinnschlag
7f78c29bb5
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
...
Conflicts:
apps/opencs/view/world/table.cpp
2014-05-04 14:03:56 +02:00
graffy76
1c26741c56
Implemented rangeview with spinbox as only control. Simplified setting
...
class constructor.
2014-05-03 18:58:43 -05:00
Marc Zinnschlag
0b309d9ef4
Merge branch 'master' into load
...
Conflicts:
apps/opencs/view/doc/viewmanager.cpp
2014-05-03 14:36:06 +02:00
Marc Zinnschlag
5f1d2f72f6
added basic loading GUI
2014-04-29 14:17:25 +02:00
Marek Kochanowicz
853abb65c3
added new, later common, base for the regionmap and the table
2014-04-29 11:44:21 +02:00
graffy76
ab33e78b67
Added RangeView class files
2014-04-26 09:40:58 -05:00
Marc Zinnschlag
dbb192f084
moved loading to a separate thread
2014-04-24 15:09:25 +02:00
graffy76
e3384e3999
relocate support.hpp / remove support.cpp
2014-04-22 22:19:03 -05:00
Marc Zinnschlag
e324450118
replaced return value of DocumentManager::addDocument with a signal
2014-04-21 09:02:58 +02:00
Marc Zinnschlag
0516d95253
added context menu with selection functions to region map
2014-04-10 22:12:09 +02:00
Marc Zinnschlag
67965ec10c
added CellCoordinates and CellSelection classes
2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4
removed grid button (discarding the first attempt at a cell selector)
2014-04-07 10:21:26 +02:00
Marc Zinnschlag
baf30ba292
added grid tool (does not work yet)
2014-04-03 14:44:48 +02:00
Marc Zinnschlag
ed524b2fd4
added bright lighting mode
2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32
added night lighting mode
2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27
added day lighting mode
2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8
added lighting switching
2014-03-23 15:14:26 +01:00
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
Marc Zinnschlag
ecedb60169
splitting new game and new addon functions (new game currently not working)
2013-09-08 12:06:28 +02:00
Marc Zinnschlag
6cd7da6547
Merge remote-tracking branch 'marcrbouvier/master'
2013-09-03 13:47:07 +02:00
Marc Bouvier
51332b86a1
[Feature #811 ] Only 1 Instance of OpenCS is Allowed
...
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
2013-09-03 01:44:21 -05:00
Marc Zinnschlag
3cf60da5a7
added numeric value filter node
2013-08-24 14:43:38 +02:00
Marc Zinnschlag
de956737fe
added text filter node
2013-08-22 14:50:42 +02:00
Marc Zinnschlag
ba6edc55d4
added not filter node
2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888
added and and or filter nodes
2013-08-22 13:14:35 +02:00
Marc Zinnschlag
c38860fa72
added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node)
2013-08-18 14:17:18 +02:00
Marc Zinnschlag
236dc9fc43
replaced binary filter node with a n-ary node
2013-08-16 14:18:31 +02:00
Marc Zinnschlag
789a66eaa7
added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now)
2013-08-11 20:39:21 +02:00
Marc Zinnschlag
f5b06d5d52
basic filter tree structure
2013-08-09 14:49:05 +02:00
Marc Zinnschlag
f6226e4859
added Creator class for filters
2013-08-08 15:55:23 +02:00
Marc Zinnschlag
76b9d3dbc1
columns are now identified via an enum instead the name string
2013-08-07 09:36:05 +02:00
Marc Zinnschlag
d2f96deb98
renamed columns.hpp to columimp.hpp
2013-08-02 10:42:52 +02:00
Marc Zinnschlag
adb05737ee
Merge branch 'master' into filter
...
Conflicts:
apps/opencs/model/world/universalid.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/subviews.cpp
2013-07-30 15:55:50 +02:00
Marc Zinnschlag
102700a498
added specialised Creator for references
2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce
added specialised Creator for referenceable records
2013-07-30 12:34:18 +02:00
Marc Zinnschlag
82958e6514
added custom creator for cell records
2013-07-28 18:08:57 +02:00
Marc Zinnschlag
32c697abc6
validate IDs entered by the user
2013-07-28 14:40:11 +02:00
Marc Zinnschlag
fee748d4b5
added creator bar UI and cancel button
2013-07-26 21:09:23 +02:00
Marc Zinnschlag
ba5ca5beed
replaced createAndDelete flag with a new class hierarhy (Creator)
2013-07-26 12:35:17 +02:00
Marc Zinnschlag
55e7e71c11
added optional per-subview status bar
2013-07-25 14:29:56 +02:00
Marc Zinnschlag
7600d6c04b
basic filter table
2013-07-22 21:18:47 +02:00
Marc Zinnschlag
6a5ab34971
Merge branch 'region'
2013-07-14 12:19:02 +02:00
Marc Zinnschlag
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
2013-07-11 09:09:52 +02:00
graffy76
bb049806df
Repo permissions commit fix #2
2013-07-10 21:13:59 -05:00
Marc Zinnschlag
4f05f2bddf
basic region map; non-interactive for now and working with dummy data instead of real cell/region records
2013-07-08 13:12:50 +02:00
Marc Zinnschlag
4986b7d65d
Merge branch 'master' into ref
2013-07-06 17:54:19 +02:00
Marc Zinnschlag
9a49125281
added references table
2013-07-06 17:03:18 +02:00
graffy76
9d95a38934
Implementing delegate for referenceables table Type column
...
Added delegate skeleton class
Added delegate creation code in ViewManager
Added Display_RefRecordType enum to columnbase.hpp
Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp
modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
2013-06-29 08:54:32 -05:00
graffy76
101c147217
Final changes for record status icon feature, incl. window size user
...
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
2013-06-20 18:06:25 -05:00
Marc Zinnschlag
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
2013-06-17 14:28:09 +02:00
graffy76
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
2013-06-17 06:45:44 -05:00
Marc Zinnschlag
f4e7916ec4
moved IdCollection base into its own source file pair and renamed it to Collection
2013-06-17 11:42:02 +02:00
graffy76
700d55f1fb
Fixed / implemented missing features for RecordStatusDelegate
...
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table
2013-06-15 06:40:18 -05:00
Glorf
10165d3c6b
Feature #468
2013-06-09 00:34:27 +02:00
Marc Zinnschlag
1e60ad3cd6
Promoted references to a top level record internally.
...
Note: This does not change the structure of the ESX format.
2013-06-08 12:45:13 +02:00
graffy76
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
2013-05-29 06:38:35 -05:00
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
2013-05-19 14:59:01 +02:00
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
2013-05-16 18:04:55 +02:00
graffy76
c71d921f09
Moved signalUpdateEditorSettings from UserSettingsDialog to
...
UserSettings.
UserSettings is now derived from QObject.
2013-05-12 15:15:57 -05:00
Marc Zinnschlag
9426eda47a
small test with statics and two columns
2013-05-11 17:01:16 +02:00
graffy76
a8b45e0a13
Three primary changes:
...
1. Declared QStringPair::isEmpty() const
2. Split the CsSettings namespace into two: CSMSettings and
CSVSettings. (Required splitting the support.hpp file)
3. Declared several classes as _noqt in CMakeLists.txt for OpenCS
2013-05-11 05:55:46 -05:00
graffy76
8d0f350446
New file structure separating view classes from model classes. Deleted
...
.ui file.
2013-05-10 10:00:58 -05:00
graffy76
f6203cac2a
update for master
2013-05-07 20:33:42 -05:00
Marc Zinnschlag
e9f1aac7bd
added data structures for referenceable records
2013-05-06 14:11:55 +02:00
Marc Zinnschlag
0c33dd86d5
added basic cell table
2013-04-14 17:04:55 +02:00
Marc Zinnschlag
74145410f2
basic syntax highlighting in script subview
2013-04-10 22:49:22 +02:00
Marc Zinnschlag
d61ec1063e
added script editor
2013-04-10 20:14:10 +02:00
Marc Zinnschlag
40bb772e34
added verifier for spell record
2013-04-09 12:44:49 +02:00
Marc Zinnschlag
43a5013690
added verifier for birthsign record
2013-04-07 23:25:35 +02:00
Marc Zinnschlag
593646436e
added verifier for region record
2013-04-07 19:39:13 +02:00
Marc Zinnschlag
e2c6458adb
added verifier for sound records
2013-04-06 21:48:52 +02:00
Marc Zinnschlag
0fb583e065
added verifier for race record
2013-04-06 17:35:36 +02:00
Marc Zinnschlag
b5eaa464ad
added faction record verifier
2013-04-04 10:39:43 +02:00
Marc Zinnschlag
fea44c05d4
added class record verifier
2013-04-04 10:10:58 +02:00
Marc Zinnschlag
dc67ddf39b
added verifier stage for skill records
2013-03-25 11:07:04 +01:00
graffy76
c17821e6c8
Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose
2013-03-08 20:08:56 -06:00
graffy76
03c7f18112
Fixes for save-on-close message boxes
2013-03-07 17:48:05 -06:00
Pieter van der Kloet
7504ae675b
Implemented a file dialog for the editor using launcher .ui
2013-03-07 03:00:59 +01:00