2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
7 years ago
17678ee60f
Merge pull request #407 from OpenMW/master
...
Add OpenMW commits up to 17 Apr 2018
7 years ago
50fe54af5d
[Client] Update DedicatedPlayer creature if displayCreatureName changes
7 years ago
36e0f0471a
[Server] Add SetCreatureNameDisplayState script function
7 years ago
af558e07a3
implement +6 icons
7 years ago
69aacdff17
Lamoot's new icon set
7 years ago
ed15d9ebf5
Merge pull request #406 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
db41704e52
[Server] Use clearer function name for checking creature name display
7 years ago
a01fc577f1
[Client] Add setAttributes() and setSkills() methods to DedicatedPlayer
7 years ago
716809f2db
[Client] Prevent errors from NPC-only packets for DedicatedPlayers
7 years ago
68ee64902d
[Client] Track & use previous race & creatureRefId for DedicatedPlayers
7 years ago
acb1335d78
[Client] Make creature disguises update correctly
7 years ago
70f9cb535e
[General] Use RecordHelper methods to create and update DedicatedPlayers
7 years ago
174b3d2249
Reset an inventory filter after reload or a new game start (bug #4392 )
7 years ago
49e94725aa
[Client] Prevent MechanicsManager::playerLoaded() from enabling AI
7 years ago
9d27f5f154
[Client] Create RecordHelper class with initial NPC and creature methods
7 years ago
9697595857
[Client] Don't equip already equipped items in local setEquipment()
...
This avoids the following error when receiving repeated PlayerBaseInfo packets: "Error in frame: Invalid slot, make sure you are not calling RefData::setCount for a container object"
Additionally, only re-equip items as the result of a PlayerBaseInfo packet if resetStats is true (because of its side effect of auto-equipping items for the player).
7 years ago
72463cfdb6
[Client] Refresh equipment for DedicatedPlayers when setting base info
...
Additionally, move default fatigue value to DedicatedPlayer initialization.
7 years ago
2390744b45
Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.hpp
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
apps/openmw-mp/Script/Functions/Settings.hpp
apps/openmw-mp/Script/Functions/Stats.cpp
apps/openmw-mp/Script/Functions/Stats.hpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
fa652964fd
Merge pull request #403 from OpenMW/master
...
Add OpenMW commits up to 9 Apr 2018
7 years ago
d9acd19dc0
Merge branch 'master' into illusion
7 years ago
0982d2175a
Merge pull request #1473
7 years ago
92d0fb2981
Merge pull request #1667
7 years ago
35300c04cd
Merge pull request #1671
7 years ago
308551ad49
Merge pull request #1644
7 years ago
cbddb4a0a9
Merge pull request #1638
7 years ago
bdc9132e7c
[General] Add SetResetStats server script function
...
Add reading and writing of resetStats variable to PlayerBaseInfo Packet
Fix typos in various server script function descriptions
7 years ago
73dea494c4
[General] Allow changes from PlayerBaseInfo without player stat reset
7 years ago
cddc0914c8
Option to charge for all companions travelling ( fixes #4064 )
7 years ago
34893ff631
[Server] Split up handshake handling into multiple functions for debug
...
Unfortunately, the handshake attempt limit implemented in 4ebfcc4a21a3a341fee6
7 years ago
c132dc70d2
[Client] Make PlayerShapeshift turn DedicatedPlayers into creatures
7 years ago
141eb8b7c2
[Client] Streamline creation of references for DedicatedPlayers
...
Additionally, delete DedicatedPlayers who disconnect.
Previously, all disconnected DedicatedPlayers were still kept in memory, but never used again. There was code that suggested they were meant to be reused upon reconnecting, but that reuse had never actually been implemented, and would probably not be that useful anyway.
7 years ago
14f90e773d
[Client] Split up creation of DedicatedPlayers into multiple methods
...
Additionally, print player guids using their string representations for consistency.
The creation and updating of DedicatedPlayer references remains very inelegant, but this commit is the first step towards fixing that.
7 years ago
77467f17c9
Fix a typo
7 years ago
c8abd11f5d
[General] Move creature disguises for players to PlayerShapeshift packet
...
Additionally, make associated variables clearer, and move associated server script functions next to other shapeshifting functions.
7 years ago
c3b44e11fb
Merge pull request #402 from TES3MP/0.6.3
...
Add 0.6.3 commits up to 5 Apr 2018
7 years ago
34be9383e5
[General] Add isPlayer boolean to targets in packets
7 years ago
0eed05610b
[Client] Fix autoequipping for creatures in WorldEvent::editContainers()
7 years ago
a86c68c5a1
[General] Add sync for ranged weapon & projectile strike enchantments
7 years ago
3f8d94b030
[General] Synchronize strike enchantments in combat
7 years ago
27c831959e
Handle OnPCHitMe variable (bug #2703 )
7 years ago
f50637bdd4
Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/processors/world/ProcessorContainer.hpp
# apps/openmw/mwmp/WorldEvent.cpp
7 years ago
76468dc8c6
[Server] Remove remnant of hardcoded container sync
7 years ago
e3c43c6af7
Merge pull request #400 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
4f64ba7b7f
Implement sBookSkillMessage GMST
7 years ago
c6abec1e51
Merge pull request #1641
7 years ago
0071878106
Merge pull request #1642
7 years ago
d935e78f93
Merge pull request #1645
7 years ago
c610b8acc8
Merge pull request #1649
7 years ago
cd9f767e29
Merge pull request #1650
7 years ago
8e37f6bf3e
Merge pull request #1656
7 years ago
f36adfec5f
Merge pull request #1657
7 years ago
80a8ef6d49
Merge pull request #1661
7 years ago
6131ada0ba
[Browser] Add compatibility compilation mode
7 years ago
14daadded7
Add virtual destructors
...
To fix warnings:
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:588:8: warning: delete called on non-final 'NifOsg::ControllerFunction' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __p;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:595:4: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: __shared_count(__p)
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr_base.h:1079:17: note: in instantiation of function template specialization
'std::__shared_count<__gnu_cxx::_S_atomic>::__shared_count<NifOsg::ControllerFunction *>' requested here
: _M_ptr(__p), _M_refcount(__p, typename is_array<_Tp>::type())
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/shared_ptr.h:129:25: note: in instantiation of function template specialization 'std::__shared_ptr<NifOsg::ControllerFunction,
__gnu_cxx::_S_atomic>::__shared_ptr<NifOsg::ControllerFunction, void>' requested here
shared_ptr(_Yp* __p) : __shared_ptr<_Tp>(__p) { }
^
/home/elsid/dev/openmw/components/nifosg/nifloader.cpp:242:39: note: in instantiation of function template specialization 'std::shared_ptr<NifOsg::ControllerFunction>::shared_ptr<NifOsg::ControllerFunction, void>' requested here
callback->setFunction(std::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:78:2: warning: delete called on non-final 'MWGui::ResponseCallback' that has virtual functions but non-virtual destructor
[-Wdelete-non-virtual-dtor]
delete __ptr;
^
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/bits/unique_ptr.h:268:4: note: in instantiation of member function 'std::default_delete<MWGui::ResponseCallback>::operator()' requested here
get_deleter()(__ptr);
^
/home/elsid/dev/openmw/apps/openmw/mwgui/dialogue.cpp:58:23: note: in instantiation of member function 'std::unique_ptr<MWGui::ResponseCallback, std::default_delete<MWGui::ResponseCallback> >::~unique_ptr' requested here
PersuasionDialog::PersuasionDialog(ResponseCallback* callback)
^
7 years ago
26a56d6a02
[Client] Include NPC/creature containers when adding all cell containers
7 years ago
5bb09d3bed
Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwmp/WorldEvent.hpp
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
7 years ago
1e3c4fd488
[Client] Fix ProcessorContainer typos caused by careless copy-pasting
7 years ago
7b97e8671d
Merge pull request #398 from OpenMW/master
...
Add OpenMW commits up to 30 March 2018
7 years ago
f80f3bd484
[Client] Make it possible to reply to requests about specific containers
...
Previously, a Container packet with a REQUEST action always made the client respond with the contents of all the containers in that cell.
The previous behavior now only happens for requests that have no WorldObjects attached, while requests that have WorldObjects attached get a reply with the contents of those specific containers.
7 years ago
ec1311fcb7
[Client] Make it possible to check whether a class has a ContainerStore
7 years ago
258e319acb
[Client] Require InventoryStore for autoequipping actors
7 years ago
afe8c97cb9
[Client] Require InventoryStore for unequipping actors in editContainers
7 years ago
d8b48f6cf4
[Client] Remove redundant container methods from CellController
7 years ago
2aaf9105af
[Browser] Add Client Settings and Server Settings Tabs.
...
Save Browser state to the client config
7 years ago
baaf65bc2c
Add vanilla enchanted weaponry behavior option, on by default ( fixes #4136 )
7 years ago
2dca389a3b
Extend magic resistance/weakness to all effects that can be resisted ( fixes #4309 )
7 years ago
fdcfbdbdd1
android: Update for sdl 2.0.8
7 years ago
e6d9bce519
Implement fWerewolfHealth GMST ( fixes #4142 )
7 years ago
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
3d5860d6f4
Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Settings.cpp
apps/openmw-mp/Script/Functions/Settings.hpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw/mwgui/container.cpp
apps/openmw/mwmp/LocalActor.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
components/openmw-mp/Base/BaseEvent.hpp
components/openmw-mp/Log.cpp
components/openmw-mp/Log.hpp
7 years ago
76f50312f2
Remove a redundant check
7 years ago
ac82124a5d
Merge pull request #395 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
7 years ago
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
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
2d119e834a
Add vanilla absorb attribute behavior option, on by default ( Fixes #4135 )
7 years ago
b6a2589e7b
Don't apply harmful spell effects on the player in god mode ( fixes #4264 )
7 years ago
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
9165b12d78
[Client] Update inventory views when receiving inventory or equipment
7 years ago
41f89c84f8
Don't move the player if opposite direction keys are held down at the same time ( Fixes #4233 )
7 years ago
bb15ee9215
[Client] Make it possible to get ContainerWindow from elsewhere in code
7 years ago
5a3086b0c6
Auto-detect the actual Morrowind assets path ( Fixes #4336 )
7 years ago
42b7846f81
Replace a redundant playerAllies check with a boolean ( Fixes #4229 )
7 years ago
63e34a5575
Typofix: updateCrimePersuit -> ...Pursuit
7 years ago
bbdc30628b
[Client] Use the correct guid for a received WorldEvent or ActorList
7 years ago
c02920bcd1
Merge pull request #1634
...
Conflicts:
apps/openmw/mwworld/worldimp.hpp
7 years ago
f47429d575
Merge pull request #1635
7 years ago
ff7f964643
Merge pull request #1636
7 years ago
14f0299322
[Client] Don't log InputBox inputs for client
7 years ago
fed3e56fc1
Weather manager: get rid of World dependency
7 years ago
53ef345680
Update magic effect particles after building new animation (bug #2254 )
7 years ago
a0a30cdbf5
AI: hide torches during bad weather (bug #4334 )
7 years ago
bd6c7de579
Do not unequip two-handed weapon when equipping torch
7 years ago
d626d89c49
OpenMW-CS: Fix a typo in startup warning.
7 years ago
5b49248d6e
Restrict opening doors to bipedal actors ( Fixes #4313 )
7 years ago
edb57306b6
Merge pull request #1628
7 years ago
17fa1a4d51
Merge pull request #1630
7 years ago
7a5748a9f1
Merge pull request #1632
7 years ago
a26483ab26
Fix memory leak
...
There is no delete for TextFormat objects in PageDisplay destructor.
7 years ago
26df0e6ebd
Remove duplicated include
7 years ago
2f9b6b536b
Label gtest directories as system
...
To hide all warnings when use custom GTEST_ROOT.
7 years ago
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
e0aa5e8e79
Prevent overlapping for journal and books scrolling
7 years ago
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
a3a341fee6
[Server] Reimplement 4ebfcc4a21 for 0.6
7 years ago
7ec08e125b
Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Settings.cpp
apps/openmw-mp/Script/Functions/Settings.hpp
7 years ago
bf906b3f0a
Merge pull request #393 from OpenMW/master
...
Add OpenMW commits up to 10 March 2018
7 years ago
b2a3dd9d60
Revert "[Server] Add previous state to ON_RECORD_DYNAMIC"
...
This reverts commit 2ac01dc02a2ac01dc02a2ac01dc02a
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
62c04c6758
Unstack soulgem, added via AddSoulGem console command (bug #4351 )
7 years ago
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
7 years ago
870c658500
Remove missing souls, remove some runaway exceptions ( Fixes #4111 )
7 years ago
7f39dbb129
Merge pull request #1626
7 years ago
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
dfcd243150
Remove the word "interior" from cell not found message
7 years ago
96c2b9374f
Merge pull request #1621
7 years ago
bf78c18296
Merge pull request #1624
7 years ago
148cda254d
Merge pull request #1617
7 years ago
3b922d810a
Don't use floating point arithmetics for formatted count (Bug #4346 )
7 years ago
60a663ef58
Account for all possible count values in getCountString (Bug #4346 )
7 years ago
6c3ac834c4
Preventing max quicksaves from being saved to settings.cfg if it is unchanged.
7 years ago
2ac01dc02a
[Server] Add previous state to ON_RECORD_DYNAMIC
7 years ago
4aff1f1833
[Server] Add previous state to ON_PLAYER_SKILL
...
That is array of struct with next content: {base, current, mod, damage, progress}
7 years ago
017956366f
[Server] Add previous state argument to ON_PLAYER_ATTRIBUTE event
...
That is array of struct with next content: {base, current, mod, damage}
7 years ago
afbafdf806
[Server] Add PreReading virtual method
...
add "const" qualifier to exteriorCellPattern
7 years ago
d0eef7c98e
[Server] Add possibility to use previous state of data in events
7 years ago
01dbac7b15
Don't use a different setting for distant viewing distance
7 years ago
41669467ae
Make settings for distant fog parameters
7 years ago
4caa7c9674
Workaround older MSVC quirk
7 years ago
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.
7 years ago
6d557fec8e
Increase the far clip plane when distant terrain is enabled
7 years ago
d371bebb33
Prevent items in a container owned by a dead actor from being counted as stolen (Bug #4328 )
7 years ago
cc0c6ddaa6
Account for empty victimRef (Bug #4328 )
7 years ago
839196e4fa
Force normal polygon mode for the map camera ( Fixes #4235 )
7 years ago
c18d07827d
[Client] Hide difficulty widget because it has no use in multiplayer
7 years ago
37b349c2f6
Merge pull request #390 from OpenMW/master
...
Add OpenMW commits up to 28 Feb 2018
7 years ago
b6d9b6f544
Formatting improvement for advanced page
7 years ago
4292351993
Adding Max Quicksaves setting to Launcher
7 years ago
9e9c278527
Merge pull request #1597
7 years ago
929fc68160
Consider items with dead owner not stolen (fixes bug #4328 )
7 years ago
7deff7a42a
[Server] Use "else if" instead "if" + "return"
7 years ago
23da0b16ea
[Server] Fix build
7 years ago
9e10eb9c84
Merge pull request #389 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2018
7 years ago
03266d7648
[Client] Prevent guards from arresting players who are currently jailed
7 years ago
31d7e6af32
Merge pull request #1608
7 years ago
56613d817e
Merge pull request #1612
7 years ago
089666dd68
Round up displayed encumbrance
7 years ago
a67373d116
Fixing "Show Enchant Chance" checkbox setting melee info instead
7 years ago
99360e132f
Only display "new journal entry" message in dialogue if there *is* a new entry
7 years ago
24ba4ae404
[Server] Delete ON_GUI_ACTION
7 years ago
73d030b779
[Server] Remove return value from ON_PLAYER_CONNECT event
7 years ago
4e869a2974
[General] Use correct versions of C++ per target
...
C++11 for client, components and launcher
C++14 for server, browser and masterserver
7 years ago
e85d0db771
[Server] Code style
7 years ago
44c549211e
[Server] use std::unique_ptr for packet controllers and MasterClient
7 years ago
2bfd4627ed
[Server] Use queue for MessageBox packets
7 years ago
bb7c5ee34c
[Server] Allow nil as callback
7 years ago
54945b537d
[Server] Get rid handwritten ids in GUI API
7 years ago
4bde7d80f5
[Server] Use regular Ptrs where possible to avoid seizure Ptrs by lua
7 years ago
f2a88e6a37
[Server] Use multiple parameters instead functions for Mark functions
7 years ago
410eb353e8
[Server] Call GC after deleting player
7 years ago
a9614ad28e
[Server] Fix invalid read
7 years ago
69436714f9
[Server] Fix uninitialized variable
7 years ago
60f686ee43
[General] Implement setting of physics framerate as part of GameSettings
7 years ago
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.
7 years ago
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.
7 years ago
53d758ba16
Merge pull request #385 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018
7 years ago
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
7 years ago
a708ac488e
Don't call Store::setUp() unnecessarily
...
Fixes a threading issue with ESM::Land store caused by calling setUp() while it's being used.
7 years ago
3b865244d0
[Server] Fix typo related to player deletion
7 years ago
4e9cac96c7
[Server] Add scale and selected spell functions to Player in Sol
7 years ago
ac374a8ef9
Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
apps/openmw-mp/Script/Functions/Quests.cpp
apps/openmw-mp/Script/Functions/Quests.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwworld/worldimp.cpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
a7e3261b0b
Merge pull request #383 from OpenMW/master
...
Add OpenMW commits up to 11 Feb 2018
7 years ago
5bb7d76913
Merge pull request #1605
7 years ago
899d464b0d
Cap the rain emitter's frame time ( Fixes #4314 )
7 years ago
f28024b541
Don't use Activate and Move keys for GUI navigation if bound to mouse buttons ( Fixes #4225 , Fixes #4320 )
7 years ago
f626a7fcc7
Take in account PC rank during disposition calculation (bug #4322 )
7 years ago
74765b3ace
[General] Implement selected spell sync as part of PlayerMiscellaneous
7 years ago
2a5a574134
Merge remote-tracking branch 'thunderforge/feature/4054-launcher-advanced-settings-panel'
7 years ago
029dfc56ba
[General] Implement player scale as part of PlayerShapeshift
7 years ago
aa448523f8
[Client] Clean up WorldEvent::runConsoleCommands() slightly
7 years ago
ce5670e57e
[Client] Ignore invalid object refIds from ObjectPlace packets
7 years ago
4496625154
Merge pull request #381 from OpenMW/master
...
Add OpenMW commits up to 31 Jan 2018
7 years ago
66078bfea7
[General] Implement Mark location sync as part of PlayerMiscellaneous
7 years ago
b1b8e31562
Use unique_ptr over new/delete ( Fixes #4305 )
7 years ago
989f6e6b51
[General] Implement PlayerReputation packet
7 years ago
88ae0772cf
[Server] Initialize new processors and fix issues with RecordDynamic
7 years ago
bdafa8e9ab
Merge pull request #380 from TES3MP/0.6.3
...
Add 0.6.3 commits up to 30 Jan 2018
7 years ago
3d80e2db62
[General] Add placeholders for new packet types, part 2
7 years ago
f1ba9253b0
[Client] Fix build
7 years ago
8b17844781
Replacing Qt5-only method with Qt4-compatible code
7 years ago
5858e05362
Merge pull request #378 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/CMakeLists.txt
apps/openmw-mp/Script/ScriptFunctions.hpp
components/CMakeLists.txt
7 years ago
02af7f6ba1
[General] Add placeholders for new packet types
7 years ago
8837046d9c
Adding panel for advanced settings.cfg options
7 years ago
1a8a518897
Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
README.md
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwworld/scene.cpp
components/openmw-mp/Version.hpp
7 years ago
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
7 years ago
89c6b59c30
Merge pull request #1602
7 years ago
ce11a1dfa9
[Client] Fix potential invalid pointer when storing cell unloads
...
Notably, builds of the client done with Clang were crashing on startup before this.
7 years ago
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".
7 years ago
595bc5a152
[Client] Only send ObjectScale packets when scale actually changes
7 years ago
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
569911121d
[Client] Fix build
7 years ago
5cf71a4e67
Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp
7 years ago
d70b93e095
Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmp/DedicatedActor.cpp
# apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp
7 years ago
d7e29f1f61
[Client] Unequip items with constant effect damage when resurrected
7 years ago
d19d8b0a34
[Client] Add and use enchantmentType argument for unequipItemsByEffect()
7 years ago
6c4bb8c423
[Client] Move resurrection code for local player to LocalPlayer
7 years ago
6b75a82777
[Client] Ignore equipment items for DedicatedActors with count below 0
7 years ago
e3bc11d9eb
[Client] Fix ListBox overlap crashes by removing ListBoxes properly
7 years ago
c6a85ee8f9
[Client] Add doesEffectListContainEffect() method to MechanicsHelper
7 years ago
aa392ebf20
[Client] Unequip items if necessary when attr/skill modifier is set to 0
7 years ago
ace825b99c
[Client] Ignore invalid player class IDs from packets
...
Additionally, clean up variables names in related code.
7 years ago
c6874509b6
[Client] Ignore invalid faction IDs from packets
7 years ago
edd883853d
[Server] Add sendConsoleCommand function to lua api
7 years ago
0e97b769f9
[General] Change type of Object::enchantmentCharge
7 years ago
4cfb04aa7f
[Server] Fix setBedRestAllowed
7 years ago
7e5b929ea2
[General] Rework PacketPlayerFaction
7 years ago
29ba07fe8c
[General] Rework PacketPlayerInventory
...
Save the Action for each item. Now you can add or remove multiple items
7 years ago
de0bb3cdab
[General] Change type of Item::enchantmentCharge to float
7 years ago
cb86557aca
[Server] Init Player::inUpdateQueue
7 years ago
1f1cbf53f9
[Client] Mark trivial destructor as default, remove "virtual" keyword
...
Mark constructor as explicit
7 years ago
b63bf258ff
[Client] Remove "virtual" keyword for getLocalActor & getDedicatedActor
7 years ago
c2578918f2
[Client] Do not copy strings in getLocalActor and getDedicatedActor
7 years ago
e2e197d84a
[Client] Fix getting element of shared_ptr by reference
7 years ago
f1e2bc01f6
[General] Use floats instead of doubles for enchantmentCharge
7 years ago
8d44d3124e
Android: Add callbacks for basic cursor handling.
7 years ago
a037193e79
Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Actors.cpp
apps/openmw-mp/Script/Functions/Actors.hpp
apps/openmw-mp/Script/Functions/Items.cpp
apps/openmw-mp/Script/Functions/Items.hpp
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw-mp/Script/Functions/World.hpp
apps/openmw/mwmp/WorldEvent.cpp
components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
components/openmw-mp/Version.hpp
7 years ago
455f718394
Android: register a virtual controller definition
7 years ago
3af8f63895
Use unsigned integer types for QuickSave indices
7 years ago
5894ffae7d
[Client] Ignore dynamic object placements or spawns in packets
7 years ago
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment packets.
7 years ago
f746958afa
[Client] Send enchantmentCharge for items added or removed in containers
7 years ago
bce3d0eb4c
[Client] Use more descriptive message for version mismatch
7 years ago
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
7 years ago
d2121ccd62
Update android port.
7 years ago
f09fd6795c
Follow openmw style guide
7 years ago
2caaa48b91
Workaround to make sure message box remains on top ( Fixes #4298 )
7 years ago
e2e48e0a50
Add default value for 'sAnd' GMST ( Fixes #4269 )
7 years ago
d9d8de3061
Catch exceptions in updateWindowManager (Bug #4269 )
7 years ago
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557 )
7 years ago
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.
7 years ago
eccb49da18
Do not summon the bound bow if there is no suitable ammo
7 years ago
b995617559
implement rateAmmo() function
7 years ago
043eb224e2
[Browser] Cast QStrings to UTF-8 instead Latin1
7 years ago
35b771b19e
[Browser] Rework Connect window
7 years ago
dd5ebe225b
Merge pull request #1580
7 years ago
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
7 years ago
1522bda60b
Fix crash in getDistance when invoked before the game starts
7 years ago
83726ee06a
Fix Reset Controls button not functioning properly
7 years ago
92060bd6b6
Merge pull request #370 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 10 Jan 2018
7 years ago
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
c7f60a6dc8
Merge pull request #1595
7 years ago
f6ca7295a6
Revert "Merge pull request #1595"
...
This reverts commit 7ef7b1a7b19e7e4de0ab
7 years ago
7ef7b1a7b1
Merge pull request #1595
7 years ago
9e7e4de0ab
Merge pull request #1594
7 years ago
dba071f881
Remove the 'Screenshot saved' message (bug #4191 )
7 years ago
1de9f30449
[Server] Fix iterating killed timers when kill() called in the callback
...
Instance new timers before new tick
7 years ago
8316ec0fa7
[Client] Update tes3mp change comment for object rescaling
7 years ago
09548d05f7
[Client] Ignore cell changes that move actors to where they already are
7 years ago
4a9a628a0f
[Client] When getting an actor, make sure their cell is initialized
7 years ago
4caf7ca30a
[Client] Add temporary fix for crashes caused by custom GUI elements
7 years ago
0cc86c04d1
[Client] Print plugin discrepancies, not just plugin lists side by side
7 years ago
7248a5d037
Remove some duplication, standardize sol2 header inclusion
7 years ago
ba4d2bd5fe
Merge remote-tracking branch 'origin/master' into LibIssues
7 years ago
b6a7377692
Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try
...
Conflicts:
apps/openmw-mp/Networking.cpp
apps/openmw-mp/Script/Functions/Miscellaneous.cpp
apps/openmw-mp/Script/Functions/Miscellaneous.hpp
apps/openmw/mwmp/GUI/GUIChat.cpp
7 years ago
fcd4d8b842
Fix build for gcc-5.4.0
7 years ago
e2103d0bea
Clean up find file for LuaJit, add one for Sol2
7 years ago
35922e4898
[General] Change "enum ACTOR_ACTION" to "enum class Action"
7 years ago
5b8f4f3e92
[Browser] Stop PingHelper on refresh
7 years ago
a639d3494a
[Client] Fix use of DedicatedPlayers as targets for ConsoleCommand
7 years ago
502df7d9c1
[Client] Clean up GUIChat slightly
7 years ago
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
7 years ago
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
1cf2f35a28
[Server] Add script functions to set & get plugin enforcement state
7 years ago
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
7 years ago
c3c3fbc68e
overriden -> overridden
7 years ago
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
7 years ago
bca9c55046
[Client] Reinstate "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 2f4cd6b71345993d3da2https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
7 years ago
c4949ac5d9
[General] Change regular enums to enum class
7 years ago
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
8f5d31cb03
[Server] Iterate only through updated players on each frame
7 years ago
4ab338bbb1
[Server] Register ON_PLAYER_QUICKKEYS event
7 years ago
5777759aae
[General] Change enum QuickKey::QUICKKEY_TYPE to enum class
7 years ago
2019128d92
[Server] Change signature of TimerController::kill, validate callback
7 years ago
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
7 years ago
51a92bcf8f
[Client] Fix build
7 years ago
09958681cd
Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try
7 years ago
57257d057f
Remove unintended jump cooldown ( Fixes #4250 )
7 years ago
47a3dc9ff2
[Server] Add broadcast argument to functions for sending WorldPackets
7 years ago
1e2517698d
[Server] Send player speech and animation packets only to nearby players
7 years ago
2f4cd6b713
[Client] Revert "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 45993d3da23d347730dchttps://bugs.openmw.org/issues/4250 is fixed.
7 years ago
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).
7 years ago
dddd2f1cc7
Merge pull request #361 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
5fd9079b26
[Client] Stop drag and drop when setting player inventory
7 years ago
40e70ebf9c
[Client] Fix key focus for chat window
7 years ago
bed96e5a3d
[Client] Remove check of GM_RestBed GUI mode that no longer exists
7 years ago
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
7 years ago
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
7 years ago
b8c25e6bff
Use the correct priority of animation sources in getStartTime ( Fixes #4263 )
7 years ago
7245b251e8
Merge remote-tracking branch 'drummyfish/cs-cam'
7 years ago
Andreas Sturmlechner
David Cernat
Nelsson Huotari
Andrei Kortunov
Capostrophic
scrawl
Koncord
elsid
Ilya Zhuravlev
bret curtis
Capostrophic
RoadTrain
Harald H
Thunderforge
Chris Robinson
Daniel Vukelich
Marc Zinnschlag
Kyle Cooley
Miloslav Číž