Commit Graph

228 Commits (7c2afc43f4cac1c55f149e37a33a68edae16e937)

Author SHA1 Message Date
scrawl 3a3f2a37c8 Add cut, copy & paste of text 11 years ago
Marc Zinnschlag 0f1c4cb00e cleanup 11 years ago
Berulacks 91d7291c0c Switched to using proper enums as opposed to ints. 11 years ago
Berulacks 0c518fb047 Replaced tabs with spaces. 11 years ago
Berulacks c423479f20 Fixed bug #887 11 years ago
Xethik 58bb0b8773 Bug #907
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
11 years ago
scrawl d3d6dfbde8 Refactored loading screen
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
12 years ago
Chris Robinson eab4e09566 Handle the pick/probe in the character controller 12 years ago
Emanuel Guevel 71da2f0a12 Do not allow magic/combat stance unless magic/inventory window are accessible 12 years ago
scrawl f1f6336a4a Fixed screenshot keybinding, and make it bindable 12 years ago
Sebastian Wick 7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 12 years ago
scrawl 6164e5bae6 Restored window resizing 12 years ago
Marc Zinnschlag ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2'
Conflicts:
	apps/openmw/mwrender/animation.cpp
12 years ago
Kolzi 1b7966ca27 Can zoom in and out in third person view. 12 years ago
scrawl 91e95e1404 Use the correct slash, chop or thrust animation 12 years ago
scrawl 9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 12 years ago
gus 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
gus f7b711aabe bugfix 12 years ago
vorenon 66eb82b363 oops again 12 years ago
vorenon 33779ae23c oops 12 years ago
vorenon d4739a451a added ability to close container windows with the activation key 12 years ago
gus 3947f44aa3 Porting old work 12 years ago
scrawl b16bc69479 Removed the no longer needed --debug switch 12 years ago
scrawl 4fd7891d2c Fix a message box issue 12 years ago
scrawl b16c92c2f5 Better handle SDL_TEXTINPUT events 12 years ago
scrawl 4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
12 years ago
scrawl 5252ffa104 More cleanup 12 years ago
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 12 years ago
scrawl 9331a6380c Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 12 years ago
scrawl 4fb32f7f05 Moved window resize messages to sdlinputwrapper 12 years ago
Nikolay Kasyanov 9807eacb58 Removed obsolete OIS workaround 12 years ago
Nikolay Kasyanov 5984a15846 We don't need Carbon on OS X anymore 12 years ago
Rohit Nirmal e5ddaaf676 Fix wrong indenting from my last commits. 12 years ago
Marc Zinnschlag df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 12 years ago
scrawl 0880805559 Minor cleanup 12 years ago
Rohit Nirmal aac3ada14b Use mousewheel to turn book pages. 12 years ago
scrawl 705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 12 years ago
scrawl cc077eaba6 Fix mouse wheel triggering a click event in mygui 12 years ago
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
12 years ago
Rohit Nirmal b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 12 years ago
Rohit Nirmal 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
scrawl 7a2d1cd8ce Security skill 12 years ago
Chris Robinson 6c6200efef Merge remote-tracking branch 'zini/master' into animations 12 years ago
scrawl c41f119ba6 Added new game button 12 years ago
Chris Robinson 90e29c83c0 Merge remote-tracking branch 'zini/master' into animations
Conflicts:
	apps/openmw/mwmechanics/character.cpp
12 years ago
Glorf 517dfb4d75 Bugfix #732 part 2 12 years ago
Glorf 57f22c77c0 Bugfix #732 part 1 12 years ago
Chris Robinson a120653c38 Implement handling weapon states 12 years ago
Chris Robinson 15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
12 years ago
scrawl 5ff098b8fb Fix quick keys being triggered when in UI mode 12 years ago