Commit Graph

365 Commits (openmw-39)

Author SHA1 Message Date
scrawl f2cd37edd0 Play company logo movie 11 years ago
scrawl 5906d795c0 Refactored video player (now a MyGUI widget) 11 years ago
scrawl 6eaa7553f8 Fixes #1181: Enable controls when loading a savegame 11 years ago
scrawl 12de0afb03 Feature #50: Spawn projectiles
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
11 years ago
Marc Zinnschlag f9d2fde783 Merge branch 'openmw-29'
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
11 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 11 years ago
scrawl 439018e706 Get rid of useless return values 11 years ago
Emanuel Guevel 3d8ca02479 Fix breaking of enchanted items casting 11 years ago
Emanuel Guevel a3eea4f6b6 Do not allow spellcasting stance without spell selected 11 years ago
scrawl 4a26909172 Fixes #1159: Don't allow quick keys menu in chargen 11 years ago
scrawl 1deb0a7cdf Savegame dialog: Set key focus to editbox 11 years ago
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
11 years ago
scrawl 39d86a9468 Improvements to smooth NPC steering 11 years ago
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
mrcheko 87e83a92f8 refactoring of setting an attack type 11 years ago
scrawl d01f89b153 Rewrite some awful code 11 years ago
scrawl d7f69205f6 Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 62774fcc4a Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
11 years ago
scrawl c004fb778f Get rid of underscore defines. They are reserved by the standard. 11 years ago
scrawl 1b96c5d266 Console improvements: Show scrollbar, allow copying text from the history 11 years ago
scrawl 09d491d1ba Move a piece of functionality to its appropriate place 11 years ago
scrawl c0fbcf413f Use the playermagic and playerfighting control switches 11 years ago
scrawl 899214a906 Use fVanityDelay 11 years ago
scrawl 04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 11 years ago
scrawl d09a86e208 Issue #1018: Don't allow view mode switching while performing an action 11 years ago
mrcheko f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 11 years ago
mrcheko fd9f8c34f6 bug fix http://bugs.openmw.org/issues/428 11 years ago
Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
11 years ago
scrawl bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 11 years ago
scrawl 7f735c2c4c Release and show the cursor when focus lost 11 years ago
Marc Zinnschlag a19242b4ec fixed expression in if statement 11 years ago
vorenon b2d2a3dd17 Closing message boxes with numpad enter 11 years ago
Marc Zinnschlag f19973450f moved exit game flag from Environment to StateManager 11 years ago
scrawl d619d0fa25 Don't grab the cursor while the console is opened 11 years ago
scrawl c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 11 years ago
scrawl 4f35fd8184 Removed a workaround from Renderer, some cleanup 11 years ago
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
Chris Robinson 137017b325 Don't allow forcing vanity mode 12 years ago
Tom Mason 6ca2b1af74 fix for turning animations playing when in vanity mode 12 years ago
Glorf 2f52df22ce Bugfix #553 12 years ago
Tom Mason 822866b5ae fixed autorun 12 years ago
Chris Robinson f976eb5bd8 Improve mouselook scaling 12 years ago
scrawl 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
scrawl 1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 12 years ago
Chris Robinson 13c098266c Pass player rotation through the movement settings 12 years ago
scrawl 69099c11a2 Merge branch 'enchanting' into companion 12 years ago
Chris Robinson b6f2b39a2f Clear the movement and rotation vector when getting them 12 years ago
scrawl a723ad8f29 Don't allow toggling inventory or journal when a modal window is opened 12 years ago
scrawl 51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 12 years ago
Marc Zinnschlag ef72894b81 Merge remote-tracking branch 'scrawl/alwaysrun' into next 12 years ago
scrawl 5b943a965f Handle always run in the inputmanager, instead of using forced stance. 12 years ago
scrawl 2d8f0949a4 Always run key (Y) 12 years ago
scrawl beab20cb42 Fix message boxes not opening if they opened as a result of object activation 12 years ago
scrawl 285b4bf726 Allow zooming camera in vanity or preview mode with the mousewheel 12 years ago
scrawl 268bb23590 Implemented sneaking animation 12 years ago
scrawl 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
Marc Zinnschlag 038c5c3e82 Merge remote-tracking branch 'mikesc/bug574' 12 years ago
Michal Sciubidlo 3df34fb5cc fix bug 574 12 years ago
scrawl 369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
vorenon 1a43d86d9e Close messages boxes with the activation key (Bug #589) 12 years ago
scrawl 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
scrawl 5c0c5854e8 Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not 12 years ago
scrawl b1fc68d44d Merge branch 'master' into graphics 12 years ago
scrawl 73d48a95f6 Add message box when the player tries to move when being overencumbered. 12 years ago
scrawl cacdb33b42 Merge branch 'master' into graphics
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
12 years ago
Marc Zinnschlag cd40d167ce Merge remote-tracking branch 'chris/animation2' 12 years ago
scrawl 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
scrawl 32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson bea460955d Merge remote-tracking branch 'zini/next' into animation2 12 years ago
scrawl b52df83d84 Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again 12 years ago
Marc Zinnschlag 31bfe62bbc Merge remote-tracking branch 'scrawl/bug_562' into next 12 years ago
scrawl 5a11ddc485 Pressing F1 again hides the quick keys menu. 12 years ago
Chris Robinson e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 12 years ago
scrawl c4f17f5596 playercontrols switch now disables activation in general (Chris' suggestion) 12 years ago
Marc Zinnschlag 910858c300 Merge remote-tracking branch 'sergeyshambir/guiconvience' into next 12 years ago
scrawl 6a49ea9b4f Cleaning out some old bits 12 years ago
Chris Robinson 6a9755778e Merge remote-tracking branch 'zini/next' into animation2 12 years ago
Tom Mason 158c6fc9fa pressing enter when a messagebox is prompting for "ok", will activate ok button 12 years ago
Sergey Shambir bba024d6ad Right mouse button click now stops Container GuiMode. 12 years ago
Chris Robinson 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
Chris Robinson a8f0ce43a5 Add a run key 12 years ago
scrawl 31f760ccce Fixing issues from last commit: restored input and occlusion queries 12 years ago
scrawl c4d518132f With the 1x1 background window trick, we can apply VSync without restart. Some issues left though. 12 years ago
Chris Robinson 3251796ba0 Fix left/right movement 12 years ago
Jordan Milne 10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 12 years ago
Jordan Milne 5a6589af01 extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start 12 years ago
Jordan Milne f9b064d1bc add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully 12 years ago
Jordan Milne a030c03513 support the printscreen button properly 12 years ago
Jordan Milne 403b6756f5 remove dependency on boost::locale, use system mouse position in in-game menus 12 years ago
Jordan Milne 601d79ef3f fix the mouse wheel in mygui 12 years ago
Jordan Milne ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 12 years ago
Jordan Milne cb01df49c0 begin to support text input 12 years ago
Jordan Milne 53cff0ba68 use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu 12 years ago
Jordan Milne 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
Jordan Milne 6b49b8ab47 MyGUI doesn't care for SDL's mouse button ordering, send it what it expects 12 years ago
Jordan Milne 3b1d285cf3 fix compile errors, work with unmodified SDL 12 years ago
Jordan Milne 6449f68d61 Merge branch 'master' into sdl_input 12 years ago
Jordan Milne 884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 12 years ago
scrawl f1b138d0a8 Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
12 years ago
scrawl ddbe13e569 Workaround for http://bugs.openmw.org/issues/475 12 years ago