mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 23:19:56 +00:00
Code Issues Releases Wiki Activity
24567 commits 38 branches 54 tags 122 MiB
Commit graph

376 commits

Author SHA1 Message Date
Aesylwinn
1ae402476d Journal verifier 2016-02-22 17:01:15 -05:00
Aesylwinn
8668eccd0b Topic Info verifier with fixes to InfoSelectWrapper class 2016-02-17 15:38:30 -05:00
Marc Zinnschlag
dececf6c38 instance moving via drag in 3D scenes 2016-02-16 16:02:29 +01:00
Aesylwinn
3f40346636 Implemented a wrapper for DialInfo::SelectStruct 2016-02-15 19:49:54 -05:00
scrawl
647a5e091f Add osgQt to the repository 
Ensures that it will be built against the correct Qt version.
 2016-02-15 15:16:48 +01:00
Rob Cutmore
a34a08c212 Render cell markers 
Adds rendering of cell markers. Markers are displayed at center of
cell and contain cell's coordinates.
 2016-02-07 13:52:18 -05:00
Alexander "Ace" Olofsson
b3e985fca2 Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2016-01-30 07:31:00 +01:00
Alexander "Ace" Olofsson
338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 2016-01-19 22:11:46 +01:00
Marc Zinnschlag
4a02563708 Merge branch 'master' into buttons 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-19 13:59:24 +01:00
Marc Zinnschlag
0305ae3693 added selection mode UI 2016-01-19 12:17:13 +01:00
Aesylwinn
1d86f705ba gmst verifier 2016-01-17 21:55:03 -05:00
scrawl
ad2145b463 OpenCS: use a separate enum for the toggle buttons 2016-01-11 23:10:16 +01:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6 Make Qt5 happy 2015-12-24 02:48:00 +01:00
Marc Zinnschlag
c646533448 removed old user settings system 2015-12-15 12:49:55 +01:00
Marc Zinnschlag
73ffdd5ac5 added colour settings 2015-12-11 11:15:14 +01:00
Marc Zinnschlag
590d6eba9b added enum settings 2015-12-10 17:33:14 +01:00
Marc Zinnschlag
b0fb6d56f1 added bool settings 2015-12-10 13:28:48 +01:00
Marc Zinnschlag
9ca5a1b647 added double settings 2015-12-10 10:58:38 +01:00
Marc Zinnschlag
c61d717e41 added integer settings 2015-12-08 17:21:58 +01:00
Marc Zinnschlag
5e40b4d2e8 page switching mechanism 2015-12-08 12:04:45 +01:00
Marc Zinnschlag
b37a2ac09c user settings categories 2015-12-06 12:06:28 +01:00
Marc Zinnschlag
36ce8f97d7 basic framework for new user settings system 2015-12-06 11:18:31 +01:00
scrawl
f962ce0bbe Don't link against unnecessary OSG libraries 2015-11-29 19:56:43 +01:00
Marc Zinnschlag
0d35938794 basic cell arrow rendering (shape is a placeholder) 2015-10-12 14:12:01 +02:00
Marc Zinnschlag
6ef2319eb8 Merge branch 'sceneinput' 2015-10-02 15:07:01 +02:00
artemutin@yandex.ru
e672880f64 Fix namespace, add file to CMakeLists.txt 2015-09-30 09:46:51 +10:00
Marc Zinnschlag
981a8a2cc2 delegated editing and selection functions to mode objects 2015-09-27 16:18:22 +02:00
Marc Zinnschlag
71247a0186 inserted TagBase between ObjectTag and osg::Referenced 2015-09-26 12:18:18 +02:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-09-11 13:22:15 +02:00
Stanislav Bas
4d24eff859 Show race only when mesh type is Skin (in BodyParts table) 2015-08-22 16:34:54 +03:00
Marc Zinnschlag
1b663f01af create merged document and open a view for it (document is still empty at this point) 2015-08-16 15:24:48 +02:00
Nikolay Kasyanov
dbcce482a6 OS X: enable high resolution mode for OpenMW & OpenCS 
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
 2015-08-15 22:37:09 +02:00
Marc Zinnschlag
904ad94952 added merge operation (doesn't do anything yet) 2015-08-13 12:03:20 +02:00
Marc Zinnschlag
b83f9445a9 added UI for merge tool (merge tool itself is still missing) 2015-08-06 12:52:10 +02:00
Stanislav Bas
0ea4d1981a Add magic effect verifier 2015-08-03 19:08:01 +03:00
Stanislav Bas
03c2e11961 Update to upstream/master. Resolve merge conflicts 2015-07-27 13:54:13 +03:00
Marc Zinnschlag
2016ff773f display script errors in script subview 2015-07-16 12:36:20 +02:00
Stanislav Bas
6162a46fbe Update to upstream/master. Resolve the merge conflict 2015-07-05 16:15:48 +03:00
Stanislav Bas
6b34845168 Create a separate class for Edit 'ID' action to use in tables' context menus 2015-07-04 18:49:32 +03:00
Stanislav Bas
1949fe4bf9 Add the configuration widget for extended commands 2015-07-02 15:47:12 +03:00
scrawl
1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-06-28 00:38:39 +02:00
Marc Zinnschlag
49dc30683f refactored dialogue subview button bar into a new class 2015-06-27 12:49:56 +02:00
Marc Zinnschlag
f3ff90e1fd moved meta data into a new single-row table 2015-06-26 13:01:25 +02:00
scrawl
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
 2015-06-22 20:09:02 +02:00
Stanislav Bas
2565452052 Add some drag'n'drop utils to work with TableMimeData 2015-06-21 17:08:10 +03:00
Stanislav Bas
27ece7f36a Rework DropLineEdit. Make it type-sensitive 2015-06-20 17:33:36 +03:00
Marc Zinnschlag
d5bc561d17 Merge remote-tracking branch 'smbas/feature-color-picking' 2015-06-18 16:37:49 +02:00
scrawl
c719b7038e Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-18 15:00:21 +02:00
Stanislav Bas
2e40b68862 Add a custom proxy model for Info tables 2015-06-17 22:47:39 +03:00
Stanislav Bas
850f612c8b Merge branch 'master' into feature-color-picking 2015-06-16 22:39:12 +03:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
scrawl
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +02:00
scrawl
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
 2015-06-13 21:11:24 +02:00
Stanislav Bas
2c15ad5e0c Add SoundGens verifier 2015-06-13 19:08:31 +03:00
Stanislav Bas
f19d07b404 Rename ColorPickerDelegate to ColorDelegate 2015-06-12 23:09:31 +03: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
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
Stanislav Bas
e257c915bf Add color picker popup to choose color 2015-06-12 00:00:23 +03:00
Stanislav Bas
ef88b28c26 Create a custom item editor for color columns 2015-06-09 15:20:50 +03:00
Stanislav Bas
d7fb497255 Color values are displayed as colored rectangles in tables 2015-06-08 21:33:23 +03:00
scrawl
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
 2015-06-07 15:23:54 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
1ba3fa4169 Remove leftovers of the old OpenCS navigation 2015-06-03 18:11:34 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
Stanislav Bas
9e405b69fa Create the custom completer popup to avoid the problem with the wrong height of the default popup 2015-05-31 16:43:28 +03:00
Stanislav Bas
33e36ee922 Add the ID completion delegate 2015-05-30 15:51:33 +03:00
Stanislav Bas
87a1f9f9aa Add ID completion manager 2015-05-30 15:31:44 +03:00
cc9cii
9ad69d9085 Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585. 2015-05-29 05:44:35 +10:00
cc9cii
3a31468af0 Pathgrid record verifier. Feature #2000. 2015-05-27 22:12:11 +10:00
scrawl
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
 2015-05-23 20:33:44 +02:00
cc9cii
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
 2015-05-18 07:12:02 +10:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
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
 2015-05-04 02:41:50 +02:00
cc9cii
18162557b0 TopicInfos result script are now displayed in dialogue subviews. 2015-04-19 13:31:16 +10:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
cc9cii
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
 2015-04-17 12:37:34 +10:00
cc9cii
a976dca27b Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key... 2015-04-13 06:39:38 +10:00
cc9cii
ef84e553be Renamed some stuff. 2015-04-12 13:48:23 +10:00
cc9cii
41b368a759 Moved templated code around a bit. 2015-04-12 10:52:01 +10:00
cc9cii
bdf0d8db22 Re-organise the inheritance structure once more in preparation for adding Pathgrid tables. 2015-04-09 19:11:19 +10:00
cc9cii
83bcc8d451 Reorganised class inheritance structure of collections, columns and idtable model. 2015-04-02 20:19:15 +11:00
scrawl
af67de73a5 Delete shiny 2015-04-01 17:06:31 +02:00
cc9cii
619b5206cd More consistency nit pick. 2015-03-30 16:41:55 +11:00
cc9cii
29ef08bb75 Spelling and other consistencies nit pick. 2015-03-30 11:53:33 +11:00
scrawl
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
 2015-03-27 17:30:48 +01:00
Marc Zinnschlag
23cf859fee added search stages (cell table only for now) 2015-03-27 16:33:54 +01:00
scrawl
72400747f2 OpenCS: preliminary port of cell rendering to OSG 2015-03-25 23:35:10 +01:00
scrawl
aedafe651a OpenCS: delete physicssystem, will be replaced with OSG picking 2015-03-25 19:08:09 +01:00
Marc Zinnschlag
78c6268891 added search class and search box widget 2015-03-25 11:56:14 +01:00
scrawl
34d503017a OpenCS: Set up an osgQt GraphicsWindow in SceneWidget 2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3 OpenCS compiles and runs again (no rendering) 2015-03-19 17:21:15 +01:00
Marc Zinnschlag
d053c62032 setting up global search operation and subview 2015-03-17 12:30:47 +01:00
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