1b7966ca27
Can zoom in and out in third person view.
12 years ago
91e95e1404
Use the correct slash, chop or thrust animation
12 years ago
9536b5050b
Fixes weapon input to use A_Use instead of hardcoding to mouse button
12 years ago
ee47e99dad
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
12 years ago
f7b711aabe
bugfix
12 years ago
66eb82b363
oops again
12 years ago
33779ae23c
oops
12 years ago
d4739a451a
added ability to close container windows with the activation key
12 years ago
3947f44aa3
Porting old work
12 years ago
b16bc69479
Removed the no longer needed --debug switch
12 years ago
4fd7891d2c
Fix a message box issue
12 years ago
b16c92c2f5
Better handle SDL_TEXTINPUT events
12 years ago
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
12 years ago
5252ffa104
More cleanup
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
9331a6380c
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
12 years ago
4fb32f7f05
Moved window resize messages to sdlinputwrapper
12 years ago
9807eacb58
Removed obsolete OIS workaround
12 years ago
5984a15846
We don't need Carbon on OS X anymore
12 years ago
e5ddaaf676
Fix wrong indenting from my last commits.
12 years ago
df016778be
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
12 years ago
0880805559
Minor cleanup
12 years ago
aac3ada14b
Use mousewheel to turn book pages.
12 years ago
705488ddfb
Fix mouse movement events being discarded when there's more than one event in a frame
12 years ago
cc077eaba6
Fix mouse wheel triggering a click event in mygui
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
b5caa25e5c
Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.
12 years ago
4eede86ce6
Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.
12 years ago
7a2d1cd8ce
Security skill
12 years ago
6c6200efef
Merge remote-tracking branch 'zini/master' into animations
12 years ago
c41f119ba6
Added new game button
12 years ago
90e29c83c0
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
12 years ago
517dfb4d75
Bugfix #732 part 2
12 years ago
57f22c77c0
Bugfix #732 part 1
12 years ago
a120653c38
Implement handling weapon states
12 years ago
15a2eeebb8
Merge remote-tracking branch 'zini/master' into animations
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
12 years ago
5ff098b8fb
Fix quick keys being triggered when in UI mode
12 years ago
137017b325
Don't allow forcing vanity mode
12 years ago
6ca2b1af74
fix for turning animations playing when in vanity mode
12 years ago
2f52df22ce
Bugfix #553
12 years ago
822866b5ae
fixed autorun
12 years ago
f976eb5bd8
Improve mouselook scaling
12 years ago
8fd961bbac
Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't.
12 years ago
1a2daa3bc1
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
12 years ago
13c098266c
Pass player rotation through the movement settings
12 years ago
69099c11a2
Merge branch 'enchanting' into companion
12 years ago
b6f2b39a2f
Clear the movement and rotation vector when getting them
12 years ago
a723ad8f29
Don't allow toggling inventory or journal when a modal window is opened
12 years ago
51204f098e
Added soulgem dialog; made interactive message boxes not close the previous UI
12 years ago
ef72894b81
Merge remote-tracking branch 'scrawl/alwaysrun' into next
12 years ago
5b943a965f
Handle always run in the inputmanager, instead of using forced stance.
12 years ago
2d8f0949a4
Always run key (Y)
12 years ago
beab20cb42
Fix message boxes not opening if they opened as a result of object activation
12 years ago
285b4bf726
Allow zooming camera in vanity or preview mode with the mousewheel
12 years ago
268bb23590
Implemented sneaking animation
12 years ago
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
12 years ago
038c5c3e82
Merge remote-tracking branch 'mikesc/bug574'
12 years ago
3df34fb5cc
fix bug 574
12 years ago
369f881170
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
1a43d86d9e
Close messages boxes with the activation key (Bug #589 )
12 years ago
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
12 years ago
5c0c5854e8
Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not
12 years ago
b1fc68d44d
Merge branch 'master' into graphics
12 years ago
73d48a95f6
Add message box when the player tries to move when being overencumbered.
12 years ago
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
12 years ago
cd40d167ce
Merge remote-tracking branch 'chris/animation2'
12 years ago
dfe29db9cb
Fix bug #591 : Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)
12 years ago
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
bea460955d
Merge remote-tracking branch 'zini/next' into animation2
12 years ago
b52df83d84
Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again
12 years ago
31bfe62bbc
Merge remote-tracking branch 'scrawl/bug_562' into next
12 years ago
5a11ddc485
Pressing F1 again hides the quick keys menu.
12 years ago
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
12 years ago
c4f17f5596
playercontrols switch now disables activation in general (Chris' suggestion)
12 years ago
910858c300
Merge remote-tracking branch 'sergeyshambir/guiconvience' into next
12 years ago
6a49ea9b4f
Cleaning out some old bits
12 years ago
6a9755778e
Merge remote-tracking branch 'zini/next' into animation2
12 years ago
158c6fc9fa
pressing enter when a messagebox is prompting for "ok", will activate ok button
12 years ago
bba024d6ad
Right mouse button click now stops Container GuiMode.
12 years ago
ebc7bc9427
Rename A_AlwaysRun to A_Run
...
Note that there is an "always run" key, but its functionality is handled by
A_ToggleWalk.
12 years ago
a8f0ce43a5
Add a run key
12 years ago
31f760ccce
Fixing issues from last commit: restored input and occlusion queries
12 years ago
c4d518132f
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
12 years ago
3251796ba0
Fix left/right movement
12 years ago
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
12 years ago
5a6589af01
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
12 years ago
f9b064d1bc
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
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
cb01df49c0
begin to support text input
12 years ago
53cff0ba68
use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu
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
6b49b8ab47
MyGUI doesn't care for SDL's mouse button ordering, send it what it expects
12 years ago
3b1d285cf3
fix compile errors, work with unmodified SDL
12 years ago
6449f68d61
Merge branch 'master' into sdl_input
12 years ago
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
12 years ago
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
ddbe13e569
Workaround for http://bugs.openmw.org/issues/475
12 years ago
faad64b254
Esc cancels the video
12 years ago
5eb0f489e2
Issue 476: fixed auto-move bypassing disabled player controls
12 years ago
21e0cde914
changed OIS includes since OIS_INCLUDE_DIR is already an include directory
12 years ago
896428c129
enableRestMenu & enableLevelupMenu
12 years ago
76b494100e
finished?
12 years ago
2b339f6c0f
loading screen
12 years ago
9448ce5968
implemented "get<Control>Disabled" functions
12 years ago
760f05c454
the HUD can be toggled with F12 key; useful for screenshots
13 years ago
160b52162b
Merge remote-tracking branch 'scrawl/quick_keys'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
13 years ago
14b4263143
Merge remote-tracking branch 'scrawl/alttab'
13 years ago
dc8f9bd923
workaround for alt tab view mode toggle
13 years ago
9af0b48ad6
show/hide crosshair correctly
13 years ago
a4c1d979d6
Merge branch 'master' into quick_keys
13 years ago
c5e55d3cac
fix screenshot function
13 years ago
61923349e5
resolving conflicts
13 years ago
5ebcaeb098
Merge branch 'next' into quick_keys
13 years ago
b1a394552d
mouse click sounds
13 years ago
fab4cfecb1
some unfinished work on quick keys window
13 years ago
71a6ce2202
removed cout spam
13 years ago
5395721c26
more appropriate fix for #189
13 years ago
f7d537cb28
very small correction
13 years ago
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
13 years ago
d1656b2f5d
Merge remote-tracking branch 'greye/player_control'
...
Conflicts:
apps/openmw/mwrender/player.cpp
13 years ago
b8e56d61d3
update camera code, add idle time
13 years ago
3f3972eb3b
no vanity in gui mode (thanks scrawl)
13 years ago
d2b451eb7d
entering vanity mode
13 years ago
14f293882c
still resolving
13 years ago
83356d5505
resolving conflicts
13 years ago
7303d595dd
resolving conflicts
13 years ago
0e6e141fd4
camera control related script instructions
13 years ago
e8fc942bef
reverse Z-axis rotation to make doors happy
13 years ago
a453a7f035
camera adjustment, fix view mode on start
13 years ago
392e6efcb5
initial player rendering
13 years ago
6f87c0c36d
preview mode, advanced vanity support
13 years ago
fe1a9ac3c5
poor camera with some fixes
13 years ago
c46eeaa100
initial 3d-person camera support
13 years ago
f9efd543e4
use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1
13 years ago
67577c6192
UI cursor & camera sensitivity sliders
13 years ago
c7b8787c32
"reset to defaults" button, invert y axis button
13 years ago
bc6e4feedc
hotkey window first version
13 years ago
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
13 years ago
90f1d9c2f2
OSX suggestion by corristo
13 years ago
86d6f190bf
Input system rewrite
13 years ago
88e70cb5bd
Merge branch 'decouple'
13 years ago
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
13 years ago
0231533d05
Issue #107 : InputManager is accessed only through the interface class from now on
13 years ago
2ebf4721d1
small main menu fix
13 years ago
44ff31b50a
removed world exit methods
13 years ago
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
6b996d8c34
fix disabled camera on start
13 years ago
378fcc2460
fix DisablePlayerControl logic
13 years ago
1511eb3549
implemented enable/disable player looking switch
13 years ago
a2d87d5f5b
added camera flip control, fixed input rotation axis
13 years ago
ec9cf4d3c6
rotateObject() added, input system rewritten
13 years ago
16ad97610d
add support for some scripting player control switches
13 years ago
fe86ce5a2c
DrawState workaround
13 years ago
771863e73b
Issue #324 : Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue
13 years ago
14f4f09f83
proper resolution switching (reposition GUI & adjust mouse clipping region)
13 years ago
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
13 years ago
6ea7bdb224
vsync & fps buttons, sound volume apply fix
13 years ago
7ebbc099b3
allow stacking gui modes
13 years ago
313294c522
settings window (hotkey F2) which does nothing. Yay!
13 years ago
7fbee0d488
use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift
13 years ago
320cc7d020
implemented ctrl and shift-keys for item drag&drop (take all, take 1)
13 years ago
d266b4fe87
hide the cursor during drag&drop and don't allow hotkeys that change guimode
13 years ago
ad5753ba91
Merge branch 'master' of https://github.com/zinnschlag/openmw into gui
13 years ago
dd8c66b479
notification when screenshot was taken
13 years ago
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
4949576984
disable some player controls in gui mode
13 years ago
75b336baea
Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2
...
Conflicts:
apps/openmw/mwinput/inputmanager.cpp
apps/openmw/mwworld/player.cpp
libs/openengine/bullet/physic.cpp
13 years ago
1ce759af06
Merging in master
13 years ago
f2fae770d4
Merge branch 'master' into physicsaedra2
...
Conflicts:
apps/openmw/mwworld/player.cpp
13 years ago
e3486931ae
F10 hotkey toggle FPS
13 years ago
9e1a9e5758
Merge branch 'master' into physicsaedra2
...
Conflicts:
apps/openmw/mwinput/inputmanager.cpp
libs/openengine/bullet/physic.cpp
13 years ago
15526d6110
only fists support lacks
13 years ago
c1afd534fc
all stuff added
13 years ago
b4ee01e691
missing file
13 years ago
8bf9b371c7
removed remains of input framelistener
13 years ago
a3151fe525
fixed input handling priority in the main loop
13 years ago
18a139cd66
adding up and down move buttons
13 years ago
bc71fb47e0
minor fix
13 years ago
17b1546dc1
Changed the way screenshots are created (Bug #191 )
13 years ago
bc51ba5a38
Add the journal window (J key). It's still not in the right position.
13 years ago
64d6ee26bd
changed OGRE framelistener function from frameStarted to frameRenderingQueued
14 years ago
f773cf27cb
replaced old movement input system
14 years ago
36cb10572a
fixed tab problem
14 years ago
588e6e9995
Fixed a syntax error! Oops!
14 years ago
09023bb853
Toggle now toggles, conventions...
14 years ago
962b8c9781
Cleaned up inputmanager, tightened up player.exectueAutoMove()
14 years ago
1bc9a46c6b
Cleaned up and changed executeAutoMove()
14 years ago
90e6029bad
Fixed object reference error in player gets
14 years ago
1a56ef9a67
More AutoMove, now including walking - ready for a look and then test
14 years ago
5aec3815fd
The player should now be able to run AND walk...
14 years ago
f96f53484c
More AutoMove stuff, Sneak bools, cleaning
14 years ago
60c9c31c7a
Silly error Fixed in binding
14 years ago
bfcfcecab6
Most of AutoMove finished - just needs some speed in Player class.
14 years ago
3ab4a4487f
Sneak State, Bound Sneak and AutoMove, began outlining AutoMove
14 years ago
43c33ee85f
Merge remote branch 'zinnschlag/master'
14 years ago
e98eef8cd3
corrected grammar for merge
14 years ago
f01a3d5e35
split Player class into a MWWorld and a MWRender component
14 years ago
Kolzi
scrawl
gus
vorenon
Nikolay Kasyanov
Rohit Nirmal
Marc Zinnschlag
Chris Robinson
Glorf
Tom Mason
Michal Sciubidlo
Sergey Shambir
Jordan Milne
greye
Jason Hooks
Aleksandar Jovanov
Pieter van der Kloet
Star-Demon