David Cernat
|
d85a1ee1a9
|
Fix errors remaining from merge with tes3mp-packetexpansion
|
2016-10-23 18:32:03 +03:00 |
|
David Cernat
|
c639337842
|
Merge with tes3mp-packetexpansion by fixing conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw/mwmp/Networking.cpp
# components/CMakeLists.txt
# components/openmw-mp/NetworkMessages.hpp
# components/openmw-mp/PacketsController.cpp
|
2016-10-23 17:57:38 +03:00 |
|
David Cernat
|
025a847fd1
|
Send an ID_WORLD_OBJECT_DELETE whenever ingame scripts delete objects
|
2016-10-23 17:03:47 +03:00 |
|
David Cernat
|
0a44bea91d
|
Send cell coordinates in tes3mp using mData instead of mCellId.mIndex
|
2016-10-23 16:55:30 +03:00 |
|
David Cernat
|
cbc132612a
|
Use mRefNum.mIndex instead of just mRefNum and add extra debug
|
2016-10-23 16:33:53 +03:00 |
|
David Cernat
|
17f66e4e90
|
Implement ID_WORLD_OBJECT_PLACE
|
2016-10-23 13:30:32 +03:00 |
|
David Cernat
|
d0027ae3e7
|
Set correct packetID for ID_WORLD_OBJECT_PLACE
|
2016-10-23 12:53:49 +03:00 |
|
Koncord
|
a6467c9c47
|
Add breakpad to server
|
2016-10-23 17:07:46 +08:00 |
|
Koncord
|
df3886168f
|
Word wrapping in chat
|
2016-10-23 14:33:43 +08:00 |
|
Koncord
|
77257b0721
|
Build fix
|
2016-10-23 14:05:12 +08:00 |
|
Koncord
|
c27351c19e
|
Implement inventory functions
AddItem, RemoveItem, GetItemName, GetItemCount, GetItemHealth, GetInventorySize SendInventory
Example:
```lua
tes3mp.AddItem(pid, "glass dagger", 1, 50)
tes3mp.AddItem(pid, "glass dagger", 1, -1)
tes3mp.SendInventory(pid)
tes3mp.RemoveItem(pid, "glass dagger", 1)
tes3mp.SendInventory(pid)
local invSize = tes3mp.GetInventorySize(pid) - 1
for i = 0, invSize do
print(("%s %d %d"):format(tes3mp.GetItemName(pid, i), tes3mp.GetItemCount(pid, i), tes3mp.GetItemHealth(pid, i)))
end
```
|
2016-10-23 02:57:49 +08:00 |
|
David Cernat
|
2b98e349ce
|
Fix include for WorldEvent
|
2016-10-22 20:15:32 +03:00 |
|
David Cernat
|
6e43baf73e
|
Send Cell instead of CellId because of problems with the latter
|
2016-10-22 20:09:13 +03:00 |
|
David Cernat
|
103b1e3f72
|
Send CellId in ID_WORLD_OBJECT_DELETE
|
2016-10-22 18:44:13 +03:00 |
|
David Cernat
|
2e57e25675
|
Only delete object from ID_WORLD_OBJECT_DELETE if it actually exists
|
2016-10-22 18:19:57 +03:00 |
|
David Cernat
|
3c49157ed7
|
Rename WorldPackets to ID_WORLD_OBJECT_DELETE and ID_WORLD_OBJECT_PLACE
|
2016-10-22 18:05:32 +03:00 |
|
David Cernat
|
40f1db2d86
|
Create SearchByRefNumCustomVisitor in CellStore that returns entire Ptr
|
2016-10-22 17:47:21 +03:00 |
|
David Cernat
|
b3d6dad0c5
|
Send ID_WORLD_OBJECT_REMOVAL from actiontake.cpp and not worldimp.cpp
|
2016-10-22 17:10:57 +03:00 |
|
David Cernat
|
cc98a25dcf
|
Add searchByRefNum method to OpenMW's CellStore
|
2016-10-22 16:47:11 +03:00 |
|
David Cernat
|
92463c4a03
|
Fix Windows server crash caused by printing event->CellRef()->mRefID
|
2016-10-22 14:13:16 +03:00 |
|
David Cernat
|
8080cceac6
|
Add some placeholder code so Stanislav can test it
|
2016-10-22 12:45:19 +03:00 |
|
Stanislav Zhukov
|
81dfd21d9a
|
Merge pull request #76 from TES3MP/tes3mp-minimap
Show dedicated players on minimap
|
2016-10-22 17:21:02 +08:00 |
|
Koncord
|
b704519078
|
Show dedicated players on minimap
|
2016-10-22 17:06:26 +08:00 |
|
David Cernat
|
565e7e4b9f
|
Create and implement placeholder for ID_WORLD_OBJECT_CREATION
|
2016-10-21 21:57:05 +03:00 |
|
David Cernat
|
32dc8cf63f
|
Read contents of ID_WORLD_OBJECT_REMOVAL on client
|
2016-10-21 20:44:15 +03:00 |
|
David Cernat
|
36f218876a
|
Add ProcessPlayerPacket and ProcessWorldPacket to client's Networking
|
2016-10-21 19:23:56 +03:00 |
|
David Cernat
|
ac666edebd
|
Add a CellRef to WorldEvent
|
2016-10-20 22:15:47 +03:00 |
|
scrawl
|
efa35e9222
|
Merge pull request #1110 from MiroslavR/controls-state
Save controls state
|
2016-10-20 16:51:53 +02:00 |
|
MiroslavR
|
cd9de94c0c
|
Import teleporting and levitation disabled state from vanilla savegames (Fixes #3420)
|
2016-10-20 14:38:18 +02:00 |
|
David Cernat
|
b2845cd17c
|
Create and start using WorldEvent class
|
2016-10-20 14:28:19 +03:00 |
|
David Cernat
|
a42d5f2429
|
Make client send placeholder ID_WORLD_OBJECT_REMOVAL to server
|
2016-10-20 12:53:48 +03:00 |
|
MiroslavR
|
f3ce0840be
|
Import controls state from vanilla savegames
|
2016-10-20 02:14:36 +02:00 |
|
MiroslavR
|
301dd77efb
|
Save controls state (Fixes #3598)
|
2016-10-20 02:12:01 +02:00 |
|
scrawl
|
5580123880
|
Merge pull request #1109 from MiroslavR/autoequip-weap2
Fix auto-equipping of blunt weapons
|
2016-10-20 00:39:00 +02:00 |
|
MiroslavR
|
407abc605f
|
Fix auto-equipping of blunt weapons
|
2016-10-19 22:37:45 +02:00 |
|
scrawl
|
a5ca33ad0b
|
Disable failing OSX build
|
2016-10-19 21:59:49 +02:00 |
|
David Cernat
|
f218613231
|
Rename client Networking's GetPacket method into GetPlayerPacket
|
2016-10-19 22:49:35 +03:00 |
|
David Cernat
|
e27d1857ef
|
Fix formatting in previous changes made by tes3mp to OpenMW's core
|
2016-10-19 22:06:11 +03:00 |
|
scrawl
|
9c549a85ce
|
Merge pull request #1108 from MiroslavR/autoequip-weap
Auto-equip weapons
|
2016-10-19 20:45:47 +02:00 |
|
David Cernat
|
d0328f2553
|
Add placeholder ProcessWorldPacket method to server's Networking
|
2016-10-19 21:44:17 +03:00 |
|
David Cernat
|
2602c1f71a
|
Add ProcessPlayerPacket method to server's Networking
|
2016-10-19 21:26:42 +03:00 |
|
David Cernat
|
f0fa5e8771
|
Add ContainsPacket method to packet controllers
|
2016-10-19 21:15:59 +03:00 |
|
David Cernat
|
f1ec01cc6b
|
Add WorldPacketController to server's Networking
|
2016-10-19 20:51:51 +03:00 |
|
David Cernat
|
285f89573d
|
Create placeholders for WorldPacket classes
|
2016-10-19 20:36:11 +03:00 |
|
David Cernat
|
790d41e278
|
Move PlayerPackets into their own subfolder
|
2016-10-19 19:37:10 +03:00 |
|
David Cernat
|
d99463d752
|
Fix show-stopping mistake in PlayerPacket
|
2016-10-19 18:56:12 +03:00 |
|
David Cernat
|
bda1f867fd
|
Rename server's GetController() method into GetPlayerController()
|
2016-10-19 16:54:39 +03:00 |
|
David Cernat
|
d2212ef80b
|
Rename PacketsController into PlayerPacketController
|
2016-10-19 16:31:07 +03:00 |
|
David Cernat
|
5e0c0dd5f1
|
Use logger in server's Networking MainLoop
|
2016-10-19 13:00:33 +03:00 |
|
MiroslavR
|
76ddd9bebb
|
Add a setting for merchant auto-equipping prevention
|
2016-10-19 02:22:49 +02:00 |
|