mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:19:55 +00:00
Code Issues Releases Wiki Activity
19464 commits 38 branches 54 tags 122 MiB
Commit graph

388 commits

Author SHA1 Message Date
Marc Zinnschlag
2f56b11530 Merge remote-tracking branch 'digmaster/master' 2014-05-29 18:57:16 +02:00
Digmaster
03d7137655 Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button 2014-05-29 06:19:25 -04:00
Digmaster
060a50f94a Fixed issue with QuickKeyMenu and ItemSelectionDialog 2014-05-27 13:50:24 -04:00
Fil Krynicki
91f4967614 Fix for bug 1196. 
This bug would cause the player to jump when jump was assigned to
Space and they closed a dialog with Space. I tested vanilla
MW for behaviour and found that Jump was the only basic input which
MW does not allow when closing dialogs (i.e. if Space is assigned to
move forward, MW will move you forward after closing the dialog).

There were two reasons for the bug:
1) OpenMW GUI does not consume UI events
2) Jump occurs so long as key is down (not only on first key down)

To minimally fix the bug, I made it so that keypress events can be
consumed by the GUI and not passed along to the player control
input manager (1). However, if the player holds space, they will still
jump (as the subsequent key held events will be captured and cause
a jump).

Unfortunately, there is no idiomatic way that I could find in the
OpenMW input manager to perform events only on key down. Instead,
I introduced a variable which tracks whether the jump key has been
pressed for the first time within the current frame (2).

Note: I was initially concerned that limiting the jump event to
KeyDown and not Key Hold would cause issues with swimming,
levitating, or variable height jumping. However, after a bunch
of testing in vanilla MW and exploration of the OpenMW codebase
I could find nothing suggesting the need to capture the jump
key being held.
 2014-05-27 13:12:27 -04:00
scrawl
f476aa4ade Remove MyGUI color codes when copying to system clipboard 2014-05-27 17:07:14 +02:00
Digmaster
2b3b11d848 Give access to the main menu when at a choice in dialogue 2014-05-27 05:33:25 -04:00
Digmaster
e0356cf89d Added support to close modal windows with Esc 2014-05-27 03:00:31 -04:00
Digmaster
e3e51324a4 Esc button exits all non-modal GUI windows 2014-05-26 23:13:37 -04:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr) 
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
 2014-05-22 20:50:00 +02:00
scrawl
d5dd864404 Fixes #1236: Disable all controls while playing movie 2014-04-26 14:33:45 +02:00
scrawl
f05606657c Correctly insert pasted text at cursor position 2014-04-26 05:01:26 +02:00
Marc Zinnschlag
1f6ed584c2 Merge remote-tracking branch 'digmaster/master' 
Conflicts:
	apps/openmw/mwstate/statemanagerimp.cpp
 2014-04-25 08:39:40 +02:00
Thomas
f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat. 
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
 2014-04-24 22:47:45 -04:00
Marc Zinnschlag
760c8c7214 removed a redundant include 2014-04-24 09:56:51 +02:00
Thomas
5b681e2199 Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait. 2014-04-24 03:14:47 -04:00
Thomas
05b21c92af Moved quick save into statemanager class. Kept loader as is as it's rather specalized. 2014-04-24 03:06:36 -04:00
Thomas
a598060071 Added autosave on rest, as well as an option in the settings menu 2014-04-23 23:12:30 -04:00
Thomas
682c395488 Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts) 2014-04-23 21:39:25 -04:00
Thomas
49620968b9 Disallowed quicksave/load in character creation 2014-04-23 21:21:11 -04:00
Thomas
e873135da7 Missed a debug message 2014-04-23 21:04:52 -04:00
Thomas
f90810223a Added quicksave and quickload 2014-04-23 21:02:09 -04:00
Thomas Luppi
d6f1f129eb Forgot to capitalize something. whooooops 
dat y do
 2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205 Gets default keybindings from scancode, not keyvalue. 
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
 2014-04-20 00:34:58 -04:00
scrawl
f2cd37edd0 Play company logo movie 2014-03-27 19:51:48 +01:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
scrawl
6eaa7553f8 Fixes #1181: Enable controls when loading a savegame 2014-03-09 03:34:49 +01:00
scrawl
12de0afb03 Feature #50: Spawn projectiles 
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
 2014-03-08 01:31:27 +01:00
Marc Zinnschlag
f9d2fde783 Merge branch 'openmw-29' 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
 2014-03-04 09:34:38 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
Emanuel Guevel
3d8ca02479 Fix breaking of enchanted items casting 2014-02-15 17:39:57 +01:00
Emanuel Guevel
a3eea4f6b6 Do not allow spellcasting stance without spell selected 2014-02-11 16:34:51 +01:00
scrawl
4a26909172 Fixes #1159: Don't allow quick keys menu in chargen 2014-02-05 12:15:49 +01:00
scrawl
1deb0a7cdf Savegame dialog: Set key focus to editbox 2014-02-01 18:42:01 +01:00
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
 2014-02-01 18:16:32 +01:00
scrawl
39d86a9468 Improvements to smooth NPC steering 2014-01-31 04:43:29 +01:00
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
 2014-01-24 18:28:35 +01:00
mrcheko
87e83a92f8 refactoring of setting an attack type 2014-01-23 23:14:20 +02:00
scrawl
d01f89b153 Rewrite some awful code 2014-01-11 00:24:21 +01:00
scrawl
d7f69205f6 Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes 2014-01-09 00:06:24 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
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
 2014-01-06 00:23:17 +01:00
scrawl
c004fb778f Get rid of underscore defines. They are reserved by the standard. 2014-01-05 18:22:29 +01:00
scrawl
1b96c5d266 Console improvements: Show scrollbar, allow copying text from the history 2014-01-04 05:13:53 +01:00
scrawl
09d491d1ba Move a piece of functionality to its appropriate place 2014-01-04 01:13:19 +01:00
scrawl
c0fbcf413f Use the playermagic and playerfighting control switches 2014-01-03 22:44:35 +01:00
scrawl
899214a906 Use fVanityDelay 2014-01-02 00:13:23 +01:00
scrawl
04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 2013-12-29 00:58:48 +01:00
scrawl
d09a86e208 Issue #1018: Don't allow view mode switching while performing an action 2013-12-27 00:36:06 +01:00
mrcheko
f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 2013-12-16 15:40:47 +02:00
mrcheko
fd9f8c34f6 bug fix http://bugs.openmw.org/issues/428 2013-12-15 18:50:25 +02:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
scrawl
bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 2013-11-29 20:06:54 +01:00
scrawl
7f735c2c4c Release and show the cursor when focus lost 2013-11-20 16:07:14 +01:00
Marc Zinnschlag
a19242b4ec fixed expression in if statement 2013-11-16 19:31:35 +01:00
vorenon
b2d2a3dd17 Closing message boxes with numpad enter 2013-11-16 19:15:47 +00:00
Marc Zinnschlag
f19973450f moved exit game flag from Environment to StateManager 2013-11-16 11:07:23 +01:00
scrawl
d619d0fa25 Don't grab the cursor while the console is opened 2013-11-15 03:39:25 +01:00
scrawl
c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 2013-11-05 03:02:28 +01:00
scrawl
4f35fd8184 Removed a workaround from Renderer, some cleanup 2013-10-30 13:05:28 +01:00
scrawl
3a3f2a37c8 Add cut, copy & paste of text 2013-10-17 12:47:49 +02:00
Marc Zinnschlag
0f1c4cb00e cleanup 2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c Switched to using proper enums as opposed to ints. 2013-09-23 08:31:36 -04:00
Berulacks
0c518fb047 Replaced tabs with spaces. 2013-09-23 07:36:50 -04:00
Berulacks
c423479f20 Fixed bug #887 2013-09-23 07:31:14 -04:00
Xethik
58bb0b8773 Bug #907 
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
 2013-09-20 21:26:12 -04:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
Chris Robinson
eab4e09566 Handle the pick/probe in the character controller 2013-08-06 19:48:59 -07:00
Emanuel Guevel
71da2f0a12 Do not allow magic/combat stance unless magic/inventory window are accessible 2013-08-04 00:21:27 +02:00
scrawl
f1f6336a4a Fixed screenshot keybinding, and make it bindable 2013-07-31 20:24:44 +02:00
Sebastian Wick
7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 2013-07-29 18:27:00 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
Marc Zinnschlag
ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' 
Conflicts:
	apps/openmw/mwrender/animation.cpp
 2013-07-23 09:12:23 +02:00
Kolzi
1b7966ca27 Can zoom in and out in third person view. 2013-07-19 16:12:01 +02:00
scrawl
91e95e1404 Use the correct slash, chop or thrust animation 2013-07-16 23:32:41 +02:00
scrawl
9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 2013-07-16 16:25:41 +02:00
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
 2013-07-16 11:40:19 +01:00
gus
f7b711aabe bugfix 2013-07-15 16:37:32 +01:00
vorenon
66eb82b363 oops again 2013-07-15 02:26:22 +02:00
vorenon
33779ae23c oops 2013-07-15 02:23:18 +02:00
vorenon
d4739a451a added ability to close container windows with the activation key 2013-07-15 02:18:24 +02:00
gus
3947f44aa3 Porting old work 2013-07-13 22:24:52 +01:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +02:00
scrawl
4fd7891d2c Fix a message box issue 2013-06-16 20:26:27 +02:00
scrawl
b16c92c2f5 Better handle SDL_TEXTINPUT events 2013-06-16 19:43:59 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
scrawl
5252ffa104 More cleanup 2013-06-15 17:06:27 +02:00
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 2013-06-15 15:33:47 +02:00
scrawl
9331a6380c Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05 Moved window resize messages to sdlinputwrapper 2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58 Removed obsolete OIS workaround 2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846 We don't need Carbon on OS X anymore 2013-06-15 14:47:33 +04:00
Rohit Nirmal
e5ddaaf676 Fix wrong indenting from my last commits. 2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 2013-06-13 18:04:38 +02:00
scrawl
0880805559 Minor cleanup 2013-06-13 12:13:40 +02:00
Rohit Nirmal
aac3ada14b Use mousewheel to turn book pages. 2013-06-13 00:50:07 -05:00
scrawl
705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6 Fix mouse wheel triggering a click event in mygui 2013-06-12 15:10:04 +02:00
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
 2013-06-12 12:34:33 +02:00
Rohit Nirmal
b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 2013-06-10 19:42:38 -05:00
Rohit Nirmal
4eede86ce6 Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal. 2013-06-09 23:27:47 -05:00
scrawl
7a2d1cd8ce Security skill 2013-05-19 18:40:37 +02:00
Chris Robinson
6c6200efef Merge remote-tracking branch 'zini/master' into animations 2013-05-15 16:34:51 -07:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Chris Robinson
90e29c83c0 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2013-05-06 19:17:39 -07:00
Glorf
517dfb4d75 Bugfix #732 part 2 2013-05-03 13:24:34 +02:00
Glorf
57f22c77c0 Bugfix #732 part 1 2013-05-03 12:44:27 +02:00
Chris Robinson
a120653c38 Implement handling weapon states 2013-05-01 10:19:16 -07:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
scrawl
5ff098b8fb Fix quick keys being triggered when in UI mode 2013-04-29 11:55:30 +02:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
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