1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
28c63aea72
Uses FindTinyXML to find package
9 years ago
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
9 years ago
a1f323f528
Fix build against OSG 3.5.3
9 years ago
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
2c90b0b78d
fix a few spelling mistakes
9 years ago
0e75b4a234
Remove warning about */ outside of comment
9 years ago
48047beb9a
Stripped OSG mouse and keyboard handling.
9 years ago
80392775ef
Fix copy&paste error
9 years ago
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
06f9922822
Performance improvements for loading Info records.
...
- The order of info records with the same topic are maintained in Collection::mRecords
- The index lookup data structure are not ordered. The topic string is hashed. The infos for the topic are simply placed in a vector.
- The index values for appending or inserting a record takes prev/next values (if exist)
- FIXME: prev/next values are not adjusted for adding or removing records
- FIXME: undo after reordering does not reset the modified flag
9 years ago
3ea3d07d44
really purge libav
9 years ago
39f89f967b
from kcat: We can't simply get rid of this, otherwise it may break for certain kinds of packets.
9 years ago
8d2990cc03
add support for ffmpeg29 thanks to Andreas Cadhalpun; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803848
9 years ago
fcb9068c19
Fix tab indentations in apps/ and components/
...
(cherry picked from commit a47617c21f
9 years ago
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
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
609e146a22
Build fixes for windows
10 years ago
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
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
e6ecb39d94
Potential include fix
10 years ago
7ac4b2bb66
Fix for travis build issue
10 years ago
60ad568004
Another missing include
10 years ago
7991ea25c0
Potentially missing includes
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
4d5c446a44
Minor cleanup
10 years ago
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
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
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
39fb46601a
Readded input & event handling
10 years ago
7a2a7633d5
Fix videoplayer destruction issue that valgrind complained about
10 years ago
00f4f78717
Give a name to video streams for logging purposes
10 years ago
b0804734e5
Port VideoWidget
10 years ago
96d9afec38
More header case fixes
10 years ago
c61919501d
Fix unnecessary include, ssize_t define and use pretty function instead of funcsig for mingw
10 years ago
de247ec94b
Fix ifdef
10 years ago
c53a56ed6e
clear stream errors before attempting the read
10 years ago
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
168c0d9b39
Dead code removal
10 years ago
42f6d9e15b
Port video player
10 years ago
af67de73a5
Delete shiny
10 years ago
1d7f3474fa
Fixed more MSVC 2013 warnings.
10 years ago
e2ef8c4022
fix -Wnewline-eof warnings
10 years ago
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
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
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
10 years ago
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
5a47b7ae6e
Warning fix
10 years ago
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
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
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
10 years ago
1e4a845b6f
Minor code cleanup
10 years ago
0c6e2170db
Include cleanup
10 years ago
fec8cf91f5
Add exception handling to various uses of DataStream::read
10 years ago
472165097d
Warning fix
10 years ago
60f722b0a9
Treat the first mouse motion event as non-relative
...
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
10 years ago
6b2df95167
Fix for some coverity defects
10 years ago
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
e076e8a9bd
Fixed error when downgrading openmw versions
10 years ago
bb6ed06a4e
read gamecontrollerdb file location from settings file
10 years ago
a7a211860a
Fixed binding controls to A on joystick
10 years ago
ad54e09593
Inital value for joysticks is 0.5
10 years ago
c37881ead1
Joystick Support
10 years ago
ad38345de4
Clean up listener in destruction of OgrePlatform ( Fixes #2145 )
10 years ago
17cb181f88
Use av_get_default_channel_layout for unknown channel layouts
10 years ago
dc6a99d32a
Add missing virtual destructor
10 years ago
4680bc6c93
Merge branch 'master' of https://github.com/OpenMW/openmw
10 years ago
6126b3b84a
Videoplayer: wait until we have the first picture before returning from playVideo()
10 years ago
a4be214fb1
Merge remote-tracking branch 'scrawl/master'
10 years ago
ea67cf0ebe
Try the fix again.
10 years ago
e01795556f
Suppress some warnings for MSVC.
10 years ago
102103e37b
Add possibly missing include for av_rescale_q
10 years ago
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
2a3627b5a8
avresample wrapper fix
10 years ago
a9be8628b9
namespace fix, improve comment
10 years ago
9da1c49276
Add missing header to CMakeLists, remove stale comment
10 years ago
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
964e42ab02
fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android
10 years ago
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
7252cb63a6
Fix cppcheck issues
10 years ago
319f4e0547
Bind to scancodes instead of keycodes
10 years ago
24e5a90bab
Fix crash when input settings contain extra channels
10 years ago
7f95e1e6c2
Don't warn about SDL_CLIPBOARDUPDATE events
10 years ago
ccca6db865
Compile fixes for Linux
10 years ago
3d47f2ceb0
Fix bad indentation
10 years ago
7b2070de5a
unloadUnreferencedMaterials: Properly unload materials instead of removing techniques
11 years ago
fc0465eeb0
Add missing header to CMakeLists
11 years ago
c5a9cd0aa1
Sync upstream changes to shiny
11 years ago
3cd98e5259
fix code v5
10 years ago
d8772156a7
fixe all code v 2
11 years ago
9757ad4031
fixed code
10 years ago
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
10 years ago
7cd2d4809c
android-build
11 years ago
d7acb7fc7d
Ignore invalid shader cache index (Bug #1664 )
11 years ago
07cfa2abd5
Set texture unit indices for GLSL ES
11 years ago
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
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
162549b7af
Remove a wrong comment
11 years ago
fcab53b3f7
Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified
11 years ago
2eebb0bf73
Merge remote-tracking branch 'scrawl/master'
11 years ago
36e380c6be
Merge remote-tracking branch 'upstream/master'
11 years ago
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
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
97caa1f8a4
Alternative fix strategy by checking for binding state
11 years ago
fd758bacd3
Remove #ifdef guards.
11 years ago
76bf774485
Small changes for compiling with MSVC 2013.
11 years ago
bbb7ceab43
Merge branch 'master' into bug1196jumpdialog
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
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
be88168e91
Merge remote-tracking branch 'scrawl/master'
11 years ago
afc1fa49f6
Use mouse release instead of press for binding actions
...
Resolves difficulties binding actions to mouse buttons (Fixes #1364 )
11 years ago
bbe77d656a
Minor fixes from static analysis.
11 years ago
663d5c314e
be more verbose on change reasons
11 years ago
3721174ae4
proof-of-concept boost::wave iteration policy
11 years ago
1b7ed98325
fix typos, reset memory before using
11 years ago
a46662043a
tinyxml convert path to UTF-16 on Windows
11 years ago
eff648e3ab
Show unhandled SDL events in hexadecimal (easier to compare with the enum)
11 years ago
e7b9b6d87a
Fix a confusing variable name
11 years ago
a3dffd5d57
Add some missing SDL to MyGUI key translations.
...
Most importantly to allow numpad enter as alternative to return key.
11 years ago
edb5a54092
Include some more required Ogre headers explicitely.
11 years ago
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
11 years ago
5539c75ef0
Typo fix to avoid divide by zero.
11 years ago
439018e706
Get rid of useless return values
11 years ago
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
11 years ago
6d27ebabb6
Integrate AddGlow with material controllers
11 years ago
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
11 years ago
4bc4af6bf0
Enable microcode caching for Ogre 1.9+
11 years ago
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
11 years ago
7f735c2c4c
Release and show the cursor when focus lost
11 years ago
3452bd2e0b
Add glow effect for enchanted items
11 years ago
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
11 years ago
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
11 years ago
e6960d915a
Add simple Ogre widget
11 years ago
2fb059e2fa
Don't destroy the SDL window twice
11 years ago
6f64b1b9db
cmake option to use system tinyxml instead of embedded one
11 years ago
b737d958e1
Merge remote-tracking branch 'kcat/master'
...
Conflicts:
extern/sdl4ogre/cursormanager.hpp
11 years ago
1026e89810
Don't assume TexturePtr is a class
11 years ago
f12d5b728a
Ogre 1.9 compatibility changes
12 years ago
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
12 years ago
6dc216af3d
Fix a typo, caused occasional white spots on local map render
12 years ago
e7500b22ba
Fixed listener call issue spotted by @scrawl
12 years ago
b8cd3f3915
Merge remote-tracking branch 'corristo/master'
12 years ago
3849c8488c
Use SDL_False instead of -1
12 years ago
4e9ef31375
Added missing(?) break
12 years ago
98216544de
screw tabs
12 years ago
130141ecac
Merge remote-tracking branch 'corristo/master'
12 years ago
e552eccaa4
Fixed endless message loop after trying to resize window on OS X
12 years ago
66608d5c92
Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre
12 years ago
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
6164e5bae6
Restored window resizing
12 years ago
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
b16bc69479
Removed the no longer needed --debug switch
12 years ago
b16c92c2f5
Better handle SDL_TEXTINPUT events
12 years ago
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
12 years ago
88acebf808
Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts
12 years ago
5252ffa104
More cleanup
12 years ago
6958940131
Ignore repeated keystrokes, except for text input events
12 years ago
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
4fb32f7f05
Moved window resize messages to sdlinputwrapper
12 years ago
14a2a26a56
Fullscreen resizing fix
12 years ago
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
12 years ago
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
1e7cf4ae1c
GLES2 experiment
12 years ago
a54f8c7ee2
Removed an optimization that caused problems on 32 bit builds
12 years ago
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
12 years ago
d6e9cb114e
Forgot to add directory
12 years ago
062ff189a2
Merge branch 'master' into memory
12 years ago
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
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
23b477a938
Fix normal maps with spaces in filename not getting loaded
12 years ago
5625d73d84
Bump texture support
12 years ago
7f8d659f3c
Fix transparency sorting
12 years ago
62c711d709
Small change to delete microcode cache more aggressively.
12 years ago
814969dcae
Cache integrity check uses relative paths, so that changing the build folder works without reset
12 years ago
a7d910614f
extern/shiny update: made caching more robust
12 years ago
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
12 years ago
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
12 years ago
043e29c620
Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)
12 years ago
b6ec64485c
fix includes for Windows
12 years ago
eb08f407d3
Oops, remove resource leak in the input wrapper.
12 years ago
5a6589af01
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
12 years ago
d71b583855
fix const cast, fix comment
12 years ago
651a654985
clean up our cursors during destruction
12 years ago
eeacb04fe2
Fully working hardware cursors (if you compile SDL2 with XCursor support)
12 years ago
f9b064d1bc
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
12 years ago
1117105039
fix compile error with boost includes
12 years ago
a030c03513
support the printscreen button properly
12 years ago
403b6756f5
remove dependency on boost::locale, use system mouse position in in-game menus
12 years ago
601d79ef3f
fix the mouse wheel in mygui
12 years ago
ed644259ce
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
12 years ago
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
f85679db93
Merge branch 'master' into sdl_input
12 years ago
00a2a5c358
remove some more of my mess
12 years ago
3b1d285cf3
fix compile errors, work with unmodified SDL
12 years ago
e18cf452d4
Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012
12 years ago
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
12 years ago
Koncord
Roman Proskuryakov
Aesylwinn
scrawl
Bret Curtis
cc9cii
Marc Zinnschlag
Rohit Nirmal
k1ll
dteviot
Scott Howard
Digmaster
sylar
Corporama
root
slothlife
Fil Krynicki
greye
Lukasz Gromanowski
Chris Robinson
Nikolay Kasyanov
Jordan Milne