David Cernat
|
672bb707a7
|
Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Networking.hpp
# apps/openmw-mp/Script/Functions/World.cpp
# apps/openmw-mp/processors/WorldProcessor.cpp
# apps/openmw-mp/processors/WorldProcessor.hpp
# apps/openmw-mp/processors/world/ProcessorContainer.hpp
# apps/openmw-mp/processors/world/ProcessorDoorState.hpp
# apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp
# apps/openmw-mp/processors/world/ProcessorObjectLock.hpp
# apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp
# apps/openmw-mp/processors/world/ProcessorObjectScale.hpp
# apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp
# apps/openmw-mp/processors/world/ProcessorObjectState.hpp
# apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp
# apps/openmw/mwmp/Networking.cpp
# components/CMakeLists.txt
# components/openmw-mp/Controllers/ObjectPacketController.hpp
# components/openmw-mp/Controllers/WorldPacketController.cpp
# components/openmw-mp/Packets/Object/ObjectPacket.cpp
# components/openmw-mp/Packets/Object/ObjectPacket.hpp
# components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
# components/openmw-mp/Packets/Object/PacketContainer.hpp
# components/openmw-mp/Packets/Object/PacketDoorState.hpp
# components/openmw-mp/Packets/Object/PacketMusicPlay.hpp
# components/openmw-mp/Packets/Object/PacketObjectAnimPlay.hpp
# components/openmw-mp/Packets/Object/PacketObjectDelete.hpp
# components/openmw-mp/Packets/Object/PacketObjectLock.hpp
# components/openmw-mp/Packets/Object/PacketObjectMove.hpp
# components/openmw-mp/Packets/Object/PacketObjectPlace.hpp
# components/openmw-mp/Packets/Object/PacketObjectRotate.hpp
# components/openmw-mp/Packets/Object/PacketObjectScale.hpp
# components/openmw-mp/Packets/Object/PacketObjectSpawn.hpp
# components/openmw-mp/Packets/Object/PacketObjectState.hpp
# components/openmw-mp/Packets/Object/PacketObjectTrap.hpp
# components/openmw-mp/Packets/Object/PacketScriptGlobalShort.hpp
# components/openmw-mp/Packets/Object/PacketScriptLocalFloat.hpp
# components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp
# components/openmw-mp/Packets/Object/PacketScriptMemberShort.hpp
# components/openmw-mp/Packets/Object/PacketVideoPlay.hpp
|
7 years ago |
|
David Cernat
|
6bf3a0be1e
|
[General] Rename WorldPackets into ObjectPackets for clarity
|
7 years ago |
|
David Cernat
|
7c8dd7380f
|
Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Script/Functions/Actors.cpp
apps/openmw-mp/Script/Functions/Actors.hpp
apps/openmw-mp/Script/Functions/Cells.cpp
|
7 years ago |
|
David Cernat
|
5458e09c8a
|
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
|
7 years ago |
|
David Cernat
|
77389538e8
|
[General] Implement ActorAI packet, part 1
The server can now make actors become followers of players or other actors.
|
7 years ago |
tri4ng1e
|
9126e844bf
|
Use data paths from config (bug #4412)
|
7 years ago |
Marc Zinnschlag
|
b7cce1a665
|
Merged pull request #1702
|
7 years ago |
|
Marc Zinnschlag
|
6630a02c3f
|
updated credits file
|
7 years ago |
Kyle Cooley
|
d78ae4bab4
|
Allow the clang build to fail for now
|
7 years ago |
|
Kyle Cooley
|
6c7d73af7f
|
Bump c++ standard version to 14
|
7 years ago |
|
David Cernat
|
c00b3bbe97
|
[Documentation] Update credits
|
7 years ago |
|
Kyle Cooley
|
cf5bd0dca7
|
Travis: use qt5, newer boost libraries, callff, gcc/clang builds...
|
7 years ago |
|
David Cernat
|
57b791ea2a
|
[Client] Show selected object's refNum & mpNum in console window title
This allows for much easier debugging of all objects and actors.
|
7 years ago |
Nelsson Huotari
|
49ae5bc75c
|
List initialization -> initialization in constructor
|
7 years ago |
|
David Cernat
|
c5f33e451f
|
Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts
|
7 years ago |
|
Nelsson Huotari
|
1c79d5311c
|
Brush history menu
|
7 years ago |
|
Nelsson Huotari
|
d2cf764a46
|
Tooltips, fixes
|
7 years ago |
|
Nelsson Huotari
|
62066f01bd
|
clean-up
|
7 years ago |
|
Nelsson Huotari
|
d33c98c68d
|
Revert unintended changes
|
7 years ago |
|
Nelsson Huotari
|
5656745445
|
Select dragged texture-assets, add brush settings widget-type, fixes.
|
7 years ago |
|
Nelsson Huotari
|
baa707b5e3
|
User setting for selective cell editing or new land creation
|
7 years ago |
|
Nelsson Huotari
|
24977fcc0f
|
improve hit calculation accuracy for texture editing
|
7 years ago |
|
Nelsson Huotari
|
e8a9bff85c
|
Drop textures to landtextures from assets (try-method)
|
7 years ago |
|
Nelsson Huotari
|
7139889566
|
Brush button window opens at modebutton, slider 1-50, doxygen comments
|
7 years ago |
|
Nelsson Huotari
|
20d1d8ac89
|
Fixed brush calculations, implement undostack macro when clicked.
|
7 years ago |
|
Nelsson Huotari
|
5f3c8b2b99
|
c_str -> fromStdString, remove TextureBrushButton class
|
7 years ago |
|
Nelsson Huotari
|
cf7a0f715e
|
Command macro for complete drag-editing operations.
|
7 years ago |
|
Nelsson Huotari
|
9f742d5b1f
|
Brush affects adjancent cells
|
7 years ago |
|
Nelsson Huotari
|
1ca2710a2a
|
Formatting, fixes
|
7 years ago |
|
Nelsson Huotari
|
1c113eca9c
|
15 to landTextureSize-1
|
7 years ago |
|
Nelsson Huotari
|
3327d6f7c4
|
Drag terrain painting, code cleanup
|
7 years ago |
|
Nelsson Huotari
|
a54a1b9940
|
Command system and undo
|
7 years ago |
|
Nelsson Huotari
|
cc415526b0
|
fix texture index +1, better icons
|
7 years ago |
|
Nelsson Huotari
|
316d05bdc4
|
{} to ()
|
7 years ago |
|
Nelsson Huotari
|
4649d1258c
|
Direct data terrain editing
|
7 years ago |
|
Nelsson Huotari
|
4ae75d1d20
|
Terrain texture brush frame
|
7 years ago |
|
David Cernat
|
12727b66ea
|
[Server] Use consistent variable names in map tile script functions
|
7 years ago |
|
David Cernat
|
7f00005f04
|
[Client] Fix GCC build
Based on 71040659ac
|
7 years ago |
Alf Henrik Sauge
|
d4f278a113
|
Replacing tab with spaces
|
7 years ago |
|
David Cernat
|
32d71de2f5
|
Update MapWindow every frame, not just when it's open (bug #4279)
|
7 years ago |
|
Alf Henrik Sauge
|
feeee50a88
|
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
|
7 years ago |
|
tri4ng1e
|
103a07b744
|
Less cryptic abbreviations
|
7 years ago |
|
Marc Zinnschlag
|
3197ebd8e7
|
Merged pull request #1694
|
7 years ago |
|
David Cernat
|
715012f087
|
[General] Implement sending of image data for map tiles in PlayerMap
|
7 years ago |
Andrei Kortunov
|
2f89080b36
|
Load default markers definitions in editor
|
7 years ago |
|
Andrei Kortunov
|
b15bed8e22
|
Avoid excessive loadSound calls
|
7 years ago |
|
tri4ng1e
|
905cde10db
|
Smart-sorting in iniimporter (time + dependency)
|
7 years ago |
|
Marc Zinnschlag
|
53b6ef6f8c
|
minor code cleanup
|
7 years ago |
|
Marc Zinnschlag
|
57ee5f9b53
|
updated credits file
|
7 years ago |
|
Marc Zinnschlag
|
e661e3cf74
|
Merged pull request #1677
|
7 years ago |