20743 Commits (365f485e8d3af609c4ddcddde9ecb042e24edc39)

 

All Branches   

Search

Author	SHA1	Message	Date
David Cernat	365f485e8d	Merge pull request #397 from OpenMW/master while resolving conflicts ... Conflicts: components/CMakeLists.txt	7 years ago
Bret Curtis	5e6be0307e	Merge pull request #1651 from psi29a/remove_gles_but_keep_android ... remove native GLESv* support, as it never worked; make things less co…	7 years ago
David Cernat	ac82124a5d	Merge pull request #395 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwmechanics/actors.cpp	7 years ago
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.	7 years ago
bret curtis	4890ecd357	remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb	7 years ago
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.	7 years ago
David Cernat	9165b12d78	[Client] Update inventory views when receiving inventory or equipment	7 years ago
David Cernat	bb15ee9215	[Client] Make it possible to get ContainerWindow from elsewhere in code	7 years ago
Bret Curtis	1e600de44e	Merge pull request #1640 from unelsson/typofix_updatecrimepersuit ... Typofix: updateCrimePersuit -> updateCrimePursuit	7 years ago
Nelsson Huotari	63e34a5575	Typofix: updateCrimePersuit -> ...Pursuit	7 years ago
David Cernat	bbdc30628b	[Client] Use the correct guid for a received WorldEvent or ActorList	7 years ago
scrawl	c02920bcd1	Merge pull request #1634 ... Conflicts: apps/openmw/mwworld/worldimp.hpp	7 years ago
scrawl	f47429d575	Merge pull request #1635	7 years ago
scrawl	ff7f964643	Merge pull request #1636	7 years ago
scrawl	5c1551d1ac	Merge pull request #1637	7 years ago
David Cernat	14f0299322	[Client] Don't log InputBox inputs for client	7 years ago
Andrei Kortunov	fed3e56fc1	Weather manager: get rid of World dependency	7 years ago
Andrei Kortunov	53ef345680	Update magic effect particles after building new animation (bug #2254)	7 years ago
Andrei Kortunov	a0a30cdbf5	AI: hide torches during bad weather (bug #4334)	7 years ago
Andrei Kortunov	bd6c7de579	Do not unequip two-handed weapon when equipping torch	7 years ago
RoadTrain	d626d89c49	OpenMW-CS: Fix a typo in startup warning.	7 years ago
Capostrophic	5b49248d6e	Restrict opening doors to bipedal actors (Fixes #4313)	7 years ago
scrawl	eb723f5ae6	Merge pull request #1629	7 years ago
scrawl	edb57306b6	Merge pull request #1628	7 years ago
scrawl	17fa1a4d51	Merge pull request #1630	7 years ago
scrawl	7a5748a9f1	Merge pull request #1632	7 years ago
Bret Curtis	9b93741c7b	Merge pull request #1631 from elsid/rm_duplicate_includes ... Remove duplicated include	7 years ago
Capostrophic	002ad9ae1b	Print a warning in case a fallback value wasn't found	7 years ago
elsid	a26483ab26	Fix memory leak ... There is no delete for TextFormat objects in PageDisplay destructor.	7 years ago
elsid	26df0e6ebd	Remove duplicated include	7 years ago
elsid	2f9b6b536b	Label gtest directories as system ... To hide all warnings when use custom GTEST_ROOT.	7 years ago
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.	7 years ago
Capostrophic	e4531a6910	Use middle gray instead of pure black as default fallback color (Fixes #2841)	7 years ago
Andrei Kortunov	e0aa5e8e79	Prevent overlapping for journal and books scrolling	7 years ago
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.	7 years ago
David Cernat	a3a341fee6	[Server] Reimplement 4ebfcc4a21 for 0.6	7 years ago
David Cernat	bf906b3f0a	Merge pull request #393 from OpenMW/master ... Add OpenMW commits up to 10 March 2018	7 years ago
scrawl	27610a85ac	Merge pull request #1627	7 years ago
David Cernat	b7c6261e16	Merge pull request #392 from OpenMW/master while resolving conflicts ... # Conflicts: # README.md	7 years ago
Andrei Kortunov	62c04c6758	Unstack soulgem, added via AddSoulGem console command (bug #4351)	7 years ago
scrawl	e81faf5f2f	Add an option to disable GUI keyboard navigation (Bug #4333)	7 years ago
scrawl	870c658500	Remove missing souls, remove some runaway exceptions (Fixes #4111)	7 years ago
scrawl	7f39dbb129	Merge pull request #1626	7 years ago
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	7 years ago
Thunderforge	dfcd243150	Remove the word "interior" from cell not found message	7 years ago
scrawl	96c2b9374f	Merge pull request #1621	7 years ago
scrawl	bf78c18296	Merge pull request #1624	7 years ago
scrawl	148cda254d	Merge pull request #1617	7 years ago
Capostrophic	3b922d810a	Don't use floating point arithmetics for formatted count (Bug #4346)	7 years ago
Capostrophic	60a663ef58	Account for all possible count values in getCountString (Bug #4346)	7 years ago