Commit Graph

13774 Commits (22f01b1232ca6cff922d90c57b4d8a52a66a4c14)
 

Author SHA1 Message Date
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
Marc Zinnschlag 53b4c15d85 Merge remote-tracking branch 'smbas/master' 10 years ago
Marc Zinnschlag 913caf96bd Merge branch 'openmw-36' 10 years ago
Marc Zinnschlag 63c3d8df2e updated credits file 10 years ago
Marc Zinnschlag c64e96e551 Merge remote-tracking branch 'cramal/master' 10 years ago
Marc Zinnschlag b58b7a89ed Merge remote-tracking branch 'rohit-n/reorder2' 10 years ago
Cramal 45f6e3b39e debug latex code 10 years ago
Cramal 10ca6cf379 debug latex code 10 years ago
scrawl f2809ab63b Delete nifosgtest again 10 years ago
scrawl 0de6839890 Minor cleanup 10 years ago
scrawl 0b042b75cc Restore actor visibility mask 10 years ago
scrawl 04e827ecf6 Don't try to play an empty video 10 years ago
scrawl cd81ec92db Minor cleanup 10 years ago
scrawl 8092f37ce5 New game crash fix 10 years ago
Stanislav Bas a5183aefbe Add record state tracking to the ModifyCommand (Fix #2555) 10 years ago
scrawl 0fb59178b6 Settings file cleanup 10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 85345e663a Restore getHitContact 10 years ago
scrawl 627fee07bc Minor cleanup 10 years ago
scrawl cac7c1e535 Restore various physics features 10 years ago
scrawl d6da5c8007 Fix for crosshair not showing 10 years ago
scrawl 5ea61af6ac Fix for applying view distance 10 years ago
scrawl 2235d2978b Restore animation text key handling 10 years ago
scrawl 9b8e2e9db3 Port MWRender::Camera 10 years ago
Stanislav Bas d27b92e9f1 Avoid gaps between local indexes in RefIdData after removal of records (Fix #2545) 10 years ago
scrawl 0fb97bd2e7 Readded baseonly parameter to Animation::setObjectRoot
Fixes the first person view.
10 years ago
scrawl 6031db7882 Character sliding fix 10 years ago
Marc Zinnschlag 9767910f06 updated credits file 10 years ago
Marc Zinnschlag 49529b7cd0 Merge remote-tracking branch 'bodillium/ManualEdit' 10 years ago
Nicola Bodill 8f8fdedcde Some more edits
Responding to sirherrbatka's feedback.
10 years ago
Marc Zinnschlag ca7829032e updated credits file 10 years ago
scrawl cfe57199d7 Minor cleanup 10 years ago
scrawl 7882c3d7f0 Fix incorrect rotation for meshes with BoneOffset 10 years ago
scrawl c4452afd89 Inventory item picking 10 years ago
scrawl 8d033f0558 Fix UpdateRigBounds not being copied properly 10 years ago
scrawl 72c1f37527 Port CharacterPreview 10 years ago
scrawl 820f4a2688 Fix light direction 10 years ago
Stanislav Bas 163c12d3eb Merge remote-tracking branch 'upstream/master' 10 years ago
Stanislav Bas 196be7283d Reset an activated reference after activation's exectution (Fix #1738) 10 years ago
Marc Zinnschlag f0a6513d7e Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 8b768f4377 Minor fix for behaviour with non-existing LightManager 10 years ago
scrawl 314c1161ae Minor addition to reading display 10 years ago
Marc Zinnschlag 5176e3d84b Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar' 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 99eb78fc19 Fix $DISPLAY not being accounted for in cursor decompression context 10 years ago
scrawl 8bcfac1ea3 Fix adjustPosition not always working correctly (Fixes #2563)
moveObject was returning an incorrect Ptr for cell movements.
10 years ago
Marc Zinnschlag 7b207a7954 added shortcut for closing subviews (Fixes #2558) 10 years ago
Marc Zinnschlag 93c3bb3716 fixed subview-closing related crash (Fixes #2564) 10 years ago
cc9cii e9ca022162 Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549.
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
  Grow Only: No change to current, except the use of size hints
  Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
  Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
10 years ago
Marc Zinnschlag b9856162b3 updated changelog 10 years ago