Commit Graph

396 Commits (13e7504348004d7dbf5645d3487787d57babcc13)

Author SHA1 Message Date
David Cernat b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
7 years ago
Andrei Kortunov a5b01fefec Allow to interrupt an attack, if attack button is held 7 years ago
David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
Andrei Kortunov fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 7 years ago
David Cernat 8f543fb34e [Client] Use less exploitable way of disabling console
Previously, large framerate drops allowed players to open and use the console for short periods of time.
7 years ago
Andrei Kortunov 23bda7613b Do not allow to use journal in a main menu (bug #3991) 8 years ago
David Cernat e3929df38a Merge pull request #239 from OpenMW/master
Add OpenMW commits up to 14 Jul 2017
8 years ago
Andrei Kortunov 54b4d93f79 Added a special function for GUI sounds playing 8 years ago
David Cernat 77758596a1 Merge pull request #230 from OpenMW/master
Add OpenMW commits up to 25 Jun 2017
8 years ago
scrawl 8d17565efd Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900) 8 years ago
scrawl 903e59f495 Don't reset idle time when there is no camera movement (Fixes #3902) 8 years ago
scrawl 44e2089098 Don't play 'menu click' sound for right clicks (Fixes #3919) 8 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
Bret Curtis d48b829b45 replace and purge boost::lexical_cast 8 years ago
David Cernat a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 8 years ago
David Cernat 7647715dac Merge pull request #190 from OpenMW/master
Add OpenMW commits up to 27 Mar 2017
8 years ago
Andrei Kortunov 658ab5e941 Minor journal improvements 8 years ago
David Cernat df051a777a Merge pull request #181 from OpenMW/master
Add OpenMW commits up to 4 Mar 2017
8 years ago
scrawl 7eb48ea83b Don't wrap mouse to window bounds when the gamepad axis did not move and fix off-by-one error 8 years ago
scrawl 2776727794 Allow gamepad and mouse/keyboard to be used at the same time (Fixes #3093) 8 years ago
David Cernat ad3eac624f [Client] Disable quicksaving and quickloading 8 years ago
David Cernat 27242cdab9 Merge pull request #142 from OpenMW/master
Add OpenMW commits up to 6 Feb 2017
8 years ago
scrawl e7b6ea4e3f Add cycle weapon/spell actions to the list of controller actions (Fixes #3613) 8 years ago
Koncord b9c3849cc7 Change keycode to scancode 8 years ago
David Cernat 3a733eb122 Make tes3mp includes consistent 8 years ago
David Cernat fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 8 years ago
David Cernat 47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
8 years ago
MiroslavR 301dd77efb Save controls state (Fixes #3598) 8 years ago
Aesylwinn b4a000913c Merge remote-tracking branch 'yar/master' into Even
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
9 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
9 years ago
scrawl f417d7780a Fix the enemy nearby check (Bug #3423) 9 years ago
scrawl 7a962fd8c5 Properly escape the keybinding labels (Bug #3281)
A certain key name ("#") was being interpreted as a MyGUI markup code.
9 years ago
scrawl 53334d08a2 Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100) 9 years ago
scrawl a8c287c831 Print detected game controllers to the log file 9 years ago
scrawl 3fe38e3556 Remove unused setting 9 years ago
scrawl 0ec56d321a Remove unneeded using namespace 9 years ago
scrawl 05498ad592 Refactor: InputManager no longer depends on Engine 9 years ago
scrawl a47617c21f Fix tab indentations in apps/ and components/ 9 years ago
scrawl d11952c48a Stop rendering when the window is minimized 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
Rohit Nirmal d9b11f963a Gamepad: Slow down simulated mouse with right trigger
in menus.
10 years ago
scrawl 6691891bee Include cleanup 10 years ago
scrawl a1432b0255 Move attackingOrSpell flag to the CharacterController 10 years ago
scrawl 15453e3d90 Use MyGUI::UString for unicode conversion 10 years ago
scrawl da24e298ee Fix -Wreorder warnings 10 years ago
scrawl 49df07ea7f Implement UI scaling factor 10 years ago
scrawl 5442bf23a6 Apply video mode & gamma setting changes 10 years ago
scrawl 39fb46601a Readded input & event handling 10 years ago
scrawl c31b416ba1 Move physicssystem to a new mwphysics module 10 years ago
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
10 years ago