f3ff90e1fd
moved meta data into a new single-row table
10 years ago
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
10 years ago
2565452052
Add some drag'n'drop utils to work with TableMimeData
10 years ago
27ece7f36a
Rework DropLineEdit. Make it type-sensitive
10 years ago
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
10 years ago
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
2e40b68862
Add a custom proxy model for Info tables
10 years ago
850f612c8b
Merge branch 'master' into feature-color-picking
10 years ago
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
609e146a22
Build fixes for windows
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
2c15ad5e0c
Add SoundGens verifier
10 years ago
f19d07b404
Rename ColorPickerDelegate to ColorDelegate
10 years ago
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.
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
e257c915bf
Add color picker popup to choose color
10 years ago
ef88b28c26
Create a custom item editor for color columns
10 years ago
d7fb497255
Color values are displayed as colored rectangles in tables
10 years ago
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
10 years ago
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
1ba3fa4169
Remove leftovers of the old OpenCS navigation
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
10 years ago
33e36ee922
Add the ID completion delegate
10 years ago
87a1f9f9aa
Add ID completion manager
10 years ago
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
10 years ago
3a31468af0
Pathgrid record verifier. Feature #2000 .
10 years ago
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
cfcfb17320
Updates to optional horizontal scrollbar.
...
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
10 years ago
47758c11cd
Readded collision objects and movement physics
10 years ago
c31b416ba1
Move physicssystem to a new mwphysics module
10 years ago
c1edc30ad7
Dead code removal
10 years ago
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
10 years ago
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
47d5eac290
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/idtable.hpp
10 years ago
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
10 years ago
ef84e553be
Renamed some stuff.
10 years ago
41b368a759
Moved templated code around a bit.
10 years ago
bdf0d8db22
Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.
10 years ago
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
10 years ago
af67de73a5
Delete shiny
10 years ago
619b5206cd
More consistency nit pick.
10 years ago
29ef08bb75
Spelling and other consistencies nit pick.
10 years ago
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
23cf859fee
added search stages (cell table only for now)
10 years ago
72400747f2
OpenCS: preliminary port of cell rendering to OSG
10 years ago
aedafe651a
OpenCS: delete physicssystem, will be replaced with OSG picking
10 years ago
78c6268891
added search class and search box widget
10 years ago
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
10 years ago
49c2da27b3
OpenCS compiles and runs again (no rendering)
10 years ago
d053c62032
setting up global search operation and subview
10 years ago
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
10 years ago
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
10 years ago
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
10 years ago
727b68dd15
Reduce difference with the master branch where possible.
10 years ago
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
0b70fdac57
added start script verifier
10 years ago
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
10 years ago
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
10 years ago
e1314d6211
Implement OpenCS reference validation (Feature #831 )
10 years ago
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
10 years ago
5534306eb3
Few rename fixes
10 years ago
0b7b627443
CMake fix for opencs rename
10 years ago
0557d45bd1
renamed opencs into openmw-cs
10 years ago
3a847732b4
abstracted message collection into a class
10 years ago
7c59ea6296
added specialised report table
10 years ago
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.
10 years ago
e04ead2bd5
new element visibility button icons
10 years ago
a60e4c036f
Merge branch 'mode'
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
10 years ago
2acf446f18
added edit mode button to scene toolbar
10 years ago
4dd645559d
added ModeButton specialisation of PushButton for use in SceneToolMode
10 years ago
8b4651f055
Move mouse related functions and states out of WorldspaceWidget.
10 years ago
b328aa1fb9
Multiple document support.
10 years ago
03a30c3f1d
Experimental, compiles but does not work.
10 years ago
094f046087
Convert OverlaySystem to a OpenCS style singleton.
10 years ago
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
e58e5c2bf5
Update overlays independently from multiple viewports.
10 years ago
9323f96211
Move terrainstorage to opencs_units_noqt
10 years ago
809b8c6d5b
Conflicts:
...
apps/opencs/view/render/pagedworldspacewidget.cpp
10 years ago
21b16f8425
Merge branch 'tables'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
10 years ago
406135ee96
Merge remote-tracking branch 'upstream/master' into terrain
10 years ago
8786fb639f
Implement terrain rendering in OpenCS ( Fixes #1597 )
10 years ago
85d93807c5
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
10 years ago
be3b229a5f
fixed pathgrid loading
10 years ago
3aea1bf5f9
CMake changes for using Ogre Overlay.
10 years ago
d64127106b
load and save pathgrid records
10 years ago
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
10 years ago
51128d2d57
added run button to scene subview toolbar
10 years ago
6d12374ace
Move windows platform specific files into a common directory.
10 years ago
cf05d3c69f
added run log
10 years ago
fa0b3eb298
Add an icon to opencs.exe as well
10 years ago
a728d6d77a
full implementation of global run menu item (replaces earlier placeholder implementation)
10 years ago
1b4ab6e130
added OpenMW runner
10 years ago
bdfb0c8351
Feature #1616 : Body part record verifier
11 years ago
fa9c6b19c2
removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on)
11 years ago
a54efbcfa0
made FilterCreator redundant by generalising GenericCreator
11 years ago
828536e999
generalised the concept of record scope
11 years ago
92d322cbd1
added visibility flags
11 years ago
71ce78f949
added scene toolbar toggle widget
11 years ago
cdac934315
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
11 years ago
c4598d6200
added inventory helper (since npc and containers share same way of
...
handling items)
11 years ago
a9f9dec923
consider script blacklist in OpenCS verifier
11 years ago
87eed066c2
undo works now
11 years ago
1ff8abb240
store whole container representing the nested table inside of the
...
command
Static nature of C++ forced me to use templates. Bit frustraiting.
11 years ago
4b4a72c3b6
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
11 years ago
dd0aa20390
custom push button
11 years ago
03f67cd6bd
moved low level widgets from CSVWorld into a separate namespace/directory
11 years ago
b2c957a56f
added resources tables
11 years ago
1b1f1bade3
injected new class IdTableBase between QAbstractItemModel and IdTable
11 years ago
879ab49e9c
added resources manager
11 years ago
172f1a1301
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
11 years ago
5eac32e3d3
added nestedtable for displaying nested content.
11 years ago
74ed9cbb2d
added cell rendering class
11 years ago
0c1ad54e68
refactored object rendering into a separate class
11 years ago
1fb18873cb
adding proxy model that is ment to be used by the dialoguesubview
11 years ago
c23e9e03fd
Merge branch 'refs'
11 years ago
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
11 years ago
83d5f2aaeb
factored out command creation from table view into a separate class
11 years ago
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.
11 years ago
8f9091550e
require boost::locale only on Windows
11 years ago
b728a919a2
write dependency on boost::locale to CMake files
11 years ago
6eff5ecaad
Merge branch 'operations' into load
...
Conflicts:
apps/opencs/main.cpp
apps/opencs/model/doc/document.cpp
11 years ago
21142711f0
Merge remote-tracking branch 'graffy76/master'
11 years ago
a17cb1f389
Fixed opencs.ini formatting
11 years ago
7f78c29bb5
Merge remote-tracking branch 'sirherrbatka/Feature#1274'
...
Conflicts:
apps/opencs/view/world/table.cpp
11 years ago
1c26741c56
Implemented rangeview with spinbox as only control. Simplified setting
...
class constructor.
11 years ago
0b309d9ef4
Merge branch 'master' into load
...
Conflicts:
apps/opencs/view/doc/viewmanager.cpp
11 years ago
5f1d2f72f6
added basic loading GUI
11 years ago
853abb65c3
added new, later common, base for the regionmap and the table
11 years ago
ab33e78b67
Added RangeView class files
11 years ago
dbb192f084
moved loading to a separate thread
11 years ago
e3384e3999
relocate support.hpp / remove support.cpp
11 years ago
e324450118
replaced return value of DocumentManager::addDocument with a signal
11 years ago
0516d95253
added context menu with selection functions to region map
11 years ago
67965ec10c
added CellCoordinates and CellSelection classes
11 years ago
324b2743d4
removed grid button (discarding the first attempt at a cell selector)
11 years ago
baf30ba292
added grid tool (does not work yet)
11 years ago
ed524b2fd4
added bright lighting mode
11 years ago
9746f8bd32
added night lighting mode
11 years ago
fa29942b27
added day lighting mode
11 years ago
d5506172e8
added lighting switching
11 years ago
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
11 years ago
c36dfef972
prewview subview
11 years ago
2e6b45dafb
edit view, savind works
11 years ago
020e3f8fc5
Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3
11 years ago
f0a45fa15f
just saved progress
11 years ago
397921e457
specialising WorldspaceWdiget into paged and unpaged subclasses
11 years ago
a264e86e13
subclasses scene widget for worldspace scenes
11 years ago
Marc Zinnschlag
scrawl
Stanislav Bas
cc9cii
Kamil Bar
slothlife
Nikolay Kasyanov
Stanislav
Marek Kochanowicz
greye
graffy76