Commit Graph

327 Commits (openmw-39)

Author SHA1 Message Date
Aesylwinn 0e75b4a234 Remove warning about */ outside of comment 9 years ago
Aesylwinn 48047beb9a Stripped OSG mouse and keyboard handling. 9 years ago
scrawl 80392775ef Fix copy&paste error 9 years ago
scrawl 647a5e091f Add osgQt to the repository
Ensures that it will be built against the correct Qt version.
9 years ago
Bret Curtis 3ea3d07d44 really purge libav 9 years ago
Bret Curtis 39f89f967b from kcat: We can't simply get rid of this, otherwise it may break for certain kinds of packets. 9 years ago
Bret Curtis 8d2990cc03 add support for ffmpeg29 thanks to Andreas Cadhalpun; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803848 9 years ago
scrawl cd2e6d4436 Move the __STDC_CONSTANT_MACROS define to cmakelists 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
scrawl 45fcea929a Refactor cmake scripts, reducing the amount of find_package(FFmpeg) 10 years ago
scrawl cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 10 years ago
scrawl e6ecb39d94 Potential include fix 10 years ago
scrawl 7ac4b2bb66 Fix for travis build issue 10 years ago
scrawl 60ad568004 Another missing include 10 years ago
scrawl 7991ea25c0 Potentially missing includes 10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl 4d5c446a44 Minor cleanup 10 years ago
Marc Zinnschlag d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 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
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 9ea416b852 Readded HW cursor manager (no image rotation yet) 10 years ago
scrawl 39fb46601a Readded input & event handling 10 years ago
scrawl 7a2a7633d5 Fix videoplayer destruction issue that valgrind complained about 10 years ago
scrawl 00f4f78717 Give a name to video streams for logging purposes 10 years ago
scrawl b0804734e5 Port VideoWidget 10 years ago
k1ll 96d9afec38 More header case fixes 10 years ago
k1ll c61919501d Fix unnecessary include, ssize_t define and use pretty function instead of funcsig for mingw 10 years ago
k1ll de247ec94b Fix ifdef 10 years ago
scrawl c53a56ed6e clear stream errors before attempting the read 10 years ago
scrawl 92ef9b1c57 Rename to osg-ffmpeg-videoplayer 10 years ago
scrawl 168c0d9b39 Dead code removal 10 years ago
scrawl 42f6d9e15b Port video player 10 years ago
scrawl af67de73a5 Delete shiny 10 years ago
dteviot 1d7f3474fa Fixed more MSVC 2013 warnings. 10 years ago
Scott Howard e2ef8c4022 fix -Wnewline-eof warnings 10 years ago
dteviot 36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
10 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
Marc Zinnschlag ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 10 years ago
dteviot 45b6538820 fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
10 years ago
scrawl 5a47b7ae6e Warning fix 10 years ago
scrawl 0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 10 years ago
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
10 years ago
scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
10 years ago
Digmaster e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 10 years ago
Digmaster 1e4a845b6f Minor code cleanup 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl fec8cf91f5 Add exception handling to various uses of DataStream::read 10 years ago
scrawl 472165097d Warning fix 10 years ago