mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-26 05:09:40 +00:00
Code Issues Releases Wiki Activity
21166 commits 38 branches 54 tags 122 MiB
Commit graph

793 commits

Author SHA1 Message Date
Koncord
410eb353e8 [Server] Call GC after deleting player 2018-02-16 04:41:19 +08:00
Koncord
a9614ad28e [Server] Fix invalid read 2018-02-16 04:38:42 +08:00
Koncord
69436714f9 [Server] Fix uninitialized variable 2018-02-16 04:36:44 +08:00
David Cernat
60f686ee43 [General] Implement setting of physics framerate as part of GameSettings 2018-02-14 05:53:44 +02:00
David Cernat
3b865244d0 [Server] Fix typo related to player deletion 2018-02-12 07:23:52 +02:00
David Cernat
4e9cac96c7 [Server] Add scale and selected spell functions to Player in Sol 2018-02-12 07:08:47 +02:00
David Cernat
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
 2018-02-12 06:50:52 +02:00
David Cernat
74765b3ace [General] Implement selected spell sync as part of PlayerMiscellaneous 2018-02-06 06:36:46 +02:00
David Cernat
029dfc56ba [General] Implement player scale as part of PlayerShapeshift 2018-02-01 02:11:45 +02:00
David Cernat
66078bfea7 [General] Implement Mark location sync as part of PlayerMiscellaneous 2018-01-31 04:50:29 +02: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
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
 2018-01-30 00:54:56 +02:00
David Cernat
02af7f6ba1 [General] Add placeholders for new packet types 2018-01-29 22:32:51 +02:00
David Cernat
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
 2018-01-29 02:57:48 +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
Koncord
edd883853d [Server] Add sendConsoleCommand function to lua api 2018-01-20 20:46:14 +08:00
Koncord
0e97b769f9 [General] Change type of Object::enchantmentCharge 2018-01-20 20:07:29 +08:00
Koncord
4cfb04aa7f [Server] Fix setBedRestAllowed 2018-01-20 20:06:41 +08:00
Koncord
7e5b929ea2 [General] Rework PacketPlayerFaction 2018-01-20 19:45:24 +08:00
Koncord
29ba07fe8c [General] Rework PacketPlayerInventory 
Save the Action for each item. Now you can add or remove multiple items
 2018-01-20 18:40:23 +08:00
Koncord
de0bb3cdab [General] Change type of Item::enchantmentCharge to float 2018-01-20 18:32:26 +08:00
Koncord
cb86557aca [Server] Init Player::inUpdateQueue 2018-01-20 15:46:25 +08:00
David Cernat
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
 2018-01-18 13:40:13 +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
Koncord
1de9f30449 [Server] Fix iterating killed timers when kill() called in the callback 
Instance new timers before new tick
 2018-01-08 12:24:36 +08:00
Kyle Cooley
7248a5d037 Remove some duplication, standardize sol2 header inclusion 2018-01-05 20:25:57 -05:00
Kyle Cooley
ba4d2bd5fe Merge remote-tracking branch 'origin/master' into LibIssues 2018-01-05 17:35:47 -05:00
David Cernat
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
 2018-01-05 21:24:14 +02:00
Kyle Cooley
e2103d0bea Clean up find file for LuaJit, add one for Sol2 2018-01-04 21:40:17 -05:00
Koncord
35922e4898 [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
David Cernat
1cf2f35a28 [Server] Add script functions to set & get plugin enforcement state 2018-01-02 16:33:18 +02:00
Koncord
c4949ac5d9 [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Koncord
8f5d31cb03 [Server] Iterate only through updated players on each frame 2018-01-02 11:57:32 +08:00
Koncord
4ab338bbb1 [Server] Register ON_PLAYER_QUICKKEYS event 2018-01-02 11:53:03 +08:00
Koncord
5777759aae [General] Change enum QuickKey::QUICKKEY_TYPE to enum class 2018-01-02 11:52:38 +08:00
Koncord
2019128d92 [Server] Change signature of TimerController::kill, validate callback 2018-01-02 08:17:26 +08:00
David Cernat
09958681cd Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02: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
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
993081ba1e [General] Add enchantmentCharge to worldObjects and items 2017-12-23 13:16:38 +02:00
David Cernat
a84c4c7ecc [Server] Print module order on startup 2017-12-10 15:57:19 +02:00
David Cernat
f2eca2566f [Server] Add storedData table for Player to increase clarity 
This way, customData is meant to hold module-specific and temporary data while storedData is meant to hold persistent core data.
 2017-12-10 10:06:27 +02:00
Koncord
077a3d06b3 [General] Change type of BasePlayer::resurrectType to ResurrectType 2017-12-10 12:01:04 +08:00
Koncord
f9c4b847aa [Server] Make argument const reference 2017-12-10 11:46:50 +08:00
Koncord
c5388e49f2 [Server] Remove Pawn switcher in cmake 2017-12-10 10:29:10 +08:00
Koncord
ba07d7820f [Server] Remove Terra 2017-12-10 10:20:24 +08:00
Koncord
77d14211c9 [Server] Add Weather.cpp to build 2017-12-10 10:16:16 +08:00
Koncord
44dc153ebe [Server] Add Weather API 2017-12-10 09:51:03 +08:00
Koncord
aff1859759 [Server] Add new line for help strings 2017-12-10 09:47:35 +08:00
Koncord
122a30c183 [General] Change type of refNumIndex & mpNum to unsigned 2017-12-10 09:20:13 +08:00
Koncord
bfdf348a6c [Server] Fix Undefined behavior 2017-12-09 18:01:15 +08:00
Koncord
4d0072a74c [Server] Use foreach loop 2017-12-09 15:04:09 +08:00
Koncord
cd620e17ec [Server] Use std::move(tokens) 2017-12-09 15:03:44 +08:00
Koncord
dd352f0a91 [Server] Improve Player::sendToLoaded() 2017-12-09 15:03:06 +08:00
Koncord
f35d35741e [General] Remove redundant code 
Remove BaseEvent::worldObjectCount
Remove BaseActor::count
Use foreach loops in packets and processors
Remove redundant "&" in CellController::get().getCell() calls
 2017-12-09 14:59:41 +08:00
Koncord
585c24cee8 [Server] Optimize CellController 2017-12-09 11:44:56 +08:00
Koncord
ff8b5061b4 [Server] Modernize CellController singleton 2017-12-09 11:08:53 +08:00
Koncord
e97dac7793 [Server] Mark derived processor classes as final 2017-12-09 10:20:55 +08:00
David Cernat
ad61d88cb1 [General] Fix typos and use consistent style for recent additions 2017-12-08 18:02:23 +02:00
Koncord
1c7330635b [Server] Add & register ON_PLAYER_WEATHER event 2017-12-08 20:38:36 +08:00
Koncord
392e645fe5 [Server] Add isMarkedForDeleteion function 2017-12-08 20:37:22 +08:00
Koncord
91398c5dcc [Server] Implicitly join to "Default" channel 2017-12-08 20:35:19 +08:00
Koncord
aa183e6844 [General] Introduce chat channels 2017-12-08 07:43:29 +08:00
Koncord
c55f0f73b8 [Server] Pass shared_ptr<Player> by reference 2017-12-08 07:32:49 +08:00
Koncord
94f3eaa980 [Server] Fix warning "implicit fallthrough" 2017-12-06 13:30:39 +08:00
David Cernat
e97c9f72a2 [General] Rework getting/clearing of skill modifiers as with attributes 2017-12-04 15:06:27 +02:00
David Cernat
456bcee68a [Server] Use Utils function as workaround for "bad exception" on Windows 2017-12-04 14:32:23 +02:00
David Cernat
cfb5835e17 [Server] Clean up method and variable names 2017-12-04 10:39:20 +02:00
David Cernat
fc5e883160 [General] Rework PlayerStatsDynamic packets so they are of minimal size 2017-12-02 18:29:30 +02:00
David Cernat
993cc3dfd6 [Server] Rename server "plugins"/"mods" into "modules" for clarity 
The terms "plugins" and "mods" were used interchangeably to refer to collections of server scripts, which was bound to cause confusion later on, especially with client data files frequently being referred to as "plugins" and "mods" as well.

Moreover, the server configuration file now starts its manual ordering with "Module1" for consistency with the pluginlist.json (soon to be dataFileList.json) of the CoreScripts.
 2017-12-02 15:39:08 +02:00
David Cernat
2944be18ae [Server] Actually, turn SetAttributeModifier into ClearAttributeModifier 
There's no way SetAttributeModifier() was going to make sense if, say, a player had drunk 3 different potions fortifying the same attribute and was wearing equipment fortifying it as well. How would one change the sum modifier of those while accounting for each specific effect's duration and magnitude?

The only workable solution is to allow the server to clear the modifier.
 2017-12-02 09:19:33 +02:00
David Cernat
e8d636ebc3 [Server] Rework Get/SetAttributeCurrent into Get/SetAttributeModifier 
As seen here, attributes don't use the concept of current values, but rather of value modifiers and value damage:

https://github.com/OpenMW/openmw/blob/master/apps/openmw/mwmechanics/stat.cpp#L217
 2017-11-30 22:37:06 +02:00
David Cernat
d1ad0c91f8 [General] Rework PlayerEquipment packets so they are of minimal size 
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
 2017-11-30 12:31:54 +02:00
David Cernat
c9c363ebef [General] Allow GameSettings to set bed & wilderness resting separately 2017-11-30 12:18:15 +02:00
David Cernat
bd9e8bd10f [General] Simplify storing of attribute and skill index changes 2017-11-29 16:55:51 +02:00
David Cernat
720ef5f6c5 [General] Use consistent code style 2017-11-29 13:00:22 +02:00
Koncord
e44fcdc0b3 [General] Cleanup Player packets 2017-11-28 21:38:45 +08:00
David Cernat
3508a16836 [General] Use GameSettings packet to set ability to rest and wait 2017-11-27 07:39:02 +02:00
David Cernat
901fe72471 [Server] Fix variable shadowing in Player 2017-11-26 13:14:53 +02:00
David Cernat
a796f81444 [General] Add and use utility function for int value checks in vectors 2017-11-26 13:03:54 +02:00
Koncord
4ebfcc4a21 [Server] Limit handshake attempts 2017-11-26 00:18:19 +08:00
Koncord
729f6e745e [Server] Remove unused get() method from EventController 2017-11-26 00:00:31 +08:00
Koncord
e657934cef [Server] Add custom window API 2017-11-25 23:47:02 +08:00
David Cernat
b0965f094a [General] Rework PlayerAttribute packets so they are of minimal size 
Previously, whenever a single attribute value changed for a player, that player then sent a PlayerAttribute packet with all values for all 8 attributes.

This did not cause anywhere as much packet spam as PlayerSkill used to, but there was no good reason not to fix it as well.
 2017-11-24 14:28:05 +02:00
David Cernat
ef79a98544 [General] Rework PlayerSkill packets so they are of minimal size 
Previously, whenever a single skill value changed for a player, that player then sent a PlayerSkill packet with all values for all 27 skills, plus the player's progress towards the next level and the bonuses to each attribute on the next level up as the result of sklll increases thus far.

This commit makes PlayerSkill contain only the values of specific skills, moves the player's progress towards the next level to PlayerLevel packets, and moves the bonuses to each attribute on the next level up to PlayerAttribute packets.

Players now also send a PlayerSkill packet whenever their progress towards a new point in a skill changes. This was previously avoided so as to not have massive packet spam.
 2017-11-24 12:38:42 +02:00
David Cernat
64b57983f0 [General] Add TRACE log messages in player processors 2017-11-24 09:43:45 +02:00
David Cernat
07d75abdf8 [Server] Use consistent order for includes 2017-11-23 08:11:37 +02:00
David Cernat
6668b9ab42 [General] Implement ConsoleCommand packet 2017-11-23 00:21:47 +02:00
David Cernat
d33254f287 [Server] Rename CharClass' isDefault() into isCustom() 
It was already using the logic of isCustom() by mistake.
 2017-11-19 12:35:11 +02:00
David Cernat
010a80ceca [Server] Place getters and setters in consistent order 2017-11-19 11:34:03 +02:00
David Cernat
947b3f76be [Server] Replace Player's isMale() and setIsMale() with gender property 
For simplicity and clarity.
 2017-11-19 11:06:35 +02:00
David Cernat
6f822f54aa [Server] Make chat commands case insensitive 2017-11-19 10:12:35 +02:00
David Cernat
a3e2ab4d4e [Server] Send correct packet for inventory changes 2017-11-19 04:24:54 +02:00
David Cernat
4cc0216e0a [Server] Send cell changes before position changes, and prioritize both 
Previously, a script changing a player's cell and position at the same time would end up sending a position packet first and then a cell change packet that overrode the former, with the player ending up at the center of the destination cell instead of at the correct position.
 2017-11-19 00:59:32 +02:00
David Cernat
80be664139 [Server] Fix skill-related script functions 
Add getSkillIncrease() and setSkillIncrease() script functions to get and set the attribute bonuses received at the next level up as a result of skill increases.

Previously, getSkill() and setSkill() attempted to return and set the attribute bonuses, respectively. However, they mistakenly used a skill ID as a parameter for the attribute bonuses, when in fact npcStats.mSkillIncrease is an integer array of size 8 where the key stands for an attribute's ID. As a result, setSkill() had the unexpected side effect of messing up a player's major and minor skills because of the invalid values it was setting for npcStats.mSkillIncreases.
 2017-11-18 10:02:52 +02:00
David Cernat
57a0415ba3 [Server] Send level packets in Player's update() at the appropriate time 
Previously, trying to send a level packet after base info and character class packets in a script actually led to the level packet being sent first and then being overridden by the others, with the player ending up at level 1 on their client.
 2017-11-18 03:55:17 +02:00
David Cernat
494b10b97e [Server] Send player packets in a more appropriate order 
Previously, the fact that a character class packet got sent after a dynamic stats packet caused the dynamic stats to get overridden on the client by the class change.
 2017-11-18 01:47:18 +02:00
David Cernat
ba161ddddd [Server] Make a few function names more consistent and fix typos 2017-11-17 04:12:25 +02:00