mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 01:26:39 +00:00
Code Issues Releases Wiki Activity
24063 commits 115 branches 76 tags 128 MiB
Commit graph

390 commits

Author SHA1 Message Date
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
 2015-03-08 18:29:12 +13:00
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
 2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
scrawl
5a47b7ae6e Warning fix 2015-03-06 02:36:12 +01:00
scrawl
0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 2015-03-06 02:36:12 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
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
 2015-02-27 22:21:02 +01:00
Digmaster
e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
scrawl
fec8cf91f5 Add exception handling to various uses of DataStream::read 2015-01-31 22:40:42 +01:00
scrawl
472165097d Warning fix 2015-01-27 23:12:21 +01:00
scrawl
60f722b0a9 Treat the first mouse motion event as non-relative 
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
 2015-01-27 23:05:19 +01:00
scrawl
6b2df95167 Fix for some coverity defects 2015-01-15 02:03:27 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
Digmaster
e076e8a9bd Fixed error when downgrading openmw versions 2014-12-09 14:53:50 -06:00
Digmaster
bb6ed06a4e read gamecontrollerdb file location from settings file 2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a Fixed binding controls to A on joystick 2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593 Inital value for joysticks is 0.5 2014-12-09 11:16:17 -06:00
Digmaster
c37881ead1 Joystick Support 2014-12-08 21:57:32 -06:00
scrawl
ad38345de4 Clean up listener in destruction of OgrePlatform (Fixes #2145) 2014-11-28 23:15:07 +01:00
scrawl
17cb181f88 Use av_get_default_channel_layout for unknown channel layouts 2014-11-01 19:37:54 +01:00
scrawl
dc6a99d32a Add missing virtual destructor 2014-10-25 20:30:42 +02:00
scrawl
4680bc6c93 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-10-25 19:59:23 +02:00
scrawl
6126b3b84a Videoplayer: wait until we have the first picture before returning from playVideo() 2014-10-25 17:27:25 +02:00
Marc Zinnschlag
a4be214fb1 Merge remote-tracking branch 'scrawl/master' 2014-10-25 12:08:16 +02:00
cc9cii
ea67cf0ebe Try the fix again. 2014-10-25 15:37:09 +11:00
cc9cii
e01795556f Suppress some warnings for MSVC. 2014-10-25 10:37:57 +11:00
scrawl
102103e37b Add possibly missing include for av_rescale_q 2014-10-25 00:14:51 +02:00
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
 2014-10-24 21:31:11 +02:00
scrawl
2a3627b5a8 avresample wrapper fix 2014-10-23 18:27:00 +02:00
scrawl
a9be8628b9 namespace fix, improve comment 2014-10-22 23:22:22 +02:00
scrawl
9da1c49276 Add missing header to CMakeLists, remove stale comment 2014-10-22 22:41:05 +02:00
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.
 2014-10-22 22:33:32 +02:00
sylar
964e42ab02 fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android 2014-10-11 21:21:23 +04:00
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) 2014-10-01 17:54:18 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
319f4e0547 Bind to scancodes instead of keycodes 2014-09-13 20:39:59 +02:00
scrawl
24e5a90bab Fix crash when input settings contain extra channels 2014-09-03 02:15:58 +02:00
scrawl
7f95e1e6c2 Don't warn about SDL_CLIPBOARDUPDATE events 2014-09-02 15:16:26 +02:00
Corporama
ccca6db865 Compile fixes for Linux 2014-08-30 23:11:09 +02:00
scrawl
3d47f2ceb0 Fix bad indentation 2014-08-26 03:06:29 +02:00
scrawl
7b2070de5a unloadUnreferencedMaterials: Properly unload materials instead of removing techniques 2014-08-18 19:23:16 +02:00
scrawl
fc0465eeb0 Add missing header to CMakeLists 2014-08-09 15:42:54 +02:00
scrawl
c5a9cd0aa1 Sync upstream changes to shiny 2014-08-06 20:13:58 +02:00
root
3cd98e5259 fix code v5 2014-09-06 02:02:39 +04:00
root
d8772156a7 fixe all code v 2 2014-08-06 00:46:21 +04:00
root
9757ad4031 fixed code 2014-09-04 23:27:14 +04:00
root
8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 2014-09-04 22:47:03 +04:00
root
7cd2d4809c android-build 2014-08-04 19:50:53 +04:00
scrawl
d7acb7fc7d Ignore invalid shader cache index (Bug #1664) 2014-07-27 20:33:45 +02:00
scrawl
07cfa2abd5 Set texture unit indices for GLSL ES 2014-07-24 02:17:44 +02:00
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 2014-07-05 15:41:40 +10:00
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.
 2014-06-23 01:13:30 -05:00
scrawl
162549b7af Remove a wrong comment 2014-06-13 22:23:24 +02:00
scrawl
fcab53b3f7 Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified 2014-06-13 22:21:44 +02:00
Marc Zinnschlag
2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 2014-06-12 12:54:39 +02:00
cc9cii
36e380c6be Merge remote-tracking branch 'upstream/master' 2014-06-11 21:58:10 +01:00
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.
 2014-06-11 19:47:42 +02:00
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.
 2014-06-07 20:08:29 -04:00
Fil Krynicki
97caa1f8a4 Alternative fix strategy by checking for binding state 2014-06-06 22:25:23 -04:00
cc9cii
fd758bacd3 Remove #ifdef guards. 2014-06-06 19:58:05 +10:00
cc9cii
76bf774485 Small changes for compiling with MSVC 2013. 2014-06-06 03:52:41 +10:00
Fil Krynicki
bbb7ceab43 Merge branch 'master' into bug1196jumpdialog 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-05-31 19:58:21 -04:00
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.
 2014-05-31 19:51:21 -04:00
Marc Zinnschlag
be88168e91 Merge remote-tracking branch 'scrawl/master' 2014-05-30 10:07:18 +02:00
scrawl
afc1fa49f6 Use mouse release instead of press for binding actions 
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
 2014-05-29 20:35:57 +02:00
cc9cii
bbe77d656a Minor fixes from static analysis. 2014-05-28 21:15:50 +10:00
greye
663d5c314e be more verbose on change reasons 2014-05-22 16:35:57 +04:00
greye
3721174ae4 proof-of-concept boost::wave iteration policy 2014-05-21 23:50:58 +04:00
greye
1b7ed98325 fix typos, reset memory before using 2014-05-20 12:41:45 +04:00
greye
a46662043a tinyxml convert path to UTF-16 on Windows 2014-05-20 09:17:32 +04:00
scrawl
eff648e3ab Show unhandled SDL events in hexadecimal (easier to compare with the enum) 2014-05-03 16:16:27 +02:00
scrawl
e7b9b6d87a Fix a confusing variable name 2014-05-02 23:07:01 +02:00
scrawl
a3dffd5d57 Add some missing SDL to MyGUI key translations. 
Most importantly to allow numpad enter as alternative to return key.
 2014-04-18 14:13:29 +02:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
cc9cii
5539c75ef0 Typo fix to avoid divide by zero. 2014-03-05 22:12:59 +11:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
scrawl
c004fb778f Get rid of underscore defines. They are reserved by the standard. 2014-01-05 18:22:29 +01:00
scrawl
6d27ebabb6 Integrate AddGlow with material controllers 2013-12-26 20:53:45 +01:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/main.cpp
 2013-12-16 13:35:31 +01:00
scrawl
4bc4af6bf0 Enable microcode caching for Ogre 1.9+ 2013-12-14 22:01:24 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
scrawl
bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 2013-11-29 20:06:54 +01:00
scrawl
7f735c2c4c Release and show the cursor when focus lost 2013-11-20 16:07:14 +01:00
scrawl
3452bd2e0b Add glow effect for enchanted items 2013-11-20 00:13:12 +01:00
Marc Zinnschlag
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +01:00
scrawl
c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 2013-11-05 03:02:28 +01:00
scrawl
e6960d915a Add simple Ogre widget 2013-11-02 02:51:38 +01:00
scrawl
2fb059e2fa Don't destroy the SDL window twice 2013-10-13 18:20:55 +02:00
Marc Zinnschlag
6f64b1b9db cmake option to use system tinyxml instead of embedded one 2013-09-13 15:11:17 +02:00
Marc Zinnschlag
b737d958e1 Merge remote-tracking branch 'kcat/master' 
Conflicts:
	extern/sdl4ogre/cursormanager.hpp
 2013-09-02 10:54:18 +02:00
Chris Robinson
1026e89810 Don't assume TexturePtr is a class 2013-08-29 17:41:20 -07:00
scrawl
f12d5b728a Ogre 1.9 compatibility changes 2013-08-29 17:14:25 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
scrawl
6dc216af3d Fix a typo, caused occasional white spots on local map render 2013-08-09 21:29:43 +02:00
Nikolay Kasyanov
e7500b22ba Fixed listener call issue spotted by @scrawl 2013-08-01 07:16:00 -07:00
Marc Zinnschlag
b8cd3f3915 Merge remote-tracking branch 'corristo/master' 2013-08-01 09:06:34 +02:00
Nikolay Kasyanov
3849c8488c Use SDL_False instead of -1 2013-08-01 10:54:53 +04:00
Nikolay Kasyanov
4e9ef31375 Added missing(?) break 2013-08-01 10:53:28 +04:00
Nikolay Kasyanov
98216544de screw tabs 2013-08-01 10:52:50 +04:00
Marc Zinnschlag
130141ecac Merge remote-tracking branch 'corristo/master' 2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
e552eccaa4 Fixed endless message loop after trying to resize window on OS X 2013-07-31 23:26:46 +04:00
Nikolay Kasyanov
66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 2013-07-31 22:30:52 +04:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
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. 2013-07-07 20:22:41 +02:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +02:00
scrawl
b16c92c2f5 Better handle SDL_TEXTINPUT events 2013-06-16 19:43:59 +02:00
scrawl
03682184c6 Enable SDL_TEXTINPUT events only when a text input widget currently has key focus 2013-06-16 18:06:55 +02:00
scrawl
88acebf808 Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts 2013-06-16 17:10:30 +02:00
scrawl
5252ffa104 More cleanup 2013-06-15 17:06:27 +02:00
scrawl
6958940131 Ignore repeated keystrokes, except for text input events 2013-06-15 16:15:45 +02:00
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 2013-06-15 15:33:47 +02:00
scrawl
4fb32f7f05 Moved window resize messages to sdlinputwrapper 2013-06-15 13:22:29 +02:00
scrawl
14a2a26a56 Fullscreen resizing fix 2013-06-12 20:08:55 +02:00
scrawl
403704b92a Use openmw.png for SDL_SetWindowIcon 2013-06-12 16:15:04 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
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
 2013-06-12 12:34:33 +02:00
scrawl
1e7cf4ae1c GLES2 experiment 2013-05-25 04:15:24 +02:00
scrawl
a54f8c7ee2 Removed an optimization that caused problems on 32 bit builds 2013-05-22 21:01:05 +02:00
scrawl
8845c0cee1 Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera. 2013-05-07 17:38:24 +02:00
scrawl
d6e9cb114e Forgot to add directory 2013-05-04 23:12:05 +02:00
scrawl
062ff189a2 Merge branch 'master' into memory 2013-05-04 23:04:33 +02:00
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>
 2013-05-04 07:53:03 +02:00
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) 2013-05-03 13:55:57 +02:00
scrawl
23b477a938 Fix normal maps with spaces in filename not getting loaded 2013-04-12 04:36:28 +02:00
scrawl
5625d73d84 Bump texture support 2013-04-03 17:16:34 +02:00
scrawl
7f8d659f3c Fix transparency sorting 2013-03-05 17:09:20 +01:00
scrawl
62c711d709 Small change to delete microcode cache more aggressively. 2013-02-11 02:28:02 +01:00
scrawl
814969dcae Cache integrity check uses relative paths, so that changing the build folder works without reset 2013-02-07 02:23:41 +01:00
scrawl
a7d910614f extern/shiny update: made caching more robust 2013-02-04 18:04:09 +01:00
scrawl
bf037b7d29 Removed problematic ModVertexAlpha method, now done in shader 2013-02-04 18:03:03 +01:00
Jordan Milne
10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 2013-01-13 23:38:46 -04:00
Jordan Milne
043e29c620 Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble) 2013-01-13 21:32:45 -04:00
Jordan Milne
b6ec64485c fix includes for Windows 2013-01-12 17:52:26 -04:00
Jordan Milne
eb08f407d3 Oops, remove resource leak in the input wrapper. 2013-01-12 15:38:22 -04:00
Jordan Milne
5a6589af01 extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start 2013-01-12 11:57:29 -04:00
scrawl
d71b583855 fix const cast, fix comment 2013-01-11 22:25:34 +01:00
Jordan Milne
651a654985 clean up our cursors during destruction 2013-01-11 10:09:26 -04:00
Jordan Milne
eeacb04fe2 Fully working hardware cursors (if you compile SDL2 with XCursor support) 2013-01-11 09:32:29 -04:00
Jordan Milne
f9b064d1bc add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully 2013-01-11 08:27:59 -04:00
Jordan Milne
1117105039 fix compile error with boost includes 2013-01-11 00:37:04 -04:00
Jordan Milne
a030c03513 support the printscreen button properly 2013-01-10 23:53:19 -04:00
Jordan Milne
403b6756f5 remove dependency on boost::locale, use system mouse position in in-game menus 2013-01-10 23:29:51 -04:00
Jordan Milne
601d79ef3f fix the mouse wheel in mygui 2013-01-10 17:59:49 -04:00
Jordan Milne
ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 2013-01-10 17:21:47 -04:00
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
 2013-01-09 06:10:05 -04:00