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 |
|
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 |
|
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 |
|
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
|
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 |
|
Andrei Kortunov
|
3dd4023e8d
|
Update active spells during rest
|
2020-06-08 11:29:38 +04: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 |
|
Andrei Kortunov
|
4afc332a0c
|
Add a FogManager
|
2020-06-07 15:51:03 +04:00 |
|
David Cernat
|
d86e744250
|
[Client] Fix typos in comments about marking InterpreterContext types
|
2020-06-07 01:59:18 +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
|
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 |
|
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 |
|
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 |
|
elsid
|
da8ea9d8c7
|
Mark not changing AiPackages fields as const
|
2020-06-04 23:12:23 +02:00 |
|
elsid
|
d35ccc39c6
|
Fix build tests with double precision bullet
|
2020-06-03 21:34:05 +02:00 |
|
Andrei Kortunov
|
5468fcb29f
|
Store attributes and skills values as floats (bug #4021)
|
2020-06-03 17:34:15 +04:00 |
|
Bret Curtis
|
2eb9d4ad4e
|
Merge pull request #2878 from Assumeru/mutate-ai
Mutate base records when editing AI settings (#2798)
|
2020-06-03 15:09:40 +02:00 |
|
Bret Curtis
|
dd7f5fcde7
|
Merge pull request #2884 from Capostrophic/deathmagic
Update spell effects during death animation (#5403)
|
2020-06-03 15:07:08 +02:00 |
|
Bret Curtis
|
109057e53f
|
Merge pull request #2544 from akortunov/corprus
Rework corprus implementation
|
2020-06-03 13:41:57 +02:00 |
|
Andrei Kortunov
|
3dce225f28
|
Implement vanilla-style corprus handling (bug #3714, bug #4623)
|
2020-06-03 12:58:17 +04:00 |
|
Andrei Kortunov
|
c0e62e9529
|
Refactor list of variables in the WorldManager
|
2020-06-03 11:21:34 +04:00 |
|
Evil Eye
|
4d7947d27c
|
Mutate base records when editing AI settings (#2798)
|
2020-06-02 21:59:37 +02:00 |
|
elsid
|
b67e18329e
|
Store AI packages as unique_ptr
|
2020-06-01 17:07:08 +02:00 |
|
elsid
|
ce7c47ee12
|
Return cloned AiPackage as unique_ptr
|
2020-06-01 17:07:08 +02:00 |
|
Bret Curtis
|
18bb6dd223
|
Merge pull request #2859 from elsid/aipackage_single_clone
Single clone function definition for all AI packages
|
2020-06-01 01:21:57 +02:00 |
|
Capostrophic
|
d72152183f
|
Update spell effects during death animation (#5403)
|
2020-05-30 23:24:06 +03:00 |
|
Bret Curtis
|
d3b3b74945
|
Merge pull request #2871 from Capostrophic/tcl
Don't "disable" player's collision shape in TCL (#5435)
|
2020-05-30 17:57:27 +02:00 |
|
Capostrophic
|
577786f110
|
Don't disable player's collision shape in TCL (#5435)
|
2020-05-30 00:55:17 +03:00 |
|
Capostrophic
|
b0b4550f05
|
Pass Actor by reference, simplify GetTarget for greetings
|
2020-05-30 00:51:58 +03:00 |
|
Capostrophic
|
efd5f13b2b
|
Make greeting-related actor data temporary (bug #5397)
|
2020-05-30 00:51:58 +03:00 |
|
Bret Curtis
|
9d0855baa5
|
Merge pull request #2866 from elsid/extend_osg_stats
Extend OSG stats
|
2020-05-29 23:23:38 +02:00 |
|
Alexei Dobrohotov
|
6f2b0252fa
|
Merge pull request #2881 from akortunov/statemanager
Use C++11-style loops in the StateManager
|
2020-05-29 23:53:59 +03:00 |
|
Bret Curtis
|
6f2fdb990b
|
Merge pull request #2876 from Capostrophic/blending
Reenable weapon animation lower body anim blending in first person view (#5441)
|
2020-05-29 11:05:33 +02:00 |
|
Andrei Kortunov
|
48b3fe5733
|
Use C++11-style loops in the StateManager
|
2020-05-29 12:26:02 +04:00 |
|