vorenon
ed6098388f
return false instead of std::exit
2013-06-16 18:13:14 +02:00
vorenon
b97a051dc6
Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813
2013-06-16 18:12:09 +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
bc6d5de1f4
Merge branch 'sdl_input2' of github.com:scrawl/openmw into sdl_input2
2013-06-16 17:48:40 +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
Marc Zinnschlag
3e29506d5c
Merge remote-tracking branch 'vorenon/dialogue'
2013-06-16 17:03:50 +02:00
scrawl
c71da1a2ff
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
2013-06-16 15:01:09 +02:00
Nikolay Kasyanov
50e5aa8976
Custom rendering loop on OS X again. Prevents default Ogre message pump
...
from stealing input events.
2013-06-16 16:25:13 +04:00
vorenon
9ac4a9c5eb
Don't start OpenMW if no master file is selected. This fixes bug #813
2013-06-16 04:59:34 +02:00
vorenon
4c0086b54c
Workaround for bug #820
2013-06-16 01:09:03 +02:00
scrawl
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2013-06-15 17:41:42 +02:00
scrawl
5252ffa104
More cleanup
2013-06-15 17:06:27 +02:00
scrawl
289587b1a9
Cleanup
2013-06-15 16:29:25 +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
Marek Kochanowicz
c174f57a2f
Git changes show that it should upload all the files this time. Let's
...
hope…
2013-06-15 14:40:36 +02:00
graffy76
a5d9d3fd7a
Updated status icons from sirherrbatka
2013-06-15 07:29:20 -05:00
graffy76
97cfbc31b5
Merge color icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
2013-06-15 06:46:27 -05:00
graffy76
700d55f1fb
Fixed / implemented missing features for RecordStatusDelegate
...
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table
2013-06-15 06:40:18 -05:00
scrawl
9331a6380c
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05
Moved window resize messages to sdlinputwrapper
2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58
Removed obsolete OIS workaround
2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846
We don't need Carbon on OS X anymore
2013-06-15 14:47:33 +04:00
Nikolay Kasyanov
6abb7a18b0
SDL2 input: seems to work on OS X, has some input issues though
2013-06-15 14:40:18 +04:00
Nikolay Kasyanov
3fded2d8bf
Removed custom Carbon message pump
2013-06-15 13:55:09 +04:00
Nikolay Kasyanov
adf54cb735
SDL2 input: compilation fixed
2013-06-15 13:54:24 +04:00
Rohit Nirmal
e5ddaaf676
Fix wrong indenting from my last commits.
2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
2013-06-13 18:04:38 +02:00
scrawl
0880805559
Minor cleanup
2013-06-13 12:13:40 +02:00
Rohit Nirmal
9d4ecc3e73
replace tabs with spaces.
2013-06-13 00:52:26 -05:00
Rohit Nirmal
aac3ada14b
Use mousewheel to turn book pages.
2013-06-13 00:50:07 -05:00
scrawl
fcf35d3871
Removed the UI cursor sensitivity slider
2013-06-12 20:27:55 +02:00
scrawl
ab3634d692
Removed some remains of OIS
2013-06-12 20:13:19 +02:00
scrawl
14a2a26a56
Fullscreen resizing fix
2013-06-12 20:08:55 +02:00
scrawl
c29699487f
forgot to add file
2013-06-12 17:08:02 +02:00
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
2013-06-12 16:15:04 +02:00
scrawl
705488ddfb
Fix mouse movement events being discarded when there's more than one event in a frame
2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6
Fix mouse wheel triggering a click event in mygui
2013-06-12 15:10: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
Marc Zinnschlag
df1f1bd5c8
Merge remote-tracking branch 'glorf/cs-windows'
2013-06-12 10:58:08 +02:00
Glorf
548f4d683f
Globalization of user settings
2013-06-12 12:36:35 +02:00
Marc Zinnschlag
bd08677a7f
Merge branch 'openmw24'
2013-06-12 10:37:33 +02:00
Marc Zinnschlag
c891e529f3
Merge remote-tracking branch 'rohitnirmal/launcher-fix-rohit'
2013-06-12 10:32:53 +02:00
Rohit Nirmal
2fd4d71774
trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.
2013-06-11 23:00:12 -05:00
darkf
fc0f04324c
Remove some superfluous mSkyManager NULL checks
2013-06-11 20:56:40 -07:00
darkf
fb462f1b1a
launcher: Throw error if no data files are selected
2013-06-11 20:28:38 -07:00
darkf
fd25616cab
launcher: Properly quit if settings write fails.
2013-06-11 20:28:36 -07:00
Rohit Nirmal
fdeac21f22
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound
2013-06-11 21:36:00 -05:00
Rohit Nirmal
b5caa25e5c
Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.
2013-06-10 19:42:38 -05:00
