1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 00:39:59 +00:00
Commit Graph

163 Commits

Author SHA1 Message Date
Tom Mason
6ca2b1af74 fix for turning animations playing when in vanity mode 2013-04-09 19:24:41 +01:00
Glorf
2f52df22ce Bugfix #553 2013-04-08 19:00:38 +02:00
Tom Mason
822866b5ae fixed autorun 2013-04-07 18:04:30 +01:00
Chris Robinson
f976eb5bd8 Improve mouselook scaling 2013-03-31 17:32:39 -07:00
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. 2013-03-31 15:50:48 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
Chris Robinson
13c098266c Pass player rotation through the movement settings 2013-03-31 02:57:22 -07:00
scrawl
69099c11a2 Merge branch 'enchanting' into companion 2013-03-31 11:52:55 +02:00
Chris Robinson
b6f2b39a2f Clear the movement and rotation vector when getting them 2013-03-31 01:56:38 -07:00
scrawl
a723ad8f29 Don't allow toggling inventory or journal when a modal window is opened 2013-03-30 16:32:24 +01:00
scrawl
51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 2013-03-30 15:51:07 +01:00
Marc Zinnschlag
ef72894b81 Merge remote-tracking branch 'scrawl/alwaysrun' into next 2013-03-14 22:11:12 +01:00
scrawl
5b943a965f Handle always run in the inputmanager, instead of using forced stance. 2013-03-14 21:08:19 +01:00
scrawl
2d8f0949a4 Always run key (Y) 2013-03-14 20:27:16 +01:00
scrawl
beab20cb42 Fix message boxes not opening if they opened as a result of object activation 2013-03-14 19:53:57 +01:00
scrawl
285b4bf726 Allow zooming camera in vanity or preview mode with the mousewheel 2013-03-08 00:12:56 +01:00
scrawl
268bb23590 Implemented sneaking animation 2013-03-06 16:58:56 +01:00
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
2013-03-03 11:02:38 +01:00
Marc Zinnschlag
038c5c3e82 Merge remote-tracking branch 'mikesc/bug574' 2013-02-28 20:21:38 +01:00
Michal Sciubidlo
3df34fb5cc fix bug 574 2013-02-28 19:52:32 +01:00
scrawl
369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-27 09:25:44 +01:00
vorenon
1a43d86d9e Close messages boxes with the activation key (Bug #589) 2013-02-26 15:58:32 +01:00
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
2013-02-26 14:54:53 +01:00
scrawl
5c0c5854e8 Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not 2013-02-26 12:01:10 +01:00
scrawl
b1fc68d44d Merge branch 'master' into graphics 2013-02-25 17:36:33 +01:00
scrawl
73d48a95f6 Add message box when the player tries to move when being overencumbered. 2013-02-25 16:31:48 +01:00
scrawl
cacdb33b42 Merge branch 'master' into graphics
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
Marc Zinnschlag
cd40d167ce Merge remote-tracking branch 'chris/animation2' 2013-02-25 14:56:03 +01:00
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) 2013-02-25 06:57:32 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
Chris Robinson
bea460955d Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 16:03:39 -08:00
scrawl
b52df83d84 Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again 2013-02-17 20:23:22 +01:00
Marc Zinnschlag
31bfe62bbc Merge remote-tracking branch 'scrawl/bug_562' into next 2013-02-17 17:41:19 +01:00
scrawl
5a11ddc485 Pressing F1 again hides the quick keys menu. 2013-02-17 16:01:36 +01:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
scrawl
c4f17f5596 playercontrols switch now disables activation in general (Chris' suggestion) 2013-02-17 03:03:41 +01:00
Marc Zinnschlag
910858c300 Merge remote-tracking branch 'sergeyshambir/guiconvience' into next 2013-02-16 14:50:42 +01:00
scrawl
6a49ea9b4f Cleaning out some old bits 2013-02-13 18:39:36 +01:00
Chris Robinson
6a9755778e Merge remote-tracking branch 'zini/next' into animation2 2013-02-12 18:14:46 -08:00
Tom Mason
158c6fc9fa pressing enter when a messagebox is prompting for "ok", will activate ok button 2013-02-10 14:58:46 +00:00
Sergey Shambir
bba024d6ad Right mouse button click now stops Container GuiMode. 2013-02-10 08:37:45 +04:00
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.
2013-02-06 18:22:16 -08:00
Chris Robinson
a8f0ce43a5 Add a run key 2013-02-06 17:51:47 -08:00
scrawl
31f760ccce Fixing issues from last commit: restored input and occlusion queries 2013-02-05 20:26:13 +01:00
scrawl
c4d518132f With the 1x1 background window trick, we can apply VSync without restart. Some issues left though. 2013-02-05 19:22:08 +01:00
Chris Robinson
3251796ba0 Fix left/right movement 2013-02-05 09:57:08 -08:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
ddbe13e569 Workaround for http://bugs.openmw.org/issues/475 2013-01-03 01:07:17 +01:00
scrawl
faad64b254 Esc cancels the video 2012-12-12 01:13:53 +01:00
Marc Zinnschlag
5eb0f489e2 Issue 476: fixed auto-move bypassing disabled player controls 2012-11-27 18:39:12 +01:00