scrawl
|
e642f20a65
|
Restore screenshot key functionality
|
2015-06-03 17:25:18 +02:00 |
|
scrawl
|
9ee63dc3f4
|
Change stats viewer key to f3
|
2015-05-28 16:28:48 +02: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 |
|
scrawl
|
737c2114dc
|
Change viewer stats keybinding to F9
|
2015-05-15 19:43:48 +02:00 |
|
scrawl
|
9ea416b852
|
Readded HW cursor manager (no image rotation yet)
|
2015-05-13 18:56:14 +02:00 |
|
scrawl
|
39fb46601a
|
Readded input & event handling
|
2015-05-13 16:50:47 +02:00 |
|