Commit Graph

367 Commits (0.7.0)

Author SHA1 Message Date
scrawl dc6a99d32a Add missing virtual destructor 10 years ago
scrawl 4680bc6c93 Merge branch 'master' of https://github.com/OpenMW/openmw 10 years ago
scrawl 6126b3b84a Videoplayer: wait until we have the first picture before returning from playVideo() 10 years ago
Marc Zinnschlag a4be214fb1 Merge remote-tracking branch 'scrawl/master' 10 years ago
cc9cii ea67cf0ebe Try the fix again. 10 years ago
cc9cii e01795556f Suppress some warnings for MSVC. 10 years ago
scrawl 102103e37b Add possibly missing include for av_rescale_q 10 years ago
scrawl b39d69e98c Videoplayer fixes, play/pause & seeking
- Fix rindex overflow
 - Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
 - Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
 - Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)

The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
10 years ago
scrawl 2a3627b5a8 avresample wrapper fix 10 years ago
scrawl a9be8628b9 namespace fix, improve comment 10 years ago
scrawl 9da1c49276 Add missing header to CMakeLists, remove stale comment 10 years ago
scrawl eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
10 years ago
sylar 964e42ab02 fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android 10 years ago
scrawl f9b6cc468d Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action (Fixes #1960) 10 years ago
scrawl 7252cb63a6 Fix cppcheck issues 10 years ago
scrawl 319f4e0547 Bind to scancodes instead of keycodes 10 years ago
scrawl 24e5a90bab Fix crash when input settings contain extra channels 10 years ago
scrawl 7f95e1e6c2 Don't warn about SDL_CLIPBOARDUPDATE events 10 years ago
Corporama ccca6db865 Compile fixes for Linux 10 years ago
scrawl 3d47f2ceb0 Fix bad indentation 10 years ago
scrawl 7b2070de5a unloadUnreferencedMaterials: Properly unload materials instead of removing techniques 11 years ago
scrawl fc0465eeb0 Add missing header to CMakeLists 11 years ago
scrawl c5a9cd0aa1 Sync upstream changes to shiny 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 9757ad4031 fixed code 10 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 7cd2d4809c android-build 11 years ago
scrawl d7acb7fc7d Ignore invalid shader cache index (Bug #1664) 11 years ago
scrawl 07cfa2abd5 Set texture unit indices for GLSL ES 11 years ago
cc9cii 9713873538 Minor change to improve generated STL code (only tested with MSVC 2012). More details in forum post https://forum.openmw.org/viewtopic.php?f=6&t=2153#p24065 11 years ago
slothlife 9ea22324f7 Fix some MSVC warnings.
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
scrawl 162549b7af Remove a wrong comment 11 years ago
scrawl fcab53b3f7 Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified 11 years ago
Marc Zinnschlag 2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 11 years ago
cc9cii 36e380c6be Merge remote-tracking branch 'upstream/master' 11 years ago
scrawl 41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
Note: breaks compatibility with input.xml, so the filename was changed.
11 years ago
Fil Krynicki cd693b6d37 Fixed mouse closing containers, and injection/gui test order
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.

Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.

And fixed a comment.
11 years ago
Fil Krynicki 97caa1f8a4 Alternative fix strategy by checking for binding state 11 years ago
cc9cii fd758bacd3 Remove #ifdef guards. 11 years ago
cc9cii 76bf774485 Small changes for compiling with MSVC 2013. 11 years ago
Fil Krynicki bbb7ceab43 Merge branch 'master' into bug1196jumpdialog
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
Fil Krynicki cd131e7f86 1196/1217 fix
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
11 years ago
Marc Zinnschlag be88168e91 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl afc1fa49f6 Use mouse release instead of press for binding actions
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
11 years ago
cc9cii bbe77d656a Minor fixes from static analysis. 11 years ago
greye 663d5c314e be more verbose on change reasons 11 years ago
greye 3721174ae4 proof-of-concept boost::wave iteration policy 11 years ago
greye 1b7ed98325 fix typos, reset memory before using 11 years ago
greye a46662043a tinyxml convert path to UTF-16 on Windows 11 years ago
scrawl eff648e3ab Show unhandled SDL events in hexadecimal (easier to compare with the enum) 11 years ago
scrawl e7b9b6d87a Fix a confusing variable name 11 years ago
scrawl a3dffd5d57 Add some missing SDL to MyGUI key translations.
Most importantly to allow numpad enter as alternative to return key.
11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
cc9cii 5539c75ef0 Typo fix to avoid divide by zero. 11 years ago
scrawl 439018e706 Get rid of useless return values 11 years ago
scrawl c004fb778f Get rid of underscore defines. They are reserved by the standard. 11 years ago
scrawl 6d27ebabb6 Integrate AddGlow with material controllers 11 years ago
scrawl 19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw
Conflicts:
	apps/openmw/main.cpp
11 years ago
scrawl 4bc4af6bf0 Enable microcode caching for Ogre 1.9+ 11 years ago
Lukasz Gromanowski bfd79bfbe6 Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 11 years ago
scrawl 7f735c2c4c Release and show the cursor when focus lost 11 years ago
scrawl 3452bd2e0b Add glow effect for enchanted items 11 years ago
Marc Zinnschlag b7bb7d6902 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/opencs/editor.cpp
11 years ago
scrawl c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 11 years ago
scrawl e6960d915a Add simple Ogre widget 11 years ago
scrawl 2fb059e2fa Don't destroy the SDL window twice 11 years ago
Marc Zinnschlag 6f64b1b9db cmake option to use system tinyxml instead of embedded one 11 years ago
Marc Zinnschlag b737d958e1 Merge remote-tracking branch 'kcat/master'
Conflicts:
	extern/sdl4ogre/cursormanager.hpp
11 years ago
Chris Robinson 1026e89810 Don't assume TexturePtr is a class 11 years ago
scrawl f12d5b728a Ogre 1.9 compatibility changes 11 years ago
scrawl d3d6dfbde8 Refactored loading screen
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
12 years ago
scrawl 6dc216af3d Fix a typo, caused occasional white spots on local map render 12 years ago
Nikolay Kasyanov e7500b22ba Fixed listener call issue spotted by @scrawl 12 years ago
Marc Zinnschlag b8cd3f3915 Merge remote-tracking branch 'corristo/master' 12 years ago
Nikolay Kasyanov 3849c8488c Use SDL_False instead of -1 12 years ago
Nikolay Kasyanov 4e9ef31375 Added missing(?) break 12 years ago
Nikolay Kasyanov 98216544de screw tabs 12 years ago
Marc Zinnschlag 130141ecac Merge remote-tracking branch 'corristo/master' 12 years ago
Nikolay Kasyanov e552eccaa4 Fixed endless message loop after trying to resize window on OS X 12 years ago
Nikolay Kasyanov 66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 12 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
scrawl 6164e5bae6 Restored window resizing 12 years ago
scrawl 50a0d16f8f Pass only the X11 window to Ogre, otherwise it would treat it as parentWindowHandle instead of externalWindowHandle. parentWindowHandle does not seem to play nice with SDL and occasionally crashes with a GLXBadDrawable error on startup. 12 years ago
scrawl b16bc69479 Removed the no longer needed --debug switch 12 years ago
scrawl b16c92c2f5 Better handle SDL_TEXTINPUT events 12 years ago
scrawl 03682184c6 Enable SDL_TEXTINPUT events only when a text input widget currently has key focus 12 years ago
scrawl 88acebf808 Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts 12 years ago
scrawl 5252ffa104 More cleanup 12 years ago
scrawl 6958940131 Ignore repeated keystrokes, except for text input events 12 years ago
scrawl f1ff9b69b3 Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches 12 years ago
scrawl 4fb32f7f05 Moved window resize messages to sdlinputwrapper 12 years ago
scrawl 14a2a26a56 Fullscreen resizing fix 12 years ago
scrawl 403704b92a Use openmw.png for SDL_SetWindowIcon 12 years ago
scrawl 918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 12 years ago
scrawl 495aeb5d3b Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
12 years ago
scrawl 1e7cf4ae1c GLES2 experiment 12 years ago
scrawl a54f8c7ee2 Removed an optimization that caused problems on 32 bit builds 12 years ago
scrawl 8845c0cee1 Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera. 12 years ago
scrawl d6e9cb114e Forgot to add directory 12 years ago
scrawl 062ff189a2 Merge branch 'master' into memory 12 years ago
Lukasz Gromanowski 6fbd940a2f Fix warning issued by GCC 4.8 in oics/tinyxml.cpp
Fix warning issued by GCC 4.8 (and as far I remember 4.7 too)
about not supported "%lf" format string:

openmw/extern/oics/tinyxml.cpp: In member function ‘void TiXmlAttribute::SetDoubleValue(double)’:
openmw/extern/oics/tinyxml.cpp:1269:50: warning: ISO C++98 does not support the ‘%lf’ gnu_printf format [-Wformat=]
   TIXML_SNPRINTF( buf, sizeof(buf), "%lf", _value);
                                                  ^

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
12 years ago
scrawl 75dcf52552 Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made) 12 years ago
scrawl 23b477a938 Fix normal maps with spaces in filename not getting loaded 12 years ago
scrawl 5625d73d84 Bump texture support 12 years ago
scrawl 7f8d659f3c Fix transparency sorting 12 years ago
scrawl 62c711d709 Small change to delete microcode cache more aggressively. 12 years ago
scrawl 814969dcae Cache integrity check uses relative paths, so that changing the build folder works without reset 12 years ago
scrawl a7d910614f extern/shiny update: made caching more robust 12 years ago
scrawl bf037b7d29 Removed problematic ModVertexAlpha method, now done in shader 12 years ago
Jordan Milne 10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 12 years ago
Jordan Milne 043e29c620 Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble) 12 years ago
Jordan Milne b6ec64485c fix includes for Windows 12 years ago
Jordan Milne eb08f407d3 Oops, remove resource leak in the input wrapper. 12 years ago
Jordan Milne 5a6589af01 extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start 12 years ago
scrawl d71b583855 fix const cast, fix comment 12 years ago
Jordan Milne 651a654985 clean up our cursors during destruction 12 years ago
Jordan Milne eeacb04fe2 Fully working hardware cursors (if you compile SDL2 with XCursor support) 12 years ago
Jordan Milne f9b064d1bc add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully 12 years ago
Jordan Milne 1117105039 fix compile error with boost includes 12 years ago
Jordan Milne a030c03513 support the printscreen button properly 12 years ago
Jordan Milne 403b6756f5 remove dependency on boost::locale, use system mouse position in in-game menus 12 years ago
Jordan Milne 601d79ef3f fix the mouse wheel in mygui 12 years ago
Jordan Milne ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 12 years ago
Jordan Milne 02ccb75894 Wrap the mouse to the window (except in debug mode)
Grab the mouse when not in the main menu (except in debug mode)
Always hide the cursor when it's over the window
Allow warping the mouse around
Handle ^C properly
12 years ago
Jordan Milne f85679db93 Merge branch 'master' into sdl_input 12 years ago
Jordan Milne 00a2a5c358 remove some more of my mess 12 years ago
Jordan Milne 3b1d285cf3 fix compile errors, work with unmodified SDL 12 years ago
scrawl e18cf452d4 Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012 12 years ago
Jordan Milne 884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 12 years ago
eduard c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
12 years ago
scrawl 693eeabeca shiny: fix GLSL texture units when shaders were disabled 12 years ago
scrawl 7b35b82833 adding shiny 12 years ago
scrawl fb3ac6ad4a no submodule 12 years ago
scrawl 94f2937c8f missed a warning 12 years ago
scrawl d97184cd4d fixing some warnings 12 years ago
scrawl 1f087645a7 update shiny to auto-delete the corresponding cache if a shader was edited 12 years ago
scrawl 6ac2a12296 item selection working on the preview 12 years ago
scrawl b516813b28 fix a problem with older boost versions 12 years ago
Marc Zinnschlag 21a8dc5ae7 silenced a completely pointless warning 12 years ago
scrawl c27ff546e4 shader cache 12 years ago
Michael Mc Donnell d7572d815e Do not define OIS_DYNAMIC_LIB in ICSPrerequisites.h
Fixes http://bugs.openmw.org/issues/381
13 years ago
scrawl 86d6f190bf Input system rewrite 13 years ago
scrawl 6077965d27 fix the directx startup issue on windows 13 years ago
scrawl d5384403f3 forgot something else 13 years ago
scrawl 5572421576 submodule update for "fix a typo" 13 years ago
scrawl ac5bd38df9 some cmake fixes 13 years ago
scrawl 268987835d fix the crash 13 years ago