David Cernat
5f6ddcfc59
[General] Rework container sync to prevent item duping
...
A main priority in TES3MP development is to avoid making major changes to OpenMW code, so as to avoid merge conflicts in the future. Whenever avoiding potential conflicts seems especially difficult for the proper implementation of a particular multiplayer feature, that multiplayer feature is often put off until later or partially implemented with the intent of being revisited in the future.
Container sync is the perfect example. Previously, the OpenMW code for container actions was kept exactly as it was, with clients unilaterally accepting their own container changes as per singleplayer-specific code, with only the addition that clients sent container packets every time they made a change in a container, packets which were then forwarded unquestioningly by the server to other players. This meant that two players clicking on the same item in a container at the same time both managed to take it, thus duplicating the item.
Immediately after the packets were already forwarded, server scripts were able to check for incorrect changes, such as the removal of more items than should have existed in a container, but they had to send their own packets that attempted to fix what had already been accepted on the initial client and then forwarded to all clients, which was quite onerous in some scenarios, such as when a player on a slow connection immediately dropped items in the world after taking them from a container (which is why the default TES3MP serverside scripts made no attempt at sending corrective packets at all, preferring to expect the matter to be solved in a later C++ implementation).
This commit fixes item duping in containers by preventing container actions from initially running on clients and by ending the automatic forwarding of container packets by the server. Instead, clients now send container packets that act as requests for container actions, and serverside scripts have to forward these requests themselves. In other words, without a matching Container event in the server's Lua scripts, players are completely unable to affect containers for themselves or for others.
To forward a received Container packet, the following line must be used in a Container event in the Lua scripts:
tes3mp.SendContainer(true, true)
When an invalid action count is used in a container request, the serverside scripts can amend it using the following new function:
tes3mp.SetReceivedContainerItemActionCount(objectIndex, itemIndex, actionCount)
Thus, the serverside scripts are able to allow only container actions that are correct based on their own recorded contents for that container.
The OpenMW code allowing unilateral container actions in mwgui/container.cpp is now prevented from executing. When a player's container request is returned to them, code in mwmp/WorldEvent.cpp simulates those container actions instead.
2018-03-26 19:27:36 +03:00
David Cernat
9165b12d78
[Client] Update inventory views when receiving inventory or equipment
2018-03-26 10:01:26 +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
David Cernat
bb15ee9215
[Client] Make it possible to get ContainerWindow from elsewhere in code
2018-03-24 09:00:15 +02:00
Capostrophic
5a3086b0c6
Auto-detect the actual Morrowind assets path ( Fixes #4336 )
2018-03-23 23:52:08 +03:00
Capostrophic
42b7846f81
Replace a redundant playerAllies check with a boolean ( Fixes #4229 )
2018-03-23 18:45:39 +03:00
Nelsson Huotari
63e34a5575
Typofix: updateCrimePersuit -> ...Pursuit
2018-03-23 14:10:43 +02:00
David Cernat
bbdc30628b
[Client] Use the correct guid for a received WorldEvent or ActorList
2018-03-21 06:08:04 +02:00
scrawl
c02920bcd1
Merge pull request #1634
...
Conflicts:
apps/openmw/mwworld/worldimp.hpp
2018-03-20 22:48:20 +00:00
scrawl
f47429d575
Merge pull request #1635
2018-03-20 22:47:36 +00:00
scrawl
ff7f964643
Merge pull request #1636
2018-03-20 22:47:31 +00:00
David Cernat
14f0299322
[Client] Don't log InputBox inputs for client
2018-03-20 06:41:04 +02:00
Andrei Kortunov
fed3e56fc1
Weather manager: get rid of World dependency
2018-03-19 23:08:15 +04:00
Andrei Kortunov
53ef345680
Update magic effect particles after building new animation (bug #2254 )
2018-03-19 10:43:22 +04:00
Andrei Kortunov
a0a30cdbf5
AI: hide torches during bad weather (bug #4334 )
2018-03-19 08:03:53 +04:00
Andrei Kortunov
bd6c7de579
Do not unequip two-handed weapon when equipping torch
2018-03-19 08:03:53 +04:00
RoadTrain
d626d89c49
OpenMW-CS: Fix a typo in startup warning.
2018-03-19 00:50:50 +03:00
Capostrophic
5b49248d6e
Restrict opening doors to bipedal actors ( Fixes #4313 )
2018-03-18 17:24:27 +03:00
scrawl
edb57306b6
Merge pull request #1628
2018-03-16 23:25:29 +00:00
scrawl
17fa1a4d51
Merge pull request #1630
2018-03-16 23:24:19 +00:00
scrawl
7a5748a9f1
Merge pull request #1632
2018-03-16 23:24:05 +00:00
elsid
a26483ab26
Fix memory leak
...
There is no delete for TextFormat objects in PageDisplay destructor.
2018-03-13 21:32:59 +03:00
elsid
26df0e6ebd
Remove duplicated include
2018-03-13 21:28:38 +03:00
elsid
2f9b6b536b
Label gtest directories as system
...
To hide all warnings when use custom GTEST_ROOT.
2018-03-13 21:27:14 +03:00
David Cernat
20caea083a
[Client] Use correct count for items in equipment packets
...
Previously, throwing weapon sync was completely broken for players, as the count for their equipped throwing weapons was never set and – as a result – defaulted to a count of 1 on other clients. As a result, any time a player threw a dart, they would then appear as having switched to hand-to-hand for other players.
Moreover, the count of equipped items was mistakenly based on the total count of items with that refId in the inventory. As a result, if – for example – I equipped 1 Daedric Longsword and had 4 others in my inventory, my DedicatedPlayer on other clients would equip a Daedric Longsword with a count of 5. If I was overencumbered by having that many Daedric Longswords on me and then dropped 4 of them, allowing myself to move again, my DedicatedPlayer would still walk around with 5 Daedric Longswords and lack animations due to still being overencumbered on the other clients.
These problems were less prevalent for actors, but their equipment updating code has also been changed to match that of players.
2018-03-12 23:31:37 +02:00
Andrei Kortunov
e0aa5e8e79
Prevent overlapping for journal and books scrolling
2018-03-11 16:19:37 +04:00
David Cernat
b249162ca1
[General] Implement setting of enforced client log level in GameSettings
...
Certain servers do not want the players to have debug information about the locations and actions of other players, so a client's log level can now be enforced by the server via the GameSettings packet.
2018-03-11 04:50:59 +02:00
David Cernat
a3a341fee6
[Server] Reimplement 4ebfcc4a21 for 0.6
2018-03-10 22:19:44 +02:00
David Cernat
bf906b3f0a
Merge pull request #393 from OpenMW/master
...
Add OpenMW commits up to 10 March 2018
2018-03-10 18:37:51 +02:00
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-03-09 21:07:46 +02:00
Andrei Kortunov
62c04c6758
Unstack soulgem, added via AddSoulGem console command (bug #4351 )
2018-03-09 21:49:27 +04:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
2018-03-08 23:39:35 +00:00
scrawl
870c658500
Remove missing souls, remove some runaway exceptions ( Fixes #4111 )
2018-03-08 23:38:04 +00:00
scrawl
7f39dbb129
Merge pull request #1626
2018-03-08 20:52:37 +00:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
Thunderforge
dfcd243150
Remove the word "interior" from cell not found message
2018-03-07 19:57:54 -06:00
scrawl
96c2b9374f
Merge pull request #1621
2018-03-07 18:12:43 +00:00
scrawl
bf78c18296
Merge pull request #1624
2018-03-07 18:12:32 +00:00
scrawl
148cda254d
Merge pull request #1617
2018-03-07 18:12:26 +00:00
Capostrophic
3b922d810a
Don't use floating point arithmetics for formatted count (Bug #4346 )
2018-03-07 15:36:10 +03:00
Capostrophic
60a663ef58
Account for all possible count values in getCountString (Bug #4346 )
2018-03-06 16:50:38 +03:00
Thunderforge
6c3ac834c4
Preventing max quicksaves from being saved to settings.cfg if it is unchanged.
2018-03-05 19:57:19 -06:00
Chris Robinson
01dbac7b15
Don't use a different setting for distant viewing distance
2018-03-04 11:37:57 -08:00
Chris Robinson
41669467ae
Make settings for distant fog parameters
2018-03-04 11:37:57 -08:00
Chris Robinson
4caa7c9674
Workaround older MSVC quirk
2018-03-04 11:37:57 -08:00
Chris Robinson
154cc8c659
Use alternate fog parameters when distant land is enabled
...
This allows the distant land to actually be seen when the user enables it. The
values used are replicated from MGE XE's default settings and should probably
be exposed somewhere.
2018-03-04 11:37:57 -08:00
Chris Robinson
6d557fec8e
Increase the far clip plane when distant terrain is enabled
2018-03-04 11:37:57 -08:00
Capostrophic
d371bebb33
Prevent items in a container owned by a dead actor from being counted as stolen (Bug #4328 )
2018-03-03 15:57:13 +03:00
Capostrophic
cc0c6ddaa6
Account for empty victimRef (Bug #4328 )
2018-03-03 15:57:03 +03:00
scrawl
839196e4fa
Force normal polygon mode for the map camera ( Fixes #4235 )
2018-03-03 00:15:57 +00:00
David Cernat
c18d07827d
[Client] Hide difficulty widget because it has no use in multiplayer
2018-03-01 09:31:21 +02:00
David Cernat
37b349c2f6
Merge pull request #390 from OpenMW/master
...
Add OpenMW commits up to 28 Feb 2018
2018-03-01 05:33:37 +02:00
Thunderforge
b6d9b6f544
Formatting improvement for advanced page
2018-02-27 20:17:43 -06:00
Thunderforge
4292351993
Adding Max Quicksaves setting to Launcher
2018-02-27 20:17:21 -06:00
scrawl
9e9c278527
Merge pull request #1597
2018-02-27 23:48:45 +00:00
Capostrophic
929fc68160
Consider items with dead owner not stolen (fixes bug #4328 )
2018-02-26 23:21:51 +03:00
David Cernat
9e10eb9c84
Merge pull request #389 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2018
2018-02-25 22:05:32 +02:00
David Cernat
03266d7648
[Client] Prevent guards from arresting players who are currently jailed
2018-02-25 21:33:04 +02:00
scrawl
31d7e6af32
Merge pull request #1608
2018-02-24 16:53:32 +00:00
scrawl
56613d817e
Merge pull request #1612
2018-02-24 16:52:30 +00:00
Capostrophic
089666dd68
Round up displayed encumbrance
2018-02-24 15:13:14 +03:00
Thunderforge
a67373d116
Fixing "Show Enchant Chance" checkbox setting melee info instead
2018-02-19 18:28:04 -06:00
Capostrophic
99360e132f
Only display "new journal entry" message in dialogue if there *is* a new entry
2018-02-18 16:01:50 +03:00
David Cernat
60f686ee43
[General] Implement setting of physics framerate as part of GameSettings
2018-02-14 05:53:44 +02:00
Daniel Vukelich
3bdd989a50
Remove numeric quicksave slot IDs
...
When multiple quicksaves occurred in quick succession, the numeric order
of the saves could not be guaranteed. To prevent players from getting
confused as to why their saves appear out of order, don't number them.
2018-02-13 21:01:15 -05:00
David Cernat
886b3431bc
[Client] When resurrecting players, set pcknownwerewolf to 0
...
This makes it so players are no longer known werewolves and are no longer attacked infinitely by guards.
2018-02-13 21:55:10 +02:00
David Cernat
53d758ba16
Merge pull request #385 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018
2018-02-13 05:22:41 +02:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
scrawl
a708ac488e
Don't call Store::setUp() unnecessarily
...
Fixes a threading issue with ESM::Land store caused by calling setUp() while it's being used.
2018-02-13 00:38:55 +00: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
5bb7d76913
Merge pull request #1605
2018-02-10 23:15:26 +00:00
scrawl
899d464b0d
Cap the rain emitter's frame time ( Fixes #4314 )
2018-02-10 23:14:41 +00: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
Andrei Kortunov
f626a7fcc7
Take in account PC rank during disposition calculation (bug #4322 )
2018-02-10 17:58:30 +04:00
David Cernat
74765b3ace
[General] Implement selected spell sync as part of PlayerMiscellaneous
2018-02-06 06:36:46 +02:00
Marc Zinnschlag
2a5a574134
Merge remote-tracking branch 'thunderforge/feature/4054-launcher-advanced-settings-panel'
2018-02-05 13:30:47 +01:00
David Cernat
029dfc56ba
[General] Implement player scale as part of PlayerShapeshift
2018-02-01 02:11:45 +02:00
David Cernat
aa448523f8
[Client] Clean up WorldEvent::runConsoleCommands() slightly
2018-01-31 23:23:52 +02:00
David Cernat
ce5670e57e
[Client] Ignore invalid object refIds from ObjectPlace packets
2018-01-31 18:51:53 +02:00
David Cernat
4496625154
Merge pull request #381 from OpenMW/master
...
Add OpenMW commits up to 31 Jan 2018
2018-01-31 05:03:28 +02:00
David Cernat
66078bfea7
[General] Implement Mark location sync as part of PlayerMiscellaneous
2018-01-31 04:50:29 +02:00
scrawl
b1b8e31562
Use unique_ptr over new/delete ( Fixes #4305 )
2018-01-30 22:05:16 +00:00
David Cernat
989f6e6b51
[General] Implement PlayerReputation packet
2018-01-30 22:55:29 +02:00
David Cernat
88ae0772cf
[Server] Initialize new processors and fix issues with RecordDynamic
2018-01-30 22:51:35 +02:00
David Cernat
3d80e2db62
[General] Add placeholders for new packet types, part 2
2018-01-30 16:01:33 +02:00
Thunderforge
8b17844781
Replacing Qt5-only method with Qt4-compatible code
2018-01-29 21:14:31 -06:00
David Cernat
02af7f6ba1
[General] Add placeholders for new packet types
2018-01-29 22:32:51 +02:00
Thunderforge
8837046d9c
Adding panel for advanced settings.cfg options
2018-01-28 22:49:49 -06:00
David Cernat
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
2018-01-29 02:36:48 +02:00
scrawl
89c6b59c30
Merge pull request #1602
2018-01-28 22:35:47 +00:00
David Cernat
ce11a1dfa9
[Client] Fix potential invalid pointer when storing cell unloads
...
Notably, builds of the client done with Clang were crashing on startup before this.
2018-01-29 00:14:26 +02:00
David Cernat
420dab10e1
[General] Track objects directly placed by players in ObjectPlace
...
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).
Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
2018-01-28 17:46:51 +02:00
David Cernat
595bc5a152
[Client] Only send ObjectScale packets when scale actually changes
2018-01-28 05:58:56 +02: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
David Cernat
d7e29f1f61
[Client] Unequip items with constant effect damage when resurrected
2018-01-27 20:19:39 +02:00
David Cernat
d19d8b0a34
[Client] Add and use enchantmentType argument for unequipItemsByEffect()
2018-01-27 19:37:16 +02:00
David Cernat
6c4bb8c423
[Client] Move resurrection code for local player to LocalPlayer
2018-01-27 19:09:55 +02:00
David Cernat
6b75a82777
[Client] Ignore equipment items for DedicatedActors with count below 0
2018-01-27 18:08:45 +02:00
David Cernat
e3bc11d9eb
[Client] Fix ListBox overlap crashes by removing ListBoxes properly
2018-01-27 15:41:11 +02:00
David Cernat
c6a85ee8f9
[Client] Add doesEffectListContainEffect() method to MechanicsHelper
2018-01-26 03:18:01 +02:00
David Cernat
aa392ebf20
[Client] Unequip items if necessary when attr/skill modifier is set to 0
2018-01-26 00:45:39 +02:00
David Cernat
ace825b99c
[Client] Ignore invalid player class IDs from packets
...
Additionally, clean up variables names in related code.
2018-01-24 02:47:56 +02:00
David Cernat
c6874509b6
[Client] Ignore invalid faction IDs from packets
2018-01-24 02:25:44 +02:00
Ilya Zhuravlev
8d44d3124e
Android: Add callbacks for basic cursor handling.
2018-01-18 21:18:31 -05:00
Ilya Zhuravlev
455f718394
Android: register a virtual controller definition
2018-01-17 23:14:23 -05:00
Daniel Vukelich
3af8f63895
Use unsigned integer types for QuickSave indices
2018-01-17 21:43:30 -05:00
David Cernat
5894ffae7d
[Client] Ignore dynamic object placements or spawns in packets
2018-01-17 11:01:31 +02:00
David Cernat
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment packets.
2018-01-17 08:10:49 +02:00
David Cernat
f746958afa
[Client] Send enchantmentCharge for items added or removed in containers
2018-01-17 08:10:49 +02:00
David Cernat
bce3d0eb4c
[Client] Use more descriptive message for version mismatch
2018-01-17 08:10:49 +02:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62
Update android port.
2018-01-16 00:11:27 -05:00
Daniel Vukelich
f09fd6795c
Follow openmw style guide
2018-01-14 11:57:11 -05:00
scrawl
2caaa48b91
Workaround to make sure message box remains on top ( Fixes #4298 )
2018-01-14 00:27:53 +00:00
scrawl
e2e48e0a50
Add default value for 'sAnd' GMST ( Fixes #4269 )
2018-01-14 00:27:05 +00:00
scrawl
d9d8de3061
Catch exceptions in updateWindowManager (Bug #4269 )
2018-01-14 00:26:37 +00:00
scrawl
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557 )
2018-01-14 00:24:30 +00:00
Daniel Vukelich
97924d97c7
Add the option for multiple quicksave slots
...
With more than 1 quicksave slot, slots will be created each time you
quicksave until the maximum number (configured in settings) of
quicksaves has been reached. After that, the oldest quicksave slot will
be replaced each time you quicksave. Saves are numbered sequentially,
unless the maximum number of slots is 1, in which case it is not numbered.
2018-01-12 20:09:39 -05:00
Andrei Kortunov
eccb49da18
Do not summon the bound bow if there is no suitable ammo
2018-01-11 21:08:30 +04:00
Andrei Kortunov
b995617559
implement rateAmmo() function
2018-01-11 21:08:11 +04:00
scrawl
dd5ebe225b
Merge pull request #1580
2018-01-11 01:54:28 +00:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
scrawl
1522bda60b
Fix crash in getDistance when invoked before the game starts
2018-01-11 01:48:05 +00: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
scrawl
c7f60a6dc8
Merge pull request #1595
2018-01-09 13:48:07 +00:00
scrawl
f6ca7295a6
Revert "Merge pull request #1595 "
...
This reverts commit 7ef7b1a7b19e7e4de0ab
2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595
2018-01-09 00:42:27 +00:00
scrawl
9e7e4de0ab
Merge pull request #1594
2018-01-09 00:42:20 +00:00
Andrei Kortunov
dba071f881
Remove the 'Screenshot saved' message (bug #4191 )
2018-01-08 13:12:12 +04:00
David Cernat
8316ec0fa7
[Client] Update tes3mp change comment for object rescaling
2018-01-08 02:19:05 +02:00
David Cernat
09548d05f7
[Client] Ignore cell changes that move actors to where they already are
2018-01-08 01:37:01 +02:00
David Cernat
4a9a628a0f
[Client] When getting an actor, make sure their cell is initialized
2018-01-07 02:35:30 +02:00
David Cernat
4caf7ca30a
[Client] Add temporary fix for crashes caused by custom GUI elements
2018-01-06 20:16:32 +02:00
David Cernat
0cc86c04d1
[Client] Print plugin discrepancies, not just plugin lists side by side
2018-01-06 05:39:25 +02:00
David Cernat
a639d3494a
[Client] Fix use of DedicatedPlayers as targets for ConsoleCommand
2018-01-05 01:24:15 +02:00
David Cernat
502df7d9c1
[Client] Clean up GUIChat slightly
2018-01-05 00:03:05 +02:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
2018-01-04 12:12:18 +02:00
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
2018-01-02 20:58:43 -06:00
David Cernat
1cf2f35a28
[Server] Add script functions to set & get plugin enforcement state
2018-01-02 16:33:18 +02:00
Andrei Kortunov
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
2018-01-02 14:52:42 +04:00
Bret Curtis
c3c3fbc68e
overriden -> overridden
2018-01-02 11:42:08 +01:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
2018-01-02 07:50:37 +02:00
David Cernat
bca9c55046
[Client] Reinstate "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 2f4cd6b71345993d3da2https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
2018-01-02 07:47:27 +02:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
2018-01-01 13:28:14 +01:00
scrawl
57257d057f
Remove unintended jump cooldown ( Fixes #4250 )
2017-12-31 23:48:51 +00:00
David Cernat
47a3dc9ff2
[Server] Add broadcast argument to functions for sending WorldPackets
2017-12-30 21:52:30 +02:00
David Cernat
1e2517698d
[Server] Send player speech and animation packets only to nearby players
2017-12-29 06:17:45 +02:00
David Cernat
2f4cd6b713
[Client] Revert "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 45993d3da23d347730dchttps://bugs.openmw.org/issues/4250 is fixed.
2017-12-26 19:27:13 +02:00
David Cernat
db0e0d376e
[Client] Use new code to set the console's Ptrs from server scripts
...
Previously, reusing the console's object selection code made it so using the same Ptr twice in a row was akin to clicking on the same object twice in the console window, i.e. the object was deselected the second time around. Additionally, that same code was setting key focus to the hidden console window, preventing players from moving until they activated another window (such as their inventory or chat window).
2017-12-26 15:04:28 +02:00
David Cernat
5fd9079b26
[Client] Stop drag and drop when setting player inventory
2017-12-25 05:41:13 +02:00
David Cernat
40e70ebf9c
[Client] Fix key focus for chat window
2017-12-25 05:08:36 +02:00
David Cernat
bed96e5a3d
[Client] Remove check of GM_RestBed GUI mode that no longer exists
2017-12-25 03:26:28 +02: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
David Cernat
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
2017-12-25 02:03:02 +02:00
David Cernat
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
2017-12-23 13:16:38 +02:00
scrawl
b8c25e6bff
Use the correct priority of animation sources in getStartTime ( Fixes #4263 )
2017-12-21 14:49:09 +00:00
Marc Zinnschlag
7245b251e8
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-19 17:01:13 +01:00
Marc Zinnschlag
93716cecd9
Merge remote-tracking branch 'origin/master'
2017-12-19 17:01:03 +01:00
scrawl
993982628d
Merge pull request #1590
2017-12-18 20:41:12 +00:00
Andrei Kortunov
1a58171e86
Do not allow to sell items from containers with zero capacity (bug #4268 )
2017-12-17 18:09:25 +04:00
David Cernat
fef6bddc68
[Client] Fix typo related to drag and dropping
2017-12-16 23:19:54 +02:00
David Cernat
535fba0cb3
[Client] Finish drag and drops when arrested or teleported by server
2017-12-16 07:21:02 +02:00
Miloslav Číž
01f9d90315
CS: Reorder 3D input menu
2017-12-15 17:22:32 +01:00
Miloslav Číž
13dc1bd41e
CS: Add tooltip to camera-ortho-size preference
2017-12-15 14:56:03 +01:00
Miloslav Číž
1f5feeddb9
CS: Change camera parameter types to int
2017-12-15 14:46:23 +01:00
Miloslav Číž
f2777f7242
CS: Mover object-marker-alpha under Rendering
2017-12-15 14:36:12 +01:00
Marc Zinnschlag
ecf1cea1b7
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-15 13:41:54 +01:00
Miloslav Číž
79527b746a
Remove unused variable
2017-12-14 17:29:24 +01:00
Miloslav Číž
b246580c63
Fix orbit camera axis
2017-12-13 20:08:38 +01:00
Andrei Kortunov
ba46473038
Do not skip weather transitions from SetPos script command (bug #3603 )
2017-12-13 10:53:23 +04:00
David Cernat
ebf88d12a3
[Client] Send PlayerInventory packet after buying skill training
2017-12-13 05:46:48 +02:00
scrawl
e9ecaf712b
Merge pull request #1584
2017-12-12 20:11:05 +00:00
scrawl
7d62f05f81
Merge pull request #1583
2017-12-12 20:10:59 +00:00
David Cernat
0ad9c99cf4
[Client] Send PlayerInventory packet after completing a vendor trade
2017-12-12 15:18:56 +02:00
Andrei Kortunov
0e04a26ef6
Set duration of magic effects from ingredients (bug #4261 )
2017-12-10 16:10:44 +04:00
Andrei Kortunov
c908ad2fba
Do not allow to place actors underground via SetPos (bug #3783 )
2017-12-10 14:38:02 +04:00
Chris Robinson
08e947319a
Restore exception throwing to the decoder
2017-12-09 11:00:56 -08:00
Miloslav Číž
ee40b41285
Add slider for refraction size in settings window
2017-12-09 14:03:56 +01:00
Chris Robinson
06ae61479a
If a sound effect fails to load, substitute silence.
2017-12-08 22:10:09 -08:00
Miloslav Číž
e309dfd234
CS: Rename variables (AppVeyor fix)
2017-12-08 22:06:03 +01:00
scrawl
9cee439e37
Merge pull request #1577
2017-12-08 20:00:58 +00:00
scrawl
1d823d8ae1
Merge pull request #1579
2017-12-08 20:00:26 +00:00
scrawl
b12cd1f5b2
Merge pull request #1581
2017-12-08 20:00:15 +00:00
Miloslav Číž
199e41833f
Merge branch 'master' into cs-cam
2017-12-08 20:56:05 +01:00
Miloslav Číž
d85f8deaa3
CS: Add fixed roll setting, plus ortho fix
2017-12-08 20:51:40 +01:00
Miloslav Číž
1b77e3ed62
CS: Add ortho camera setting
2017-12-08 18:18:27 +01:00
Miloslav Číž
bfad5ebde4
CS: Fix camera orbit control with keys
2017-12-08 17:42:20 +01:00
Chris Robinson
aecf74e7bb
Don't throw exceptions from the audio decoder
2017-12-08 07:00:04 -08:00
Miloslav Číž
5e076ee015
CS: Fix camera orbit with arbitrary roll
2017-12-08 00:19:05 +01:00
Miloslav Číž
cfdc6c788e
CS: Make camera FOV change dynamically
2017-12-08 00:05:50 +01:00
Miloslav Číž
7d36dd68dc
CS: Make orbit camera not change roll
2017-12-07 23:52:05 +01:00
Miloslav Číž
360d786ff2
CS: Add rendering prefs and camera FOV
2017-12-07 23:48:34 +01:00
Andrei Kortunov
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
2017-12-07 22:43:32 +04:00
Miloslav Číž
b69c16e682
Add setting option to scale water refractions
2017-12-06 20:39:09 +01:00
Allofich
7e87ce8787
Prevent combat on/off cycling for calmed actors
2017-12-06 01:03:24 +09:00
Allofich
e0c54b3f39
Stop guards trying to arrest player when calm
...
(Fixes #3863 )
2017-12-05 23:53:02 +09:00
Andrei Kortunov
a28cc37501
Do not sell ingredients from organic containers
2017-12-05 10:24:58 +04:00
Andrei Kortunov
29b2308b2c
Do not display cyrillic soft/hard signs in the journal index
2017-12-04 22:42:17 +04:00
