David Cernat
|
678a308269
|
Merge remote-tracking branch 'Veenkar/0.7.1-credentials-hashing-fix' into 0.7.1
|
2020-02-21 21:47:29 +02:00 |
|
David Cernat
|
cf453092ce
|
Merge remote-tracking branch 'Veenkar/0.7.1-fix-533' into 0.7.1
|
2020-02-21 21:24:01 +02:00 |
|
David Cernat
|
85fb1d1a0b
|
Add OpenMW commits up to 19 Feb 2020
# Conflicts:
# apps/openmw/mwworld/scene.cpp
|
2020-02-20 01:51:47 +02:00 |
|
Bret Curtis
|
fa7af1bae8
|
Merge pull request #2705 from Capostrophic/water
Fix water ripple cleanup (bug #5246)
|
2020-02-19 22:10:39 +01:00 |
|
Capostrophic
|
3787625e61
|
Fix water ripple cleanup (bug #5246)
|
2020-02-19 23:27:45 +03:00 |
|
Bret Curtis
|
c907cd98c8
|
Merge pull request #2704 from akortunov/collisionswitch
Handle NiCollisionSwitch node
|
2020-02-19 21:24:25 +01:00 |
|
Alexei Dobrohotov
|
e1f0504557
|
Merge pull request #2703 from akortunov/masks
Fix a regression in the NiVisController
|
2020-02-19 11:50:51 +03:00 |
|
Andrei Kortunov
|
77d6fe46ca
|
Handle NiCollisionSwitch node
|
2020-02-19 12:14:21 +04:00 |
|
Andrei Kortunov
|
7b5ec76db4
|
Fix regression in the NiVisController
|
2020-02-19 11:50:59 +04:00 |
|
Alexei Dobrohotov
|
9b9769a123
|
Merge pull request #2702 from elsid/override
Add final modifier to fix warnings
|
2020-02-19 01:05:51 +03:00 |
|
elsid
|
650f429ff5
|
Add final modifier to fix warnings
|
2020-02-18 10:36:08 -08:00 |
|
David Cernat
|
ab794f0068
|
[General] Add handling of longs to ClientScriptLocal
Use better wording in comments related to ClientScriptLocal and ClientScriptGlobal.
|
2020-02-18 02:02:31 +02:00 |
|
David Cernat
|
8db396d10a
|
[General] Distinguish between shorts & longs in ClientScriptGlobal
Adjust ClientScriptLocal so it refers to its previously handled integers as shorts.
|
2020-02-17 18:19:03 +02:00 |
|
Bret Curtis
|
a0902bb98e
|
Merge pull request #2700 from akortunov/masks
Move VisMask to components
|
2020-02-17 11:58:53 +01:00 |
|
Andrei Kortunov
|
84979fa8b7
|
Move VisMask to components
|
2020-02-16 16:03:35 +04:00 |
|
Michal Marchewka
|
bf7041b067
|
[Server] Fix credentials generation. Used static variable as a workaround.
|
2020-02-16 12:34:05 +01:00 |
|
Michal Marchewka
|
44c13154ff
|
[Client] Fix #533. LocalPlayer.cpp joins neccessary faction only.
|
2020-02-16 10:47:13 +01:00 |
|
David Cernat
|
a4b10c75e1
|
[Client] Remove unneccessary addConsoleCommandObject() from ObjectList
|
2020-02-15 10:24:05 +02:00 |
|
David Cernat
|
643c979d31
|
[Client] Use getBaseObjectFromPtr() whenever possible in ObjectList
|
2020-02-15 10:00:23 +02:00 |
|
Bret Curtis
|
92e6a21b53
|
Merge pull request #2701 from Capostrophic/fallthreshold
Make infinite fall failsafe logic more forgiving
|
2020-02-14 15:23:45 +01:00 |
|
Capostrophic
|
9db0bbf255
|
Make infinite failsafe logic more forgiving
|
2020-02-14 15:32:50 +03:00 |
|
David Cernat
|
ffead444db
|
[Server] Use consistent order for WorldstateFunctions
|
2020-02-14 11:51:31 +02:00 |
|
David Cernat
|
60ca72a70a
|
[Client] Send packets with floats when their floors change
This helps prevent frame-by-frame packet spam from floats used as timers.
Additionally, clean up the comments regarding clientside variables.
|
2020-02-14 01:18:24 +02:00 |
|
Roman Siromakha
|
3ae1a208df
|
Merge pull request #2684 from Capostrophic/damagefatigue
Make uncapped Damage Fatigue optional (bug #5264)
|
2020-02-13 20:37:50 +01:00 |
|
Bret Curtis
|
3bbd32fe98
|
Merge pull request #2667 from Capostrophic/infinitefall
Add an infinite fall failsafe (feature 1415)
|
2020-02-13 09:23:05 +01:00 |
|
David Cernat
|
2390e951bb
|
[Client] Avoid packet spam by not giving locals values they already have
|
2020-02-13 07:50:12 +02:00 |
|
Andrei Kortunov
|
7d53c6274d
|
Merge pull request #2697 from Capostrophic/shield
Don't try to attach absent (empty path) shield models to NPCs
|
2020-02-12 21:53:29 +04:00 |
|
Alexei Dobrohotov
|
36f1b632ec
|
Merge pull request #2699 from elsid/get_items_owned_by_visitor
Avoid using temporary vector to get items owned by
|
2020-02-12 11:38:56 +03:00 |
|
elsid
|
1e4565a15c
|
Avoid using temporary vector to get items owned by
|
2020-02-11 22:24:18 +01:00 |
|
David Cernat
|
76f3805e16
|
[Server] Fix Windows build by not using sigaction on Windows
|
2020-02-11 19:16:26 +02:00 |
|
Capostrophic
|
61b60c8a94
|
Add an infinite fall failsafe (feature 1415)
|
2020-02-11 18:26:58 +03:00 |
|
David Cernat
|
a13cef9913
|
Merge branch '0.7.0reset' of https://github.com/uramer/openmw into 0.7.1
# Conflicts:
# apps/openmw-mp/Script/Functions/Worldstate.cpp
# apps/openmw-mp/Script/Functions/Worldstate.hpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwmp/CellController.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
|
2020-02-11 15:41:38 +02:00 |
|
Andrei Kortunov
|
10fafabd7f
|
Merge pull request #2698 from Capostrophic/wander
Support movement deceleration for wander AI
|
2020-02-11 17:22:07 +04:00 |
|
Capostrophic
|
013953ec7f
|
Support Wander movement deceleration
|
2020-02-11 13:50:53 +03:00 |
|
Capostrophic
|
fcbd3b4324
|
Don't try to attach absent shield models to NPCs
|
2020-02-11 11:58:02 +03:00 |
|
Alexei Dobrohotov
|
54e7e0c718
|
Merge pull request #2696 from akortunov/intersector
Fix LineSegmentIntersector usage
|
2020-02-11 09:48:10 +03:00 |
|
Andrei Kortunov
|
f4291ea948
|
Fix intersector usage (bug #5283)
|
2020-02-10 22:31:20 +04:00 |
|
David Cernat
|
71f0975bf2
|
[Documentation] Update readme and credits
|
2020-02-10 11:43:54 +02:00 |
|
David Cernat
|
fb3514c8c3
|
Merge remote-tracking branch 'nalal/patch-1' into 0.7.1
|
2020-02-10 10:00:30 +02:00 |
|
David Cernat
|
491ccf21c5
|
Merge branch '0.7.1-build-fixes' into 0.7.1
# Conflicts:
# components/CMakeLists.txt
|
2020-02-10 08:45:16 +02:00 |
|
David Cernat
|
abd18745df
|
[General] Include ScriptLocalFloat as part of ClientScriptLocal
|
2020-02-10 07:58:35 +02:00 |
|
Roman Siromakha
|
158f610b61
|
Merge pull request #2694 from Capostrophic/show
Make Show fallback to global variables when sensible (bug #5278)
|
2020-02-09 20:56:42 +01:00 |
|
Capostrophic
|
9b4be677f6
|
Make Show output format closer to vanilla
|
2020-02-09 20:10:24 +03:00 |
|
Capostrophic
|
aadf13b123
|
Make Show fallback to global variables when sensible (bug #5278)
|
2020-02-09 15:08:44 +03:00 |
|
Capostrophic
|
122dffe4c1
|
Make uncapped Damage Fatigue optional (bug #5264)
Cap Absorb Fatigue
|
2020-02-09 14:41:38 +03:00 |
|
David Cernat
|
b97fa7553c
|
[Client] Remove variable redeclarations
|
2020-02-08 15:08:07 +02:00 |
|
AnyOldName3
|
3ce3f364ea
|
Merge branch 'AnyOldName3-master-patch-00511' into 'master'
Add default font releaseGLObjects workaround for OSG <3.65
Closes #4704
See merge request OpenMW/openmw!160
|
2020-02-05 22:46:16 +00:00 |
|
David Cernat
|
4841c1ad4c
|
[General] Rename ScriptLocalShort into ClientScriptLocal
|
2020-02-05 17:41:48 +02:00 |
|
Andrei Kortunov
|
b8548b8f56
|
Merge pull request #2691 from elsid/navigator_status
Use status codes to handle navigator errors instead of exceptions
|
2020-02-05 13:24:29 +04:00 |
|
Andrei Kortunov
|
7371650f8e
|
Merge pull request #2688 from Capostrophic/shield
Make sure not to pick the ground shield model incorrectly for NPCs
|
2020-02-05 12:11:24 +04:00 |
|