mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
28,397 Commits
38 Branches
54 Tags
122 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'master'
${ noResults }
Commit Graph

383 Commits (master)

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