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 |
Bret Curtis
|
3fa3fc9d85
|
Merge pull request #1716 from declan-millar/soulgem_value_rebalance
Soul gem value rebalance
|
7 years ago |
declan-millar
|
2963524a01
|
set rebalance soul gem values to true by default
|
7 years ago |
declan-millar
|
7092dc4f40
|
Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance
|
7 years ago |
Bret Curtis
|
b4098b24b7
|
Merge pull request #1717 from akortunov/default_terrain
Render default land texture for Wilderness cells with distant terrain
|
7 years ago |
Andrei Kortunov
|
888c2d9a33
|
Render default land texture for Wilderness cells with distant terrain
|
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
|
0320f9a74d
|
Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance
|
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
|
815d17d9db
|
Merge pull request #433 from OpenMW/master
Add OpenMW commits up to 21 May 2018
|
7 years ago |
Bret Curtis
|
5775f420e2
|
Merge pull request #1714 from ananace/patch-9
Switch Appveyor CI to x64 VS2015 / 2017
|
7 years ago |
David Cernat
|
e690ff0e29
|
Merge pull request #432 from OpenMW/master
Add OpenMW commits up to 18 May 2018
|
7 years ago |
Alexander "Ananace" Olofsson
|
d05de8e411
|
Give boost the correct toolset for 2017
|
7 years ago |
Alexander "Ananace" Olofsson
|
4f758bdd48
|
Use different environments for 2015 and 2017
|
7 years ago |
Alexander "Ananace" Olofsson
|
3bd8dc3ef6
|
Use the right boost version for Appveyor
|
7 years ago |
Alexander "Ananace" Olofsson
|
bcfa2a13a6
|
Use the VS2017 packaging of Qt5 for Appveyor
|
7 years ago |
declan-millar
|
4b1247597e
|
Use soulgem value rebalance formula from morrowind code patch
|
7 years ago |
Alexander "Ananace" Olofsson
|
e1e7a4b11a
|
Change Appveyor to use Visual Studio 2017
|
7 years ago |
Alexander "Ananace" Olofsson
|
12b201348a
|
Switch to the supported VS versions on Appveyor
|
7 years ago |
Alexander "Ananace" Olofsson
|
ea6c73333b
|
Bumping Qt to 5.10 for Appveyor
|
7 years ago |
Alexander "Ananace" Olofsson
|
f8304a52c4
|
Enable verbose logging for CI
|
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 |
David Cernat
|
18167a734e
|
Merge pull request #419 from Aesylwinn/Travis-0.6.3
Travis 0.6.3
|
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 |