David Cernat
|
a236ffc4be
|
Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
|
7 years ago |
Capostrophic
|
1abf749f03
|
Remove screenshot taken message
|
7 years ago |
Miloslav Číž
|
dd00e438fe
|
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
|
7 years ago |
Miloslav Číž
|
7178ee3a6e
|
Add FIXME comment
|
7 years ago |
Miloslav Číž
|
d629c30fdb
|
Merge branch 'master' into screenshot360
|
7 years ago |
Miloslav Číž
|
dcfbd554bb
|
Remove try catch block
|
7 years ago |
David Cernat
|
e3c43c6af7
|
Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
|
7 years ago |
David Cernat
|
1c340568d2
|
[Client] Disallow resting if player has not finished chargen
Previously, players pressing T rapidly before logging in had the Wait screen show up for them.
|
7 years ago |
Capostrophic
|
41f89c84f8
|
Don't move the player if opposite direction keys are held down at the same time (Fixes #4233)
|
7 years ago |
Miloslav Číž
|
db6107f12f
|
Merge branch 'master' into screenshot360
|
7 years ago |
David Cernat
|
a7e3261b0b
|
Merge pull request #383 from OpenMW/master
Add OpenMW commits up to 11 Feb 2018
|
7 years ago |
scrawl
|
f28024b541
|
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons (Fixes #4225, Fixes #4320)
|
7 years ago |
David Cernat
|
5d4b97645d
|
Merge pull request #374 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/CMakeLists.txt
|
7 years ago |
scrawl
|
83726ee06a
|
Fix Reset Controls button not functioning properly
|
7 years ago |
David Cernat
|
14ef2fa791
|
Merge pull request #369 from OpenMW/master
Add OpenMW commits up to 9 Jan 2018
|
7 years ago |
Andrei Kortunov
|
dba071f881
|
Remove the 'Screenshot saved' message (bug #4191)
|
7 years ago |
David Cernat
|
cac2c6c1e8
|
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
|
7 years ago |
Miloslav Číž
|
a142a67972
|
Add default settings for 360 screenshots
|
7 years ago |
David Cernat
|
c9c363ebef
|
[General] Allow GameSettings to set bed & wilderness resting separately
|
7 years ago |
David Cernat
|
22521578eb
|
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
|
7 years ago |
David Cernat
|
3508a16836
|
[General] Use GameSettings packet to set ability to rest and wait
|
7 years ago |
Andrei Kortunov
|
dea7d0beff
|
Do not interrupt swim and sneak idle animations during attack (bug #4122)
|
7 years ago |
Miloslav Číž
|
902862aa8b
|
display confirming message for all screenshots
|
7 years ago |
Miloslav Číž
|
1ab854446c
|
remove unused include
|
7 years ago |
Miloslav Číž
|
511a5686da
|
planet mapping adjustment
|
7 years ago |
Miloslav Číž
|
4fc532d873
|
reference screenshot settings only from one place
|
7 years ago |
Miloslav Číž
|
d71d984cfa
|
more unused stuff cleanup
|
7 years ago |
Miloslav Číž
|
525f8b4d8e
|
get rid of special key for 360 screenshot
|
7 years ago |
David Cernat
|
01db219de4
|
Merge pull request #333 from OpenMW/master
Add OpenMW commits up to 11 Nov 2017
|
7 years ago |
scrawl
|
f1aeb416ec
|
Disable Activate key when textinput is active (Bug #4151)
|
7 years ago |
scrawl
|
1afbf99f74
|
Make movement keys not function in text input mode
|
7 years ago |
Miloslav Číž
|
319ed2f9b8
|
disable 360 screenshots in vanity/preview mode
|
7 years ago |
Miloslav Číž
|
d763e9fe46
|
add settings for spherical screenshots
|
7 years ago |
Miloslav Číž
|
8f32114025
|
segfault fix
|
7 years ago |
Miloslav Číž
|
d4fd08a63f
|
save 360 screenshots in the configured directory
|
7 years ago |
Miloslav Číž
|
1b97a541f4
|
make a new action for 360 screenshot
|
7 years ago |
Miloslav Číž
|
5afe02505b
|
hide player in first person 360 screenshot
|
7 years ago |
Miloslav Číž
|
7feba7e498
|
basic setup for 360 screenshots
|
7 years ago |
David Cernat
|
e164e6305e
|
Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
7 years ago |
scrawl
|
548e90a7bc
|
Set cursor active when moving by controller
|
7 years ago |
David Cernat
|
38247ff086
|
Merge pull request #303 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
|
7 years ago |
scrawl
|
cd437f094d
|
Fix exiting savegamedialog with 'esc' when no game is running
|
7 years ago |
scrawl
|
0240a6c38b
|
Fix controls window regression
|
7 years ago |
scrawl
|
74e806d974
|
Additionally use movement keys (default WASD) to navigate GUI buttons
|
7 years ago |
scrawl
|
fce9a14986
|
Hide the mouse cursor until it's used
|
7 years ago |
scrawl
|
09e93319f5
|
Restrict the 'fake mouse movement' workaround to where it's actually required (Fixes #3978)
|
7 years ago |
scrawl
|
ad8d0c5302
|
Use keypad to control the camera
|
7 years ago |
scrawl
|
ca3b08b852
|
Make Activate key accept GUI buttons
|
7 years ago |
scrawl
|
9ed1b16553
|
Extend code that detects whether a key was consumed by the GUI (Fixes #4016)
|
7 years ago |
scrawl
|
ad4b91131f
|
toggleGui renamed to toggleHud, remove unused variable
|
7 years ago |