David Cernat
dae805dbc1
[Client] Avoid PlayerInventory packet spam when creating many potions
2020-02-25 07:45:06 +02:00
Alexei Dobrohotov
22b4629fc6
Merge pull request #2678 from unelsson/deleteinstanceshotkey
...
Editor: Delete instances via hotkey
2020-02-24 22:52:16 +03:00
Capostrophic
21c49ca1b0
Make Wizard less shy (bug #4493 )
2020-02-24 22:35:43 +03:00
Alexei Dobrohotov
3f64d98305
Merge branch 'inventorysearch' into 'master'
...
Item search in inventory redux
See merge request OpenMW/openmw!158
2020-02-24 18:14:40 +00:00
Frederic Chardon
78d58a344d
Item search in inventory (feature #4831 )
2020-02-24 18:14:40 +00:00
Bret Curtis
68e734889a
Merge pull request #2709 from Capostrophic/torch
...
Switch torches to shields for hostile NPCs (bug #5300 )
2020-02-24 17:20:23 +01:00
Capostrophic
1da4b31047
Switch torches to shields for hostile NPCs (bug #5300 )
2020-02-24 02:20:08 +03:00
Andrei Kortunov
a01c44bbdd
Merge pull request #2707 from Capostrophic/pcskipequip
...
Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141 )
2020-02-23 14:08:44 +04:00
David Cernat
31c0f5c976
[Client] Use clearer boolean name for checks regarding inventory sending
2020-02-22 23:59:42 +02:00
David Cernat
e78503d5f3
[General] Include potion quantity in RecordDynamic packets
...
Don't spam the server with one RecordDynamic packet per potion created when brewing multiple potions at once. Instead, send a single RecordDynamic packet with the potion quantity included in it.
Add serverside script functions for getting the potion quantity.
2020-02-22 21:21:30 +02:00
Andrei Kortunov
b1acb9e467
Merge pull request #2706 from Capostrophic/modcurrentfatigue
...
Make ModCurrentFatigue knock down the actor when necessary (bug #4523 )
2020-02-22 11:17:34 +04:00
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
Capostrophic
cfa877b109
Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141 )
2020-02-21 21:18:54 +03:00
Alexander Olofsson
776c0857fa
Always use ref_ptr for query geometry
2020-02-21 07:51:50 +01:00
Capostrophic
f9f0299c27
Make ModCurrentFatigue KO the actor when necessary (bug #4523 )
2020-02-21 00:05:13 +03: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
Nelsson Huotari
198a75b8e6
Delete selected instances with a hotkey
2020-02-19 11:44:55 +02: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
Alexander Olofsson
5de1e0fb0c
Use queryGeom for all query geometry accesses
2020-02-15 03:12:52 +01: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
Alexander Olofsson
7db58a893a
Ensure osg/Version is included
2020-02-13 19:32:17 +01:00
Alexander Olofsson
807f550386
Fix building mwrender/sky with OSG 3.6.5
...
OSG commit aff574b completely replaces the method of doing user-defined
query geometry, removing support for modifying the default geometry.
2020-02-13 19:15:33 +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
