David Cernat
|
3f7e163c92
|
Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/CMakeLists.txt
apps/openmw-mp/Script/Functions/GUI.cpp
apps/openmw-mp/Script/Functions/GUI.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp
components/CMakeLists.txt
components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
|
7 years ago |
David Cernat
|
49ea76aa9d
|
[General] Add notes for InputDialogs in GUIBoxes packet
|
7 years ago |
David Cernat
|
3b5fb9cd6b
|
[General] Make it possible to set year via WorldTime
|
7 years ago |
David Cernat
|
4acf93b7db
|
[General] Make it possible to set days passed via WorldTime
|
7 years ago |
David Cernat
|
74c2a0b311
|
Merge pull request #438 from OpenMW/master
Add OpenMW commits up to 24 May 2018
|
7 years ago |
David Cernat
|
46744ee90f
|
[General] Make WorldTime script functions more consistent with others
|
7 years ago |
Bret Curtis
|
da47fc79f5
|
Merge pull request #1701 from akortunov/standfix
Do not apply queue movement for standing actors
|
7 years ago |
Marc Zinnschlag
|
7324bd368f
|
Merged pull request #1573
|
7 years ago |
Marc Zinnschlag
|
d92d754834
|
Merged pull request #1697
|
7 years ago |
Marc Zinnschlag
|
1564a3f6aa
|
Merged pull request #1713
|
7 years ago |
Marc Zinnschlag
|
2f958881b7
|
Merged pull request #4413
|
7 years ago |
David Cernat
|
8d36d0d945
|
[General] Make it possible to change world's time scale via WorldTime
|
7 years ago |
David Cernat
|
0be6de6607
|
[General] Turn RecordDynamic into a Worldstate packet
|
7 years ago |
David Cernat
|
7083cb0359
|
Merge pull request #437 from TES3MP/0.6.3 while resolving conflicts
|
7 years ago |
David Cernat
|
031a80ed5a
|
[Client] Don't advance time when waiting, traveling, training or jailed
|
7 years ago |
David Cernat
|
02ba641bef
|
[Server] Use correct index changes for dynamic stat script functions
|
7 years ago |
David Cernat
|
da66face25
|
[General] Rename GameTime packet into WorldTime
|
7 years ago |
David Cernat
|
296c69d788
|
Merge pull request #436 from OpenMW/master
Add OpenMW commits up to 22 May 2018
|
7 years ago |
declan-millar
|
b8df4b7c5a
|
Tidy in-code comment
|
7 years ago |
declan-millar
|
844aef85f3
|
Replace spelling: soulgem -> soul gem in code comment
|
7 years ago |
declan-millar
|
9ed4f33048
|
Replace spelling: soulgem -> soul gem
|
7 years ago |
declan-millar
|
028b528c0b
|
Get soul magnitude before checking the rebalance setting
|
7 years ago |
declan-millar
|
9346a552fa
|
Use Rebalance soulgem values option to set soulgem value
|
7 years ago |
declan-millar
|
78e79d5775
|
Add advanced option to Rebalance soulgem values to the launcher
|
7 years ago |
David Cernat
|
ad4214d3e2
|
Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Networking.cpp
apps/openmw/mwmp/processors/worldstate/ProcessorGameTime.hpp
components/CMakeLists.txt
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Worldstate/PacketGameTime.hpp
|
7 years ago |
David Cernat
|
5af1150ab2
|
[General] Turn GameTime into a Worldstate packet
|
7 years ago |
David Cernat
|
e87e1dbb30
|
[General] Fix Worldstate packets by adding missing lines
|
7 years ago |
David Cernat
|
e690ff0e29
|
Merge pull request #432 from OpenMW/master
Add OpenMW commits up to 18 May 2018
|
7 years ago |
declan-millar
|
4b1247597e
|
Use soulgem value rebalance formula from morrowind code patch
|
7 years ago |
Capostrophic
|
867a5938ca
|
Don't reset sneaking camera offset while in GUI (fixes #4420)
|
7 years ago |
Marc Zinnschlag
|
ec900ef4ad
|
Merged pull request #1710)
|
7 years ago |
David Cernat
|
8a393d2984
|
Merge pull request #430 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Networking.hpp
# components/CMakeLists.txt
|
7 years ago |
David Cernat
|
43a944ddaf
|
[General] Add and implement new Worldstate packet type
|
7 years ago |
David Cernat
|
e8b22a2e5e
|
[Server] Use correct source group for ObjectProcessors
|
7 years ago |
tri4ng1e
|
f2613a74b1
|
Write settings before invoking openmw-iniimporter
|
7 years ago |
tri4ng1e
|
7e03dd0f12
|
Read data paths from `data-local` section too
|
7 years ago |
tri4ng1e
|
3b86f73ae7
|
Replace MwIniImporter::numberToString with std::to_string
|
7 years ago |
Capostrophic
|
4e485dbd44
|
Rename Original Creature column to Parent Creature (fixes #2897)
|
7 years ago |
David Cernat
|
049d0d9ba7
|
[General] Fix remaining references to world packets/events
|
7 years ago |
David Cernat
|
dc9a3bf73f
|
Merge pull request #429 from OpenMW/master
Add OpenMW commits up to 16 May 2018
|
7 years ago |
Bret Curtis
|
67c381df4e
|
Merge pull request #1708 from akortunov/refidfix
fix GCC warnings
|
7 years ago |
Andrei Kortunov
|
a68de93308
|
Initialize srate variable in openal_output
|
7 years ago |
Andrei Kortunov
|
e5db5e2651
|
Fix 'maybe-uninitialized' warning in openal_output
|
7 years ago |
Andrei Kortunov
|
df459199dd
|
Avoid left shift of negative value
|
7 years ago |
Bret Curtis
|
caf1760251
|
Merge pull request #1707 from akortunov/weaponreach
Display weapon reach on tooltips in feet
|
7 years ago |
Andrei Kortunov
|
164e3d12fe
|
Display weapon reach on tooltips in feet.
|
7 years ago |
Bret Curtis
|
e410c47660
|
Merge pull request #1706 from akortunov/refidfix
Fix compiler warning in getNestedData()
|
7 years ago |
Andrei Kortunov
|
6a3ff5ed81
|
Fix compiler warning in getNestedData
|
7 years ago |
David Cernat
|
b5922d18fd
|
Merge pull request #428 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw-mp/Script/Functions/Objects.cpp
# apps/openmw-mp/Script/Functions/Objects.hpp
# apps/openmw-mp/processors/ObjectProcessor.cpp
# apps/openmw-mp/processors/object/ProcessorContainer.hpp
# apps/openmw-mp/processors/object/ProcessorDoorState.hpp
# apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp
# apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp
# apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp
# apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
# apps/openmw-mp/processors/object/ProcessorObjectMove.hpp
# apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
# apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp
# apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
# apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
# apps/openmw-mp/processors/object/ProcessorObjectState.hpp
# apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
# apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp
# apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp
# apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp
# apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp
# apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp
# apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp
# apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp
# apps/openmw/mwmp/Networking.cpp
# apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
# apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp
# apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp
# apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp
|
7 years ago |
David Cernat
|
2ac334664b
|
[Server] Add deprecated alternatives for ObjectList functions
This will avoid server crashes in older scripts.
|
7 years ago |