1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-24 14:23:51 +00:00
Commit graph

25996 commits

Author SHA1 Message Date
David Cernat
74ac59fed2 [Client] Prevent allied players from breaking each other's sneaking 2020-06-18 10:29:30 +03:00
David Cernat
9f2408473f [Client] Update setting of time via WorldTime packets
The setting of time-related values was previously handled directly in OpenMW's World class. It is now handled in OpenMW's DateTimeManager class instead when the variable names passed to World's setGlobalInt() and setGlobalFloat() are time-related.
2020-06-15 09:51:53 +03:00
David Cernat
e5b1843089 Add OpenMW commits up to 11 Jun 2020
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/activespells.cpp
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aiactivate.hpp
#	apps/openmw/mwmechanics/creaturestats.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2020-06-11 13:21:58 +03:00
Bret Curtis
e6231f67e6
Merge pull request #2904 from Capostrophic/sound
Revert the changes for "bug" #4551
2020-06-11 00:39:07 +02:00
Capostrophic
4a2fd1e140 Revert the changes for "bug" #4551 2020-06-11 00:06:37 +03:00
Bret Curtis
bfe3f13c90
Merge pull request #2903 from akortunov/refactoring
Use more C++11 in tools code
2020-06-10 16:28:33 +02:00
Andrei Kortunov
0d66369efb Use overrides, when needed 2020-06-10 12:58:15 +04:00
Andrei Kortunov
aacb569acb Use more C++11 in tools code 2020-06-10 10:30:37 +04:00
Andrei Kortunov
e2a4493fc0
Merge pull request #2902 from Capostrophic/shaders
Don't deliberately do redundant assignments in shaders
2020-06-10 08:18:15 +04:00
Capostrophic
91514aed5d Don't deliberately do redundant assignments 2020-06-09 22:08:43 +03:00
Chris Djali
720700e957
Merge pull request #2901 from Capostrophic/shaders
Minor shader fixes
2020-06-09 17:16:49 +01:00
David Cernat
36a2308acd Add OpenMW commits up to 30 May 2020
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwscript/interpretercontext.cpp
2020-06-09 17:50:26 +03:00
Capostrophic
1c50d25853 Minor shader fixes
Don't initialize uniform bool to false explicitly
Attempt not to calculate specular lighting if the material specular color is black
2020-06-09 15:27:38 +03:00
Roman Siromakha
048713d9b1
Merge pull request #2900 from akortunov/defs
Use FourCC to declare all ESM record names
2020-06-09 10:46:40 +02:00
Andrei Kortunov
d997842f8d Use FourCC to declare all ESM record names 2020-06-09 10:07:37 +04:00
AnyOldName3
be22e80d33 Merge branch 'always-say-what-to-do' into 'master'
Print MSVC activation info in verbose mode, too.

See merge request OpenMW/openmw!212
2020-06-08 21:42:28 +00:00
Bret Curtis
6bc04507ef
Merge pull request #2715 from akortunov/cleanup
Remove custom data for disposed actors
2020-06-08 12:29:28 +02:00
Bret Curtis
946cf859db
Merge pull request #2892 from Capostrophic/automove
Don't save to or read automove state from saved games (#5452)
2020-06-08 11:45:04 +02:00
Bret Curtis
cd97d0c61c
Merge branch 'master' into automove 2020-06-08 11:42:05 +02:00
Andrei Kortunov
3741355dca
Merge pull request #2898 from akortunov/master
Update active spells during rest
2020-06-08 13:30:16 +04:00
Andrei Kortunov
0c3b12c40f
Merge pull request #2893 from Capostrophic/projectile
Clean up magic bolts casted by actors that are gone (bug #5451)
2020-06-08 13:26:58 +04:00
Bret Curtis
857f4bd232
Merge pull request #2896 from akortunov/rendermanager
Add a FogManager
2020-06-08 11:20:51 +02:00
Bret Curtis
d23bbe755c
Merge pull request #2897 from foobar13372/patch-1
Update CHANGELOG.md
2020-06-08 11:10:05 +02:00
Andrei Kortunov
3dd4023e8d Update active spells during rest 2020-06-08 11:29:38 +04:00
Roman Siromakha
27a113167c
Merge pull request #2890 from akortunov/position
Do not store object position, if it is the same as in CellRef
2020-06-08 01:12:47 +02:00
Alexei Dobrohotov
d5d385fe9e
Merge pull request #2891 from elsid/ai_packages_options
Replace AiPackage virtual methods by options
2020-06-08 02:06:38 +03:00
Alexei Dobrohotov
3f0cf65335
Merge pull request #2895 from elsid/esm_objectstate_final
Add final for derived and overriden from ESM::ObjectsState
2020-06-08 02:02:57 +03:00
Andrei Kortunov
4afc332a0c Add a FogManager 2020-06-07 15:51:03 +04:00
foobar13372
5d17a4c66e
Update CHANGELOG.md
Correctly name change (was probably a copy paste error)
2020-06-07 10:10:33 +02:00
Andrei Kortunov
52d27dee5c
Merge pull request #2894 from Capostrophic/disable
Ignore bogus string arguments for Disable/Enable again
2020-06-07 10:15:12 +04:00
Andrei Kortunov
75e7a3e8b1 Do not store object position, if it is the same as in CellRef 2020-06-07 09:25:46 +04:00
David Cernat
d86e744250 [Client] Fix typos in comments about marking InterpreterContext types 2020-06-07 01:59:18 +02:00
elsid
5209f5ff6d
Mark all derived classes from ESM::ObjectsState and overriden functions as final 2020-06-06 23:00:53 +02:00
David Cernat
b527ca7e5d [Client] Fix initialization of ptrCellStore in object processors 2020-06-06 23:11:16 +03:00
David Cernat
62df188fd4 Add OpenMW commits up to 16 May 2020
# Conflicts:
#	CI/before_script.linux.sh
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwscript/globalscripts.cpp
#	apps/openmw/mwscript/interpretercontext.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/cellstore.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
#	components/interpreter/context.hpp
2020-06-06 22:38:28 +03:00
Capostrophic
e02b66cdf4 Ignore bogus string arguments for Disable/Enable again 2020-06-06 20:04:09 +03:00
Capostrophic
456f0f9f44 Clean up magic bolts of actors that are gone (#5451) 2020-06-06 19:11:22 +03:00
Alexei Dobrohotov
05884e690f
Merge pull request #2880 from akortunov/rendermanager
Remove redundant variables from the RenderingManager
2020-06-06 16:09:44 +03:00
Capostrophic
1873da4c91 Don't save to or read automove state from saved games (#5452) 2020-06-06 15:58:21 +03:00
Alexei Dobrohotov
587b540c98 Merge branch 'fix-skill-lvlup-message' into 'master'
Make sure the skill level up message box displays the value correctly

See merge request OpenMW/openmw!217
2020-06-06 12:33:17 +00:00
Fanael Linithien
48758116d6 Make sure the skill level up message box displays the value correctly
Fixes regression introduced in 204d2acf25.
2020-06-06 14:24:33 +02:00
David Cernat
922f54e208 [Server] Add server functions for handling client script local variables
Remove outdated server functions for client scripts.
2020-06-06 14:15:01 +02:00
David Cernat
5e6218ad6d [General] Modernize handling of client script local variables in packets
Disable placeholder handling of client script member variables.
2020-06-06 13:58:51 +02:00
Andrei Kortunov
6de97e6bc2 Remove redundant variables from RenderingManager 2020-06-06 14:10:24 +04:00
elsid
5b34ef224b
Replace AiPackage virtual methods by options 2020-06-06 12:00:17 +02:00
Bret Curtis
3b1c717ab9
Merge pull request #2888 from elsid/ai_packages_const
Mark not changing AiPackages fields as const
2020-06-05 23:11:10 +02:00
Bret Curtis
204d2acf25
Merge pull request #2092 from akortunov/float_stats
Store attributes and skills values as floats
2020-06-05 22:38:12 +02:00
psi29a
629e33237e Merge branch 'AnyOldName3-master-patch-53347' into 'master'
Warn about fake stub Python

See merge request OpenMW/openmw!216
2020-06-05 20:24:54 +00:00
Bret Curtis
5d019c27ae
Merge pull request #2887 from akortunov/worldmanager
Introduce a separate class to control world date and time
2020-06-05 13:15:44 +02:00
Andrei Kortunov
81805b7263 Introduce a separate class to control world date and time 2020-06-05 12:07:32 +04:00