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

582 commits

Author SHA1 Message Date
Capostrophic
70635ed1e2 Correct always run behavior when both a gamepad and a keyboard are used 2019-06-02 22:57:31 +03:00
Andrei Kortunov
1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 2019-05-29 17:10:57 +04:00
Capostrophic
f271ac255d Avoid conflicts between gamepad movement and always run setting 2019-05-24 12:50:16 +03:00
Capostrophic
4787e6b9a7 Don't toggle sneaking while controls are disabled 2019-05-06 22:30:07 +03:00
Andrei Kortunov
4f42fe5595 Refactor Settings::Manager::apply() 2019-05-04 21:38:36 +04:00
Andrei Kortunov
0cd8d4b842 Do not track resolution settings changes in the InputManager (bug #4902) 2019-05-02 19:00:47 +04:00
terabyte25
27292ef4a3 Disable quick keys when fighting and spellcasting are disabled (bug #4962) 2019-04-12 13:08:55 +00:00
Andrei Kortunov
f165d22cde Fix a regression with disappearing cursor in the self-enchanting menu 2019-04-12 08:29:45 +04:00
Capostrophic
6dbd875f75 Disallow binding some reserved keys (bug #3282) 2019-03-23 22:56:30 +03:00
Andrei Kortunov
7501f18d21 Avoid the 'structurally dead code' warning 2019-03-19 09:16:03 +04:00
Capostrophic
ca83b9ee90 Refactor main menu and settings toggling again 2019-03-08 23:09:57 +03:00
Andrei Kortunov
de41c98022 Refactor menu toggling 2019-03-08 13:36:44 +04:00
Perry Hugh
b8b7568ce5 Correct odd toggling menu behavior. 2019-03-07 11:41:48 +01:00
Perry Hugh
37f5ab2104 Gamepad controls now sent to keyboard input, excluding joystick. Added right thumbstick button to toggle mouse emulation. 2019-03-03 09:21:00 +00:00
Perry Hugh
313611b79d Analogue Joystick Movement 2019-03-02 23:46:48 +00:00
Perry Hugh
7b6f41c5c3 Correct gamepad default bindings to exactly match vanilla XBOX, create fair interplay between toggling main menu and options menu, allow toggling menus at any time. 2019-03-02 14:28:26 +00:00
Perry Hugh
3ac5481ab4
Enable toggling sneak via gamepad. 2019-02-27 14:03:16 -08:00
Perry Hugh
c6fb94d6cb xbox-bindings 2019-02-27 13:29:48 +00:00
Capostrophic
39dcbacf44 Option to disable controller (feature #3980) 2019-02-15 18:40:22 +03:00
terrabyte25
c31fa3074e
Sanity check for text input in toggleWalking 2018-12-12 14:40:15 -06:00
terrabyte25
35755eb1f1
[Client] Disallow opening inventory menu when not logged in 2018-12-01 10:51:33 -06:00
Capostrophic
7b5932a49d Add Invert X Axis option (feature #3610) 2018-12-01 19:08:02 +03:00
David Cernat
d9dd7073cf [General] Send certain packets only when logged in 
Previously, client mods adding packet-sending scripts to the spawn area made clients send the associated packets as soon as they inputted their character name when joining a server using those mods. This made the clients either get disconnected for not replying to a handshake first, or it made them get kicked for sending object packets that are disallowed for players who are not logged in.

To fix this, LocalPlayer's hasFinishedCharGen() has been replaced with isLoggedIn(), because the former was already returning true when players inputted their names.
 2018-10-13 15:36:13 +03:00
Capostrophic
4ec727c50b Disallow to open the journal while settings window is open (bug #4674) 2018-10-10 18:33:56 +03:00
Andrei Kortunov
e06f0b797a Replace all NULLs to nullptr 2018-10-09 10:21:12 +04:00
Sergey Fukanchik
c50ee22772 Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest(). 2018-09-23 01:52:56 +03:00
Marc Zinnschlag
06b2a23e74 Merged pull request #1768 2018-09-17 12:10:21 +02:00
Andrei Kortunov
7a986f38da Support for user-defined TrueType fonts 2018-09-12 14:31:01 +04:00
Andrei Kortunov
33a66b778f Disable repeating for Accept action in keyboard navigation (bug #4260) 2018-09-09 23:10:09 +04:00
Capostrophic
7ef6fa9f61 Remove deprecated GMST get* functions 2018-08-29 18:38:12 +03:00
Andrei Kortunov
16edac8c47 Fix incorrect 'preparing' word spelling 2018-08-16 17:47:06 +04:00
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
David Cernat
a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2018-07-04 01:52:29 +03:00
Capostrophic
1abf749f03
Remove screenshot taken message 2018-06-14 22:08:53 +03:00
Miloslav Číž
dd00e438fe Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360 2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e Add FIXME comment 2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360 2018-06-13 21:16:28 +02:00
Miloslav Číž
dcfbd554bb Remove try catch block 2018-06-13 11:12:46 +02:00
David Cernat
e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 2018-04-03 01:25:17 +03:00
David Cernat
1c340568d2 [Client] Disallow resting if player has not finished chargen 
Previously, players pressing T rapidly before logging in had the Wait screen show up for them.
 2018-03-29 06:04:20 +03:00
Capostrophic
41f89c84f8 Don't move the player if opposite direction keys are held down at the same time (Fixes #4233) 2018-03-25 12:20:48 +03:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360 2018-02-25 11:25:19 +01:00
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master 
Add OpenMW commits up to 11 Feb 2018
 2018-02-11 06:57:54 +02:00
scrawl
f28024b541
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons (Fixes #4225, Fixes #4320) 2018-02-10 23:11:03 +00:00
David Cernat
5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/CMakeLists.txt
 2018-01-27 22:52:59 +02:00
scrawl
83726ee06a
Fix Reset Controls button not functioning properly 2018-01-11 01:47:42 +00:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master 
Add OpenMW commits up to 9 Jan 2018
 2018-01-10 03:49:53 +02:00
Andrei Kortunov
dba071f881 Remove the 'Screenshot saved' message (bug #4191) 2018-01-08 13:12:12 +04:00
David Cernat
cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 2017-12-25 02:25:01 +02:00
Miloslav Číž
a142a67972 Add default settings for 360 screenshots 2017-12-06 21:16:30 +01:00
David Cernat
c9c363ebef [General] Allow GameSettings to set bed & wilderness resting separately 2017-11-30 12:18:15 +02:00
David Cernat
22521578eb
Merge pull request #349 from OpenMW/master 
Add OpenMW commits up to 28 Nov 2017
 2017-11-29 03:52:15 +02:00
David Cernat
3508a16836 [General] Use GameSettings packet to set ability to rest and wait 2017-11-27 07:39:02 +02:00
Andrei Kortunov
dea7d0beff Do not interrupt swim and sneak idle animations during attack (bug #4122) 2017-11-26 09:54:12 +04:00
Miloslav Číž
902862aa8b display confirming message for all screenshots 2017-11-16 13:50:10 +01:00
Miloslav Číž
1ab854446c remove unused include 2017-11-11 17:21:01 +01:00
Miloslav Číž
511a5686da planet mapping adjustment 2017-11-11 15:10:54 +01:00
Miloslav Číž
4fc532d873 reference screenshot settings only from one place 2017-11-11 14:32:28 +01:00
Miloslav Číž
d71d984cfa more unused stuff cleanup 2017-11-11 14:14:24 +01:00
Miloslav Číž
525f8b4d8e get rid of special key for 360 screenshot 2017-11-11 13:51:42 +01:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master 
Add OpenMW commits up to 11 Nov 2017
 2017-11-11 03:46:21 +02:00
scrawl
f1aeb416ec Disable Activate key when textinput is active (Bug #4151) 2017-11-10 22:54:53 +00:00
scrawl
1afbf99f74 Make movement keys not function in text input mode 2017-11-10 22:51:31 +00:00
Miloslav Číž
319ed2f9b8 disable 360 screenshots in vanity/preview mode 2017-11-10 15:23:44 +01:00
Miloslav Číž
d763e9fe46 add settings for spherical screenshots 2017-11-09 20:25:29 +01:00
Miloslav Číž
8f32114025 segfault fix 2017-11-09 18:26:27 +01:00
Miloslav Číž
d4fd08a63f save 360 screenshots in the configured directory 2017-11-09 16:49:46 +01:00
Miloslav Číž
1b97a541f4 make a new action for 360 screenshot 2017-11-09 16:06:29 +01:00
Miloslav Číž
5afe02505b hide player in first person 360 screenshot 2017-11-07 16:12:31 +01:00
Miloslav Číž
7feba7e498 basic setup for 360 screenshots 2017-11-07 13:07:11 +01:00
David Cernat
e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-10-16 07:37:29 +03:00
scrawl
548e90a7bc Set cursor active when moving by controller 2017-10-13 16:22:44 +00:00
David Cernat
38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
 2017-10-06 04:10:04 +03:00
scrawl
cd437f094d Fix exiting savegamedialog with 'esc' when no game is running 2017-10-05 18:35:09 +02:00
scrawl
0240a6c38b Fix controls window regression 2017-09-27 21:30:12 +02:00
scrawl
74e806d974 Additionally use movement keys (default WASD) to navigate GUI buttons 2017-09-27 12:56:10 +00:00
scrawl
fce9a14986 Hide the mouse cursor until it's used 2017-09-27 12:55:48 +00:00
scrawl
09e93319f5 Restrict the 'fake mouse movement' workaround to where it's actually required (Fixes #3978) 2017-09-27 12:53:52 +00:00
scrawl
ad8d0c5302 Use keypad to control the camera 2017-09-25 00:47:09 +02:00
scrawl
ca3b08b852 Make Activate key accept GUI buttons 2017-09-25 00:47:08 +02:00
scrawl
9ed1b16553 Extend code that detects whether a key was consumed by the GUI (Fixes #4016) 2017-09-25 00:47:05 +02:00
scrawl
ad4b91131f toggleGui renamed to toggleHud, remove unused variable 2017-09-24 19:08:14 +02:00
scrawl
20766fb508 Associate open/close sounds with the GUI mode 2017-09-24 19:08:13 +02:00
scrawl
531e7ac586 Allow drag-and-drop to be cancelled (Esc or Inventory key) 2017-09-24 19:08:13 +02:00
scrawl
c11fe6788f Add basic keyboard navigation for the GUI 
(Shift)Tab cycles, arrow keys move to the next button in that direction, Enter/Space accepts.

Note: Unless MyGUI is hacked to bits, clicking on an empty space will annoyingly reset the key focus. Not sure how to deal with that yet.

The visual highlight for selected buttons requires MyGUI commit 632d007429d0bf0c7d7f6c5db4a08353a63dd839 or later to appear (to be released in 3.2.3).
 2017-09-24 19:08:11 +02:00
scrawl
e7ad012977 Pass repeat key events to the GUI 
For example, one can scroll to the last element in a list by holding down the 'Down Arrow' key.
 2017-09-24 19:08:11 +02:00
David Cernat
b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
 2017-09-04 18:05:24 +03:00
Andrei Kortunov
a5b01fefec Allow to interrupt an attack, if attack button is held 2017-09-01 14:28:21 +04:00
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
 2017-08-31 15:14:13 +03:00
Andrei Kortunov
fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 2017-08-29 15:53:23 +04:00
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.
 2017-08-23 04:58:07 +03:00
Andrei Kortunov
23bda7613b Do not allow to use journal in a main menu (bug #3991) 2017-08-04 07:31:41 +04:00
David Cernat
e3929df38a Merge pull request #239 from OpenMW/master 
Add OpenMW commits up to 14 Jul 2017
 2017-07-15 09:13:04 +03:00
Andrei Kortunov
54b4d93f79 Added a special function for GUI sounds playing 2017-07-10 15:48:00 +04:00
David Cernat
77758596a1 Merge pull request #230 from OpenMW/master 
Add OpenMW commits up to 25 Jun 2017
 2017-06-26 03:13:00 +03:00
scrawl
8d17565efd Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900) 2017-06-25 14:44:17 +02:00
scrawl
903e59f495 Don't reset idle time when there is no camera movement (Fixes #3902) 2017-06-25 13:08:55 +02:00
scrawl
44e2089098 Don't play 'menu click' sound for right clicks (Fixes #3919) 2017-06-25 12:52:59 +02:00
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
 2017-06-18 18:16:10 +03:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
David Cernat
a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 2017-04-24 19:46:12 +03:00
David Cernat
7647715dac Merge pull request #190 from OpenMW/master 
Add OpenMW commits up to 27 Mar 2017
 2017-03-28 08:05:23 +03:00
Andrei Kortunov
658ab5e941 Minor journal improvements 2017-03-26 22:56:36 +04:00
David Cernat
df051a777a Merge pull request #181 from OpenMW/master 
Add OpenMW commits up to 4 Mar 2017
 2017-03-04 22:56:16 +02:00
scrawl
7eb48ea83b Don't wrap mouse to window bounds when the gamepad axis did not move and fix off-by-one error 2017-03-04 21:48:31 +01:00
scrawl
2776727794 Allow gamepad and mouse/keyboard to be used at the same time (Fixes #3093) 2017-03-04 21:48:31 +01:00
David Cernat
ad3eac624f [Client] Disable quicksaving and quickloading 2017-02-06 21:34:54 +02:00
David Cernat
27242cdab9 Merge pull request #142 from OpenMW/master 
Add OpenMW commits up to 6 Feb 2017
 2017-02-06 09:13:19 +02:00
scrawl
e7b6ea4e3f Add cycle weapon/spell actions to the list of controller actions (Fixes #3613) 2017-02-05 20:23:49 +01:00
Koncord
b9c3849cc7 Change keycode to scancode 2016-12-30 02:33:44 +08:00
David Cernat
3a733eb122 Make tes3mp includes consistent 2016-11-17 17:16:25 +02:00
David Cernat
fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 2016-11-15 21:54:06 +02:00
David Cernat
47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
 2016-10-24 09:18:21 +03:00
MiroslavR
301dd77efb Save controls state (Fixes #3598) 2016-10-20 02:12:01 +02:00
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
 2016-07-17 23:50:52 -04:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
scrawl
f417d7780a Fix the enemy nearby check (Bug #3423) 2016-06-07 01:55:34 +02:00
scrawl
7a962fd8c5 Properly escape the keybinding labels (Bug #3281) 
A certain key name ("#") was being interpreted as a MyGUI markup code.
 2016-03-29 01:13:17 +02:00
scrawl
53334d08a2 Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100) 2015-12-26 18:15:57 +01:00
scrawl
a8c287c831 Print detected game controllers to the log file 2015-12-09 14:33:02 +01:00
scrawl
3fe38e3556 Remove unused setting 2015-11-23 03:26:21 +01:00
scrawl
0ec56d321a Remove unneeded using namespace 2015-11-14 03:01:40 +01:00
scrawl
05498ad592 Refactor: InputManager no longer depends on Engine 2015-11-14 03:01:24 +01:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
scrawl
d11952c48a Stop rendering when the window is minimized 2015-09-04 03:44:14 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
Rohit Nirmal
d9b11f963a Gamepad: Slow down simulated mouse with right trigger 
in menus.
 2015-08-11 21:46:54 -05:00
scrawl
6691891bee Include cleanup 2015-07-02 19:16:44 +02:00
scrawl
a1432b0255 Move attackingOrSpell flag to the CharacterController 2015-07-02 19:14:28 +02:00
scrawl
15453e3d90 Use MyGUI::UString for unicode conversion 2015-06-10 16:59:35 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
scrawl
49df07ea7f Implement UI scaling factor 2015-05-15 00:41:21 +02:00
scrawl
5442bf23a6 Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
scrawl
39fb46601a Readded input & event handling 2015-05-13 16:50:47 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
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
 2015-05-04 02:41:50 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
Marc Zinnschlag
056bc66c6c Merge remote-tracking branch 'scrawl/master' 2015-03-12 10:29:39 +01:00
scrawl
37a6d7da76 WindowManager refactoring 2015-03-11 20:04:25 +01:00
Ivy Foster
4f100e6870 Fix rapid toggling when holding sneak button. 2015-03-08 16:08:45 -05:00
Ivy Foster
ba7fc8609c Add toggle sneak option; fix bug #2119 
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.

Outstanding issues:
    - In toggle sneak mode, holding the Sneak button causes
      rapid, repeated toggling.
    - The button in the settings menu doesn't do anything.
 2015-03-08 15:23:46 -05:00
dteviot
36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
 2015-03-08 18:29:12 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
scrawl
a8cb4e807b Warning fix 2015-03-03 11:24:23 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00