scrawl
|
4d5c446a44
|
Minor cleanup
|
2015-06-02 19:36:57 +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
|
7a2a7633d5
|
Fix videoplayer destruction issue that valgrind complained about
|
2015-05-08 17:11:40 +02:00 |
|
scrawl
|
00f4f78717
|
Give a name to video streams for logging purposes
|
2015-05-07 23:08:52 +02:00 |
|
scrawl
|
b0804734e5
|
Port VideoWidget
|
2015-05-01 03:03:44 +02:00 |
|
scrawl
|
c53a56ed6e
|
clear stream errors before attempting the read
|
2015-04-21 16:10:11 +02:00 |
|
scrawl
|
92ef9b1c57
|
Rename to osg-ffmpeg-videoplayer
|
2015-04-19 20:14:06 +02:00 |
|