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

19737 commits

Author SHA1 Message Date
Capostrophic
9106e3646c Fix outdated bug tracker links 2020-04-22 01:45:11 +03:00
Capostrophic
6731843691 Consider the first person movement sneaking if it's actually sneaking 2020-04-21 09:32:34 +03:00
Capostrophic
dab09180ae Make sure non-carriable light sources can't be picked up 2020-04-20 22:13:37 +03:00
Bret Curtis
8a8107e837 as it says; revert vismask and uncomplicate openmw 2020-04-20 20:57:38 +02:00
AnyOldName3
02b8dffdd0 Merge branch 'floattest' into 'master'
Use approximate comparison for floating point in test

See merge request OpenMW/openmw!163
2020-04-20 18:25:17 +00:00
p4r4digm
0741fe5b80 removed path configuration and made screenshots just save in a folder 2020-04-20 09:22:50 -07:00
p4r4digm
2b54e6216b Added setting to change the directory screenshots are stored in 2020-04-19 16:38:57 -07:00
David Cernat
f8c557fbc0 [General] Read and use weapon quantity in RecordDynamic packets 2020-04-19 23:17:09 +03:00
Alexey Sokolov
ddab86d940 Use approximate comparison for floating point in test
This fixes test suite on my machine
2020-04-19 19:11:38 +01:00
Bret Curtis
8c2f3ff007 clean up code; purge const_cast 2020-04-19 16:31:54 +02:00
Bret Curtis
4ae0bd1fae Merge branch 'helplink' into 'master'
Link to readthedocs documentation from OpenCS

See merge request OpenMW/openmw!171
2020-04-18 20:54:21 +00:00
Frederic Chardon
513ac8986d Add link to opencs documentation on readthedocs, available through
context menu.
The documentation opens in default browser.

There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page

There is also a link to the OpenCS tutorial in the help menu.
2020-04-18 20:54:21 +00:00
Alexei Dobrohotov
b5ff32569b
Merge pull request #2768 from glassmancody/tabfix
Fix tab focus for pinned windows
2020-04-18 22:27:51 +03:00
David Cernat
001d63b59b [Client] Keep extra item data when adding items to player via Take All 2020-04-17 20:01:28 +03:00
Bret Curtis
bcc211cb5b
Merge pull request #2776 from Capostrophic/esmtool
Revise esmtool cell reference output
2020-04-14 13:47:17 +02:00
Bret Curtis
26ce8bc3f6
Merge pull request #2778 from elsid/fix_tests_build
Specialize DetourNavigator::ObjectId ctor for pointers
2020-04-14 13:46:19 +02:00
Capostrophic
fbcc8ef046 Reset dialogue history when the window can't track what closed it 2020-04-14 08:49:14 +03:00
David Cernat
509f03ca52 [General] Use flags instead of autoCalc for enchantment dynamic records
This brings the handling of dynamic records in multiplayer up-to-date with ad333e88fe
2020-04-14 02:15:24 +03:00
elsid
208a50340d
Specialize DetourNavigator::ObjectId ctor for pointers
To fix msvc error:
components\detournavigator\objectid.hpp(14,13): error C2440: 'reinterpret_cast': cannot convert from 'const T' to 'size_t'
          with
          [
              T=unsigned long
          ]
2020-04-13 20:48:34 +02:00
Capostrophic
5dc8da5f67 Only disarm traps with keys when the door is locked (bug #5370) 2020-04-13 20:26:51 +03:00
Capostrophic
4e22f03ece Revise esmtool cell reference output 2020-04-13 20:17:16 +03:00
David Cernat
25a632c650 Add OpenMW commits up to 13 Apr 2020
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
2020-04-13 19:53:42 +03:00
Andrei Kortunov
8d4dde7b56
Merge branch 'master' into autocalc 2020-04-13 13:53:29 +04:00
Andrei Kortunov
0bc40e1002
Merge branch 'master' into dialogue 2020-04-13 13:50:52 +04:00
Andrei Kortunov
844b6011bc
Merge branch 'master' into startscript 2020-04-13 13:49:25 +04:00
Andrei Kortunov
cb6707624d
Merge branch 'master' into soul 2020-04-13 13:47:13 +04:00
Andrei Kortunov
31cc1e0f66
Merge branch 'master' into quickkeys 2020-04-13 13:41:26 +04:00
Andrei Kortunov
4c8cc0e54f
Merge pull request #2774 from Capostrophic/levelledscale
Properly utilize creature levelled list's scale (bug #5369)
2020-04-13 13:37:00 +04:00
Cody
a34fe1d9b2 proper game mode detection 2020-04-12 10:18:07 -07:00
Capostrophic
07779d7fcf Properly utilize creature levelled list's scale (bug #5369) 2020-04-12 13:21:13 +03:00
Capostrophic
9dbdbbaea7 Only clear dialogue history if the dialogue window is closed (bug #5358) 2020-04-12 11:59:58 +03:00
Capostrophic
96a447ee3a Show the soulgem soul in count dialog (feature #5362) 2020-04-12 11:55:00 +03:00
Cody
8e741a0d0b fixed tab focus for pinned windows 2020-04-11 23:01:16 -07:00
Capostrophic
f79e20379b Make sure it's a crime to unlock owned doors 2020-04-12 01:56:03 +03:00
Capostrophic
de7ecddbb8 Don't play equip sound for reactivated quick key items (bug #5367) 2020-04-11 23:29:36 +03:00
Capostrophic
ad333e88fe Handle enchantment autocalc flag as a flag (bug #5363) 2020-04-11 00:03:14 +03:00
Capostrophic
feeab8a335 Make adding non-existent global script more forgiving (bug #5364) 2020-04-10 22:20:05 +03:00
Nelsson Huotari
42c7ec8f1c Minor fix to calculation of mLandSizeFactor (-1) 2020-04-07 16:56:47 +03:00
Andrei Kortunov
023c51ad0e Fix int/float conversions in the CSVRender::BrushDraw 2020-04-07 13:56:03 +04:00
Andrei Kortunov
9712925ba3
Merge pull request #2762 from akortunov/warnfix
Avoid a hack to initialize mIndex in the editor
2020-04-06 12:32:33 +04:00
Andrei Kortunov
c7cedc4e5a Avoid a hack to initialize mIndex 2020-04-06 09:43:05 +04:00
Bret Curtis
d3b898de88
Merge pull request #2749 from akortunov/sound_pause
Pause audio and video when the game is minimized
2020-04-05 21:04:51 +02:00
Bret Curtis
7fda65e7bb
Merge pull request #2692 from unelsson/opencsbrushdraw
Editor: Implement brush outlines
2020-04-05 20:52:45 +02:00
Andrei Kortunov
e444766901 Use enums for blockers IDs instead of strings 2020-04-05 19:14:23 +04:00
Bret Curtis
328c3617b7
Merge pull request #2752 from Assumeru/parsing-errors
Reset errorhandler context
2020-04-05 10:03:34 +02:00
Andrei Kortunov
2254256db9 Pause both audio and video playback when the game is minimized (feature #4944) 2020-04-04 22:54:51 +04:00
Andrei Kortunov
3d6fd2818f Support for per-type sound blockers 2020-04-04 22:54:51 +04:00
Andrei Kortunov
7545256d1f Do not try to launch magic bolt when direction to target is empty (bug #5350) 2020-04-04 22:39:13 +04:00
Andrei Kortunov
bb7c2ac630
Merge pull request #2759 from Capostrophic/lightsource
Don't use up light duration if the held light is hidden (bug #5352)
2020-04-04 22:04:08 +04:00
Capostrophic
1928bebe98 Don't use up light duration if the held light is hidden (bug #5352) 2020-04-04 20:51:41 +03:00
Andrei Kortunov
a68d9aed4c Fix issues, found by CoverityScan 2020-04-04 17:45:26 +04:00
Evil Eye
8c433d587c less complicated context override 2020-04-04 14:09:00 +02:00
Andrei Kortunov
26ac6839d4
Merge pull request #2755 from akortunov/guifixes
Do not disable a mouse cursor until it moved when you exit a GUI mode
2020-04-04 14:22:25 +04:00
elsid
ef4a7089e4
Use template specialization for writeHNT to write raw arrays
To avoid passing explicit size argument where it's possible.
2020-04-04 01:12:49 +02:00
Roman Siromakha
3bd2c114a7
Merge pull request #2741 from akortunov/warnfix
Fix C5204 warnings by adding default virtual destructors
2020-04-04 00:12:07 +02:00
Andrei Kortunov
d222435774 Do not disable a mouse cursor until it moved every time when you exit a GUI mode 2020-04-02 22:39:00 +04:00
Evil Eye
a16727d5e3 implement move constructor 2020-04-02 20:27:52 +02:00
Evil Eye
8958e29187 reset errorhandler context 2020-04-02 20:14:52 +02:00
Bret Curtis
baf3c36a76
Merge pull request #2722 from akortunov/gyro
Rotate camera via gyroscope on mobile devices
2020-04-02 09:55:08 +02:00
David Cernat
7bc3298ed4 Add OpenMW commits up to 1 Apr 2020
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	apps/openmw/mwphysics/physicssystem.cpp
2020-04-01 19:24:11 +03:00
Andrei Kortunov
e63325ebff Support for camera rotation via gyroscope on Android (feature #5311) 2020-04-01 19:57:04 +04:00
Capostrophic
5e2e5b7aa9 Fix btCollisionObjectWrapper forward declaration 2020-03-31 18:31:46 +03:00
Capostrophic
4f08f6e09b Separate ClosestNotMeConvexResultCallback 2020-03-31 00:38:34 +03:00
Capostrophic
19010ec045 Separate MovementSolver 2020-03-31 00:38:34 +03:00
Capostrophic
ca6cce0c7e Separate Stepper 2020-03-31 00:38:34 +03:00
Capostrophic
5d625c12dc Separate ContactTestResultCallback 2020-03-31 00:38:34 +03:00
Capostrophic
c94cd775bf Separate ClosestNotMeRayResultCallback 2020-03-31 00:38:34 +03:00
Capostrophic
ce588fb39c Separate DeepestNotMeContactTestResultCallback 2020-03-31 00:38:34 +03:00
Capostrophic
1629791885 Port wareya's actor tracer consistency fixes 2020-03-30 21:23:41 +03:00
Capostrophic
99e89f23a6 Fix calculateNpcStatModifiers call for non-NPCs 2020-03-28 19:15:13 +03:00
Nelsson Huotari
66fba7cc51 Remove unneeded constructors, only initialize in cpp, minor fixes 2020-03-26 18:06:33 +02:00
Nelsson Huotari
ec2ff2a9b0 Fix if oneliners 2020-03-26 14:47:40 +02:00
Capostrophic
04ebe5c4c9 Reset skills of dead actors (bug #5328) 2020-03-26 15:22:31 +03:00
Nelsson Huotari
18cdd3bd7c rebase-related fixes 2020-03-26 13:25:33 +02:00
Nelsson Huotari
da0add904b Fix and simplify brush outlines and coordinate calculations 2020-03-26 13:25:33 +02:00
Nelsson Huotari
8f625474fd Hotfix terraintexturemode circle brush radius calculations 2020-03-26 13:25:33 +02:00
Nelsson Huotari
e14c390a9b Fix crash 2020-03-26 13:25:33 +02:00
Nelsson Huotari
731e5b57f5 Tool outline for terraintexturemode and square shape. Various fixes. 2020-03-26 13:25:33 +02:00
Nelsson Huotari
24c8b32d4c Implement brush outline for terrainshapemode 2020-03-26 13:25:33 +02:00
Andrei Kortunov
2e7712a390 Fix C5204 warnings by adding default virtual destructors 2020-03-26 14:49:12 +04:00
Capostrophic
3e3f5d66b2 Don't reset dead non-werewolf vampires' vampire NPC type 2020-03-25 21:06:21 +03:00
Alexei Dobrohotov
baff15362a
Merge pull request #2713 from unelsson/opencsdropobjects
Editor: Implement dropping objects with keypress in instancemode
2020-03-24 03:01:07 +03:00
Alexei Dobrohotov
8d02b619fd
Merge pull request #2728 from akortunov/swimfix
Trace down dead persistent actors underwater
2020-03-23 21:00:42 +03:00
Andrei Kortunov
9d254aefb3
Merge pull request #2731 from Capostrophic/gender
Fix Gender column filtering (bug #4601)
2020-03-23 17:27:41 +04:00
Capostrophic
18bfc6f2c5 Fix Gender column filtering (bug #4601) and correct filter descs 2020-03-22 22:09:38 +03:00
David Cernat
907c5fc6de Merge branch '0.7.1-summons-ordering' into 0.7.1 2020-03-22 17:29:01 +02:00
James Moore
a37bdfd492 Implement a refresh button on data files page 2020-03-21 19:35:20 +00:00
Andrei Kortunov
d2a2c74e08 Trace down dead persistent actors underwater (regression #5317) 2020-03-21 10:41:35 +04:00
Andrei Kortunov
f4ace20885
Merge pull request #2726 from Assumeru/robe
Make robes cover the chest slot
2020-03-21 10:24:36 +04:00
Andrei Kortunov
3d20df883e
Merge pull request #2727 from akortunov/guifixes
Make slider control in the wait window to be a more intuitive
2020-03-21 10:11:20 +04:00
uramer
ee84868b7d [Client] Fix double summoning magical effects 2020-03-20 22:28:00 +01:00
Andrei Kortunov
90508237b1 Make slider control in the wait window to be a more intuitive 2020-03-20 11:58:22 +04:00
fredzio
e1b5dd97b8 Add a filter in the alchemy window.
A button allow to switch between ingredient name and magic effect.
Switching reset the filter.
The default filter can be set in the layout file.

The player can show only ingredients whose either name or effect
match the filter
Only effect that are known to the player (via alchemy skill) are
taken into account
2020-03-20 06:35:57 +01:00
uramer
3e7230e89d [Client] Assign summoned creatures' actorId correctly, skipping those already assigned 2020-03-19 22:28:00 +01:00
Evil Eye
4f4982545a make robes cover the chest slot 2020-03-19 21:30:22 +01:00
Nelsson Huotari
793ea8566f Fix typo 2020-03-19 12:14:10 +02:00
Nelsson Huotari
17cb3414d8 clean-up, improve formatting 2020-03-19 11:18:54 +02:00
Nelsson Huotari
75f6577f61 Remove unneeded include 2020-03-18 11:26:11 +02:00
Nelsson Huotari
41aa90bfa7 Add helper class for safer mask handling 2020-03-18 11:18:18 +02:00
Nelsson Huotari
af434cffba fix numeric limits min() to lowest(), fix correct drop height 2020-03-18 11:18:18 +02:00
Nelsson Huotari
035d5205d9 Use collision boxes to calculate dropping height, variable naming 2020-03-18 11:18:18 +02:00
Nelsson Huotari
54738e1e32 Handle mask disabling better 2020-03-18 11:17:22 +02:00
Nelsson Huotari
711dc59f09 Implement four different functions for dropping 2020-03-18 11:17:22 +02:00
Nelsson Huotari
f063eeb36e Drop objects with a keyboard shortcut 2020-03-18 11:17:22 +02:00
Bret Curtis
79517f3f42
Merge pull request #2724 from akortunov/factions
Cleanup ownership for items in containers
2020-03-18 10:00:36 +01:00
Alexei Dobrohotov
e80fbf4786
Merge pull request #2721 from akortunov/radial_fog
Support for radial fog
2020-03-17 22:35:10 +03:00
Andrei Kortunov
02444add2a Support for radial fog (feature #4708) 2020-03-17 23:09:28 +04:00
Andrei Kortunov
ea30e27370 Cleanup ownership for items in containers 2020-03-17 17:22:39 +04:00
Andrei Kortunov
dea2018d9f Do not use dynamic casts when using ObjectState 2020-03-17 15:18:40 +04:00
David Cernat
0acf6f0242 Merge branch '0.7.1-sound-records' into 0.7.1 2020-03-16 23:08:00 +02:00
David Cernat
94f5b169e6 Merge branch '0.7.1-window-input' into 0.7.1 2020-03-16 08:45:51 +02:00
uramer
f46f028754 [General] Sound custom records 2020-03-15 19:17:00 +01:00
uramer
e0aaa7ee40 [Server] Remove duplicate includes 2020-03-15 17:30:00 +01:00
uramer
758ec17a6e [Server] Include handleInput.cpp correctly 2020-03-15 17:18:00 +01:00
uramer
09ea1ab585 [Server] SetObjectSound 2020-03-14 19:17:00 +01:00
elsid
5168f2059f
Compare revisions by equality to support overflow 2020-03-14 09:38:24 +01:00
elsid
7ae7cb181d
Support recast mesh rendering 2020-03-14 09:38:24 +01:00
David Cernat
43e7df6df8 Add OpenMW commits up to 11 Mar 2020 2020-03-11 22:17:17 +02:00
Roman Siromakha
b1ed7a433e
Merge pull request #2718 from akortunov/storage
Keep an AiWanderStorage when cloning an actor
2020-03-11 18:54:22 +01:00
Alexei Dobrohotov
7e6a533a29
Merge pull request #2695 from elsid/aiwander_check_destination
Add more destination checks for AiWander without pathgrid
2020-03-11 20:48:22 +03:00
Bret Curtis
7096ecdcf2
Merge pull request #2719 from Capostrophic/capofixes
Fixes of my mistakes
2020-03-11 09:05:12 +01:00
Bret Curtis
3502b28045
Merge pull request #2714 from Capostrophic/bumpmapping
Add bump-mapping support (feature #5304)
2020-03-11 09:00:42 +01:00
Capostrophic
aef6cd7006 Fix handling of empty strings in NIF string tables 2020-03-10 23:04:20 +03:00
Andrei Kortunov
9f27a0d095 Keep an AiWanderStorage when cloning an actor (bug #5267) 2020-03-10 12:22:21 +04:00
Andrei Kortunov
8e1e4d6757 Do not copy global map texture during savegame loading (bug #5308) 2020-03-08 22:31:38 +04:00
Andrei Kortunov
ae65b0228a Do not write custom data for disposed actors 2020-03-07 13:01:14 +04:00
Andrei Kortunov
94df2114c1 Store fog of war as a PNG image instead of TGA (bug #5108) 2020-03-07 11:05:32 +04:00
Capostrophic
4455c978df Explain the global shader define default values in editor 2020-03-04 01:00:09 +03:00
Capostrophic
6999f1fd28 Add an option to apply lighting to environment maps 2020-03-03 20:08:59 +03:00
Bret Curtis
bbca1f3d1d
Merge pull request #2712 from Capostrophic/search
Make search fields behave more consistently
2020-03-03 10:39:06 +01:00
uramer
2b71cbb8fc [Server] Handle backspace input if the current line is empty 2020-03-02 14:40:00 +01:00
uramer
59693abc74 [Server] Handle backspace in the server window 2020-03-02 14:19:00 +01:00
Capostrophic
54334932d9 Move user string assignment to layout files 2020-03-02 02:36:16 +03:00
uramer
4e6bcf02d2 [Server] Pass stdin to a Lua event, fix Ctrl+C on Windows 2020-03-01 18:30:00 +01:00
AnyOldName3
52fa20fb1c Merge branch 'fix-sky' into 'master'
Fix building mwrender/sky with OSG 3.6.5

See merge request OpenMW/openmw!162
2020-03-01 16:43:13 +00:00
uramer
3476bd7d04 [Client] Play sounds at fixed position if the object is in current cell 2020-03-01 14:22:00 +01:00
David Cernat
06a3604f9e Merge remote-tracking branch 'uramer/0.7.1-game-settings' into 0.7.1 2020-03-01 01:58:01 +02:00
David Cernat
27d35d73a2 [General] Implement OnObjectSound packet
Many interactions between players and objects now have their sounds sent to other players.
2020-02-29 18:15:41 +02:00
David Cernat
4b69d1cc51 [Client] Play sound for object placements where droppedByPlayer is true 2020-02-29 18:12:46 +02:00
uramer
bb8182663f [General] Set any settings from the Game category with the GAME_SETTINGS packet 2020-02-28 00:40:00 +01:00
David Cernat
1a7060c5c5 [Server] Add server functions for handling the droppedByPlayer boolean 2020-02-27 14:53:03 +02:00
David Cernat
8b2bf941cd [Client] Only play trap disarm sounds when the server approves disarming 2020-02-26 22:24:58 +02:00
Bret Curtis
04f2b320b9
Merge pull request #2673 from Capostrophic/wizard
Make Wizard less shy (bug #4493)
2020-02-25 21:34:49 +01:00
Capostrophic
4b17d5da43 Make search fields behave more consistently 2020-02-25 18:26:25 +03:00
Capostrophic
d44dcc3242 Revert infinite fall failsafe addition 2020-02-25 16:46:53 +03:00
David Cernat
9d3afc019a [Client] Add logging for items added to & removed from player by server
Additionally, adjust comment related to potion creation to mention sending of stored item removals.
2020-02-25 09:53:42 +02:00
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
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
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
Capostrophic
3787625e61 Fix water ripple cleanup (bug #5246) 2020-02-19 23:27:45 +03:00
Nelsson Huotari
198a75b8e6 Delete selected instances with a hotkey 2020-02-19 11:44:55 +02: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
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
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
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
elsid
9404b1dd72
Stop wandering when destination is hidden or occupied by other actor 2020-02-10 22:29:54 +01:00
elsid
4a0c056489
Do not wander to occupied area by other actor 2020-02-10 22:29:54 +01:00
elsid
85414e2353
Check for line of sight for wander destination 2020-02-10 22:29:54 +01:00
elsid
0c92a567af
Use distance to position since last normal state in obstacle checker 2020-02-10 22:29:54 +01:00
elsid
52945921a7
Print ptr by betacomment 2020-02-10 22:29:37 +01: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
abd18745df [General] Include ScriptLocalFloat as part of ClientScriptLocal 2020-02-10 07:58:35 +02: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
Bret Curtis
7d77d44b34
Merge branch 'master' into interiorlighting 2020-02-05 08:59:28 +01:00
David Cernat
f0f76516d8 Add OpenMW commits up to 4 Feb 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
2020-02-05 02:03:31 +02:00
elsid
349040ffb2
Use status codes to handle navigator errors instead of exceptions
For find path use case.
2020-02-04 22:33:56 +01:00
Capostrophic
216a5d27c6 Avoid working with AMBI subrecord in tools unnecessarily (bug #5269) 2020-02-04 20:57:04 +03:00
Capostrophic
4a78674583 Make sure not to pick the ground shield model incorrectly 2020-02-02 15:39:29 +03:00
Andrei Kortunov
1db51a9e08 Re-work wandering outside of initial cell (bug #5261, bug #5262) 2020-02-02 11:02:19 +04:00
AnyOldName3
73722eedf3 Add default font releaseGLObjects workaround for OSG <3.65
This resolves https://gitlab.com/OpenMW/openmw/issues/4704

I've not compiled this or anything and I'm going off my memory from
around ten or eleven months ago, so if this fails CI or causes more
problems, that's why. The most likely issue is that we'll need to make
the context current before releasing the program.
2020-01-30 23:12:54 +00:00
Alexei Dobrohotov
2652b10b9c
Merge pull request #2681 from akortunov/hello
Do not interrupt greeting update when Hello = 0 or actor starts to swim
2020-01-30 00:48:13 +03:00
Andrei Kortunov
1522883fdd Do not interrupt greeting update when Hello = 0 or actor starts to swim (bug #5248) 2020-01-29 16:31:09 +04:00
elsid
f7caeefddb
Fallback to straight path when navmesh and pathgrind are not available 2020-01-29 11:14:07 +01:00
elsid
8e0b638145
Fix start position for AiWander random point selection 2020-01-28 20:29:52 +01:00
Bret Curtis
7dfbeff049
Merge pull request #2677 from unelsson/fixcsrotation
Editor: Convert radians to degrees when rotating objects
2020-01-28 11:55:56 +01:00
Bret Curtis
44a85795cf
Merge pull request #2669 from Capostrophic/wnam
Generate WNAM subrecord upon saving terrain instead of upon editing it
2020-01-28 11:43:47 +01:00
Nelsson Huotari
032513ae18 Convert radians to degrees 2020-01-28 11:33:44 +02:00
David Cernat
271dc3df87 [General] Rename unused ObjectCollision into ObjectSound 2020-01-26 13:30:28 +02:00
David Cernat
038c5b8231 [Client] Rename ObjectList's addObject() into addBaseObject() 2020-01-23 16:40:04 +02:00
David Cernat
296c04af71 [Client] Combine ObjectList's getBaseObject() and getObjectFromPtr() 2020-01-23 16:18:49 +02:00
David Cernat
975797c09b [General] Implement ObjectRestock packet
Restocking object containers via trading now requires the server to send back an ObjectRestock packet before it can happen.

The unused packet ID ID_SCRIPT_GLOBAL_FLOAT has been replaced with ID_OBJECT_RESTOCK.
2020-01-23 12:50:34 +02:00
David Cernat
59a38164ea [Client] Add generic objects to ObjectList using addObjectGeneric() 2020-01-23 09:03:40 +02:00
David Cernat
989188c171 [Client] Remove ObjectList's confusing addObjectDelete() function 2020-01-22 14:35:51 +02:00
elsid
1e106013a0
Use navmesh to find wander destination outside pathgrid for ground based actors
Use dtNavMeshQuery::findRandomPointAroundCircle from recastnavigation
2020-01-21 00:01:06 +01:00
elsid
e323e6e7e6
Consider moved distance in direction to destination for obstacle check
Assume actor is stuck when it's not able to move in the destination
direction with maximum speed. Approach to check moved distance from the
previous point doesn't work good for slow and big actors. When they face
obstacle they're trying to move along with oscillation so check is
passing but they don't get any closer to the destination.
2020-01-20 23:46:58 +01:00
David Cernat
27b9357478 [Client] Send Container packets when buying or selling items at merchant 2020-01-20 01:40:44 +02:00
David Cernat
a378b254f8 [Client] Include necessary headers in ContainerItemModel 2020-01-19 17:20:17 +02:00
David Cernat
8b14c007f3 [Client] Send ObjectDelete for purchased objects removed from world 2020-01-19 16:45:24 +02:00
Capostrophic
a2c674bb2e Make GetTarget return 1 during actor greeting (bug #5255) 2020-01-19 15:38:50 +03:00
David Cernat
32b5529e18 [Client] Use check with clearer logic in ObjectList::editContainers() 2020-01-16 14:02:27 +02:00
David Cernat
d2ba4a12d9 [Client] Simplify container sending with new addContainerItem() methods 2020-01-16 14:00:30 +02:00
David Cernat
51f0acbaf5 [Client] Improve logging for Container packets 2020-01-16 10:32:48 +02:00
David Cernat
b0b51dc4d5 [Client] Don't print sending of console command packets 2020-01-16 09:15:53 +02:00
David Cernat
60b6f92fa3 Add OpenMW commits up to 13 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
2020-01-15 07:49:26 +02:00
Andrei Kortunov
8bfca9830f
Merge pull request #2666 from Capostrophic/keybindings
Editor: Add a reset to defaults button to keybindings (feature #4068)
2020-01-13 10:28:38 +04:00
Capostrophic
7659370992 Editor: Add a reset to defaults button to keybindings (feature #4068) 2020-01-13 02:26:01 +03:00
Andrei Kortunov
a384104f73 Rework greeting timeouts (bug #5249) 2020-01-11 21:47:08 +04:00
capostrophic
89055f1c6c Generate WNAM upon saving terrain 2020-01-11 02:42:04 +03:00
Bret Curtis
95f9e4f4c9
Merge pull request #2649 from Capostrophic/nifstreamline
Yet more NIF adjustments
2020-01-10 22:07:25 +01:00
Alexei Dobrohotov
2615913494
Merge pull request #2661 from akortunov/guifixes
Settings menu tweaks
2020-01-10 14:24:36 +03:00
capostrophic
bbe5adb860 Use shield body part model for creatures (bug #5250) 2020-01-10 14:18:40 +03:00
Andrei Kortunov
4d4663e0ad Make 'Toggle HUD' hotkey configurable 2020-01-10 14:31:25 +04:00
Andrei Kortunov
2bed25a5e8
Merge pull request #2659 from Capostrophic/aitravel
Handle out-of-range actors' travel packages (bug #5212)
2020-01-10 13:32:51 +04:00
capostrophic
fc0f813dcb Add and use 'always active' AI package flag
Update documentation
2020-01-10 12:07:57 +03:00
capostrophic
1251b32f0f Slightly reduce code duplication 2020-01-09 22:17:01 +03:00
capostrophic
af2ea477d5 Don't use loops to detect absorb effects 2020-01-09 22:17:01 +03:00
capostrophic
42cc27194b Fix reported spellcasting discrepancies
Make ExplodeSpell behavior closer to Cast behavior (#5242)
Nullify on-self absorb spells in a different way (#5241)
Allow casting permanent spells through Cast/ExplodeSpell
2020-01-09 22:17:01 +03:00
Alexei Dobrohotov
7a4caaf5bf
Merge pull request #2660 from akortunov/boost
Additional de-boosting
2020-01-09 22:14:32 +03:00
Alexei Dobrohotov
ff2739b8a3
Merge pull request #2651 from akortunov/encoding
Unify streams usage to support non-ASCII paths
2020-01-09 22:12:55 +03:00
Andrei Kortunov
1cdd33b434 Implement additional stringops to avoid Boost functions 2020-01-09 19:40:22 +04:00
capostrophic
2d87d287ba Handle out-of-range actors' travel packages (#5212) 2020-01-09 14:17:54 +03:00
Andrei Kortunov
22a0549e73
Merge pull request #2656 from Capostrophic/sneak
Don't combine sneak idle with scripted/wander idles (bug #4284)
2020-01-07 11:26:59 +04:00
Alexei Dobrohotov
87f9b85e21
Merge pull request #2653 from akortunov/log
Improve BetaComment handling
2020-01-06 17:34:09 +03:00
Andrei Kortunov
a42396254b Use ISO format to print datetime 2020-01-06 11:27:11 +04:00
capostrophic
9b28420875 [Regression] Make creatures autoequip shields properly again 2020-01-05 23:49:19 +03:00
capostrophic
29c6a8975a Don't combine sneak idle with scripted/wander idles (bug #4284) 2020-01-05 15:09:02 +03:00
David Cernat
e6c626f127 [General] Move handling of client globals to ClientScriptGlobal packet
ClientScriptGlobal is a new Worldstate packet that handles short, long and float values for global variables in clientside scripts.

Previously, short values were handled by the ScriptGlobalShort packet, while a partially implemented ScriptGlobalFloat packet also existed, but both of those packets were Object packets because they were added near the end of 2016 when only Player and Object packets existed (with the latter actually being called WorldEvent packets at the time). Both ScriptGlobalShort and ScriptGlobalFloat have now been removed.

The serverside script functions previously used to interact with ScriptGlobalShort have, however, been kept so they can be adjusted to work with local variables in clientside scripts instead in a future commit.
2020-01-04 09:56:37 +02:00
Andrei Kortunov
af36b652aa Simplify datetime formatting 2020-01-04 10:45:11 +04:00
Andrei Kortunov
b6899a821b Improve BetaComment handling (feature #4129) 2020-01-03 08:45:53 +04:00
Andrei Kortunov
3704acf857 Unify streams usage to support non-ASCII paths (bug #5239) 2020-01-03 07:10:17 +04:00
David Cernat
c9b3ec1ca4 [Server] Use consistent ordering for kills & map worldstate functions 2020-01-03 02:00:21 +02:00
David Cernat
a58f09fd6c Add OpenMW commits up to 2 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
2020-01-02 22:09:54 +02:00
capostrophic
c61f64ae86 Fix tests 2020-01-02 13:07:27 +03:00
Andrei Kortunov
71e1d576cd Allow to enchant multiple projectiles at once (feature #3517) 2019-12-31 21:31:49 +04:00
Alexei Dobrohotov
119382ed13
Merge pull request #2647 from akortunov/warnfix2
Do not use the QStringList::fromSet, which is deprecated since Qt 5.14
2019-12-31 12:33:40 +03:00
Alexei Dobrohotov
133b99bf18
Merge pull request #2622 from akortunov/testcells
Implement TestCells and TestInteriorCells console commands
2019-12-29 14:27:48 +03:00
Andrei Kortunov
d57253c5e2 Do not use the QStringList::fromSet, which is deprecated since Qt 5.14 2019-12-28 21:38:49 +04:00
Alexei Dobrohotov
2693598d82
Merge pull request #2642 from akortunov/warnfix2
Add safety checks for door state
2019-12-23 21:22:56 +03:00
Andrei Kortunov
88a695f251 Add safety checks for door state 2019-12-23 19:29:12 +04:00
Andrei Kortunov
24ce242941 Implement TestCells (feature #5219) 2019-12-22 11:13:42 +04:00
Andrei Kortunov
cd81f81fb6 Initialize variables to avoid GCC warnings 2019-12-22 10:44:14 +04:00
Andrei Kortunov
089548cdc4 Fix build on Qt4 2019-12-22 10:31:32 +04:00
David Cernat
ca9cd90a4d Add OpenMW commits up to 20 Dec 2019
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
2019-12-20 15:43:50 +02:00
Andrei Kortunov
30a18c2a66
Merge pull request #2625 from Capostrophic/sneaking
[Regression] Attempt to fix idle state reset again
2019-12-20 14:32:22 +04:00
Andrei Kortunov
78450312bf Fix the last warning about deprecated Qt functions 2019-12-20 13:36:32 +04:00
Andrei Kortunov
47a13f1ed2 Do not use deprecated Qt API in the launcher 2019-12-20 12:59:56 +04:00
Andrei Kortunov
e44021b369 Fix most of deprecated API usage in the editor 2019-12-20 12:59:56 +04:00
David Cernat
32c7406eda [General] Implement OnObjectHit packet, part 3
Include damage, block states and knockdown states in ObjectHit packets about successful hits. Add serverside script functions for reading that information.
2019-12-19 13:53:18 +02:00
Andrei Kortunov
5220177ebc Fix ESMTool build 2019-12-19 15:21:49 +04:00
Assumeru
737aa1e4e8 Remove FactionID editing from OpenCS (#2636)
* Remove FactionID editing

* remove useless comments

* rename FactionID to Unknown
2019-12-18 20:42:54 +03:00
Assumeru
dfbe0021a5 Change rescaling to be more inline with vanilla (fixes #5214) (#2635)
* move rescaling to loadData

* clamp on save
2019-12-18 19:37:45 +03:00
David Cernat
2249450b0e [Client] Fix inability for actors to talk to players caused by 4118b20608 2019-12-15 11:50:15 +02:00
David Cernat
9763f6f9c5 [Client] Fix infinite activation loops caused by 48aba76ce9 2019-12-15 07:23:37 +02:00
Andrei Kortunov
97ee4bc349 Improve equipment logic (bug #5223) 2019-12-14 22:30:27 +04:00
David Cernat
bc093c8596 [General] Implement OnObjectHit packet, part 2
ObjectHit is now also sent when local actors succeed or fail in hitting other actors with melee attacks, with the packet including the success state of their attack.

It is also sent when creatures hit a non-actor object.
2019-12-13 14:00:51 +02:00
David Cernat
96049befe9 [Client] Add and use getObjectFromPtr() method in ObjectList 2019-12-13 13:07:21 +02:00
Capostrophic
483b37bb3f Disallow resting if the fall height hasn't been reset (bug #4802) 2019-12-12 15:26:02 +03:00
Andrei Kortunov
3d9c42e8ee Cap reputation values (bug #5226) 2019-12-11 08:47:46 +04:00
David Cernat
2973cc4f4d [General] Implement OnObjectHit packet, part 1
ObjectHit is now sent when an NPC hits a non-actor object.
2019-12-08 16:14:01 +02:00
Capostrophic
0a96f065d7 Launcher: improve first run and missing game data dialogues (bug #4009) 2019-12-08 17:03:27 +03:00
David Cernat
0e0ac7a60f [Server] Add OnConsoleCommand event and associated script function 2019-12-07 10:13:10 +02:00
David Cernat
eeb77f80d2 [Client] Send ConsoleCommand packets when console is used 2019-12-07 10:11:45 +02:00
David Cernat
4b27f8986b [Client] Synchronize positions for actors during death animations
This needs some improvements, because:

1) Sometimes the cell authority sends the death animation too late and a different one gets played on the other clients
2) There is probably a simpler check that can be done for position changes during a death animation.
2019-12-06 21:04:42 +02:00
David Cernat
7dd03798e7 [Client] Don't update already initialized but deleted LocalActors 2019-12-06 16:12:29 +02:00
David Cernat
c253950dd7 [Client] Don't play dying words for NPCs loaded up as dead from server 2019-12-06 14:50:10 +02:00
David Cernat
2af811be40 [Client] Use proper log message when receiving ActorDeath packets 2019-12-06 12:43:41 +02:00
David Cernat
1950748dae [Client] Always use autoEquip on newly initialized LocalActors
Previously, it was possible for a Container packet to clear all equipment slots for an actor without the actor's authority then sending an equipment packet to correct that, due to packet loss or sudden disconnection, leading to actors not wearing any equipment as soon as they acquired a new authority.

This ensures that newly initialized LocalActors will now autoEquip.
2019-12-06 12:21:30 +02:00
David Cernat
cd444f8707 [Client] Send actor equipment after Container packet causes autoEquip
Previously, a Container packet with a SET action for an actor would clear their entire InventoryStore, also clearing all of their equipment slots. The actor's authority would then autoEquip new equipment for the actor, but that new equipment would not actually get sent to the other players. As a result, they would see the actor fighting with hand-to-hand attacks, while also not actually wearing anything despite being rendered as wearing the same clothes and armor as before.

This commit makes the actor's authority resend the actor's equipment as soon as the Container packet has caused the autoEquip to happen.
2019-12-06 11:40:07 +02:00
Capostrophic
0bc13b47fa Fix essimporter script header and inventory item conversion 2019-12-05 23:50:55 +03:00
David Cernat
f43ba7fba2 [Client] Don't initialize disabled or deleted actors as LocalActors 2019-12-05 20:27:48 +02:00
David Cernat
980edac942 [General] Rename PlayerTeam into PlayerAlly
Considering that you can be allies with someone without being allied to their allies, changing the name makes the system more intuitive.
2019-12-05 19:15:11 +02:00
Andrei Kortunov
43330f1dd1
Merge pull request #2626 from akortunov/master
Reset holstered shield before rebuilding an NPC animation
2019-12-05 17:37:21 +04:00
Andrei Kortunov
d66b81d7f7 Reset holstered shield before rebuilding an NPC animation 2019-12-05 17:35:32 +04:00
David Cernat
a383b7b612 [General] Include death animations in ActorDeath packets 2019-12-05 13:27:55 +02:00
David Cernat
ecf00af548 [General] Implement WorldDestinationOverride packet, part 1
Destinations for doors with cell transitions are now overridden.
2019-12-04 16:43:56 +02:00
David Cernat
154a9ce5a6 [General] Fix declarations hiding class members, part 2 2019-12-04 10:17:33 +02:00
David Cernat
270867a397 [Client] Ensure mwmp::Main is initialized before GUIController cleanup
Previously, certain errors early in the program's execution – such as an attempt to use two different packet processors for the same packet ID – would not be displayed because of a crash when attempting to get an uninitialized mwmp::Main in the Engine's destructor.
2019-12-04 08:39:33 +02:00
David Cernat
5b4db83d61 [Client] Once again allow beds to be used even if waiting is disallowed
This had been broken by rest-related commits in OpenMW.
2019-12-03 23:55:55 +02:00
David Cernat
c4950f1beb [Client] Implement PlayerTeam packet, part 2
When determining actors siding with someone, also check the team members of DedicatedPlayers, not just those of the LocalPlayer.

Don't set players as each other's hitAttemptActor if they are team members.

Don't run startCombat() for DedicatedPlayers who get attacked.
2019-12-03 22:40:02 +02:00
Capostrophic
86c8fe386b Fix idle state reset 2019-12-03 20:50:57 +03:00
David Cernat
3a52f7dcf5 [Client] Add isTeamMember() method to MechanicsHelper 2019-12-03 17:04:49 +02:00
David Cernat
68f524b822 [Client] Use more succinct methods for PlayerPtr in MechanicsHelper 2019-12-03 14:12:40 +02:00
David Cernat
21c8821d05 [General] Ignore carriage returns in resources/version file 2019-12-03 13:21:10 +02:00
David Cernat
3aaf64a984 [Client] Only send DoorState packets for logged in players
This prevents problems with content that uses scripted doors in the area players are spawned in before they log in.
2019-12-03 12:23:05 +02:00
David Cernat
5ca2c83b02 [Client] Fix additional resurrection problems caused by 6450d84473 2019-12-03 11:42:56 +02:00
Andrei Kortunov
eec82f676a
Merge pull request #2602 from elsid/clang_tidy
Fix clang-tidy issues
2019-12-03 08:27:43 +04:00
David Cernat
eeb3e4f938 [Client] Reset friendly hits when summoning a creature 2019-12-02 23:29:36 +02:00
David Cernat
9792a5256f [General] Use different compromise for summoning
Revert 9502d84a9cb99028f76f7fd2e05f9193ca66561 because the creature graveyard solves more problems than it causes. Only have the authority of a cell send deletion packets when a summon despawns.

Summoning is one of the least multiplayer-friendly systems in OpenMW and really needs to be redone serverside.
2019-12-02 20:48:52 +02:00
David Cernat
753e310dd4 [General] Implement PlayerTeam packet 2019-12-02 19:08:03 +02:00
David Cernat
385ef55848 [Client] Avoid crashes by only using inventory listeners in loaded cells
Previously, receiving a Container packet about an actor with a previously initialized listener who was currently located in an unloaded cell crashed the game.
2019-12-02 09:37:10 +02:00
Andrei Kortunov
ab4b3677e3 Merge branch '16' into 'master'
perf regression fix

See merge request OpenMW/openmw!157
2019-12-02 05:35:19 +00:00
David Cernat
a54bc364ba [Client] Fix code conflict with OpenMW in OpRemoveSpell correctly 2019-12-02 00:27:33 +02:00
David Cernat
9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
2019-12-01 23:52:42 +02:00
David Cernat
d9502d84a9 [Client] Disable clientside handling of summoned creature graveyards 2019-12-01 20:22:04 +02:00
David Cernat
446c22723e [General] Set default values for some variables in BasePlayer 2019-12-01 18:42:56 +02:00
David Cernat
1283d5d487 [General] Synchronize TCL state for players
Additionally, only purge temporary levitation effect for DedicatedPlayers if one has been added.
2019-12-01 18:13:24 +02:00
David Cernat
7120f41cfa [Client] Add creatures to summoner's creature map when they are missing
Additionally, adjust logging related to summons.
2019-12-01 15:02:04 +02:00
David Cernat
985d1f17e0 [Client] Use correct magnitude for active effect created for summons 2019-12-01 14:58:06 +02:00
David Cernat
9a772d737f [Server] Add script functions relating to summons' effect & spell IDs 2019-12-01 13:32:34 +02:00
David Cernat
d78bdefc01 [General] Include effect and spell ID for summons in ObjectSpawn packets 2019-12-01 13:31:11 +02:00
Capostrophic
e7f6ab1ae2 Avoid using getPtr for object search in scripting (bug #5220) 2019-12-01 14:09:59 +03:00
David Cernat
610e0558c8 [Server] Use correct argument for SetObjectSummonDuration() 2019-12-01 10:41:07 +02:00
David Cernat
47b666c1f9 [Server] Add ObjectFunctions for setting summoner identity for spawns 2019-12-01 10:12:13 +02:00
Andrei Kortunov
eacc185534
Merge pull request #2616 from Brouilles/master
Several languages for the launcher
2019-12-01 10:03:19 +04:00
Andrei Kortunov
058bbf4b0f
Merge pull request #2620 from elsid/fix_cage_door_rotation
Rotate door object using direct rotation order once
2019-12-01 09:54:38 +04:00
Brouilles
3889c0fa7b Add QTranslator support for launcher
Add French translation for launcher

Clean launcher main.cpp (appTranslator.load)

Remove french translation

Remove string translation file

Update AUTHORS.md
2019-11-30 22:41:00 +01:00
David Cernat
c6542ffec4 [Server] Move ObjectFunctions for setting summoning to their own spot 2019-11-30 20:44:27 +02:00
David Cernat
5575242299 [Client] Don't allow players to attack while in persuasion dialogue 2019-11-30 20:05:20 +02:00
Andrei Kortunov
ae80d8e490
Merge pull request #2618 from elsid/fix_rope_bridge
Fix objects culling for recast mesh tiles (bug #5216)
2019-11-30 21:54:14 +04:00
David Cernat
397cdf400b [Server] Reorder record types in RecordsDynamic script functions
They are now consistent with the ordering from 42b002e8db
2019-11-30 19:12:57 +02:00
David Cernat
64c94346b6 [Client] Always send attack starts by actors immediately
Previously, creatures with fast attack animations would have their attack updated right after being started, which happened so quickly that it prevented the attack start from actually being sent by the client.
2019-11-30 15:50:05 +02:00
Alexei Dobrohotov
c01324fdb2
Merge pull request #2613 from akortunov/warnfix3
Fix GCC9 warnings about implicit declarations
2019-11-30 16:09:01 +03:00
elsid
3cfd5fca4e
Rotate door object using direct rotation order once
Instead of rotating using inverse and then applying the direct rotation.
To properly update object in navigator.
2019-11-30 14:09:00 +01:00
David Cernat
ed7fe859dd [Client] Set attackingOrSpell state instantly after Attack/Cast packets
It is no longer necessary to wait for the Actors::update() loop to set dedicated players and actors to their new states.
2019-11-30 15:03:51 +02:00
elsid
7ec5a20c64
Filter recast mesh triangles by global bounding box
Except heightfields to reduce slow down.
2019-11-30 13:19:27 +01:00
David Cernat
c702eab93c [Client] Fix declarations hiding class members 2019-11-30 12:51:48 +02:00
Nikolay Kasyanov
6ef94c20b3 Fix macOS packaging on CMake 3.15
It looks like component names have become case sensitive.
2019-11-30 10:37:05 +01:00
David Cernat
56c3ef71ae [Client] Send ObjectDelete packets when picking up items once again
When fixing problems with ObjectActivate in 49fa35a516, I mistakenly made it so the picking up of items no longer also sent ObjectDelete packets. That is now fixed.
2019-11-30 08:13:22 +02:00
David Cernat
7acf6865b9 [Client] Don't clear spells for dying actors 2019-11-29 19:49:17 +02:00
David Cernat
23d410f473 [General] Implement body part records for RecordDynamic packet 2019-11-29 14:06:17 +02:00
David Cernat
0dae3074a6 [Client] Add missing comment related to spellcast animation 2019-11-29 14:02:52 +02:00
David Cernat
b3747839c0 [General] Add hasRace to record overrides in RecordsDynamic packet 2019-11-29 13:28:07 +02:00
David Cernat
ddb25a482d [Server] Remove unneeded assignments for playerController in processors 2019-11-29 12:54:18 +02:00
David Cernat
16662d772b [General] Synchronize death animations for players 2019-11-29 12:52:47 +02:00
Andrei Kortunov
1b98fe4395 Fix GCC9 warnings about implicit declarations 2019-11-29 12:41:23 +04:00
David Cernat
140c1c9c12 [General] Use hard synchronization for melee attack animations
Previously, each client chose its own attack animations for DedicatedPlayers and DedicatedActors based on the direction they were walking in, which however led to desyncs for players with "Always Use Best Attack" enabled and for creatures which pick their attack animations randomly.
2019-11-29 10:39:57 +02:00
David Cernat
a385fcdd87 [Client] Fix crash caused by setting instant state for null localCast 2019-11-28 20:28:55 +02:00
David Cernat
5a46b40e1a [Client] Stop switching drawstates when receiving ActorAttack packets
Previously, some of the spammier ActorAttack packets were overriding spellcasting animations with weapon attack animations.
2019-11-28 19:53:34 +02:00
David Cernat
ef944aa050 [Client] Remove unused redeclarations of localActors & dedicatedActors 2019-11-28 13:00:20 +02:00
David Cernat
06b4a4f97c [Client] Don't tie spellcasting for dedicated players/actors to anim end
When Koncord implemented spellcasting, he made it so only the act of initiating a spellcast was synchronized, leaving it to other clients to actually cast a spell for a dedicated player or actor once their spellcasting animation was over. This had led to a lot of desyncs and has always been inconsistent with the handling of attacks, so I've belatedly gone ahead and prevented the end of a spellcasting animation from having any effect for dedicated players and actors, making them cast a spell when an appropriate Cast packet is received from them instead.

Additionally, the logged messages in MechanicsHelper's handling of attacking and casting have been moved around slightly.
2019-11-28 10:34:34 +02:00
David Cernat
7815c8bdaf [Client] Queue sending of Cast packet from CastSpell::cast() 2019-11-28 09:40:22 +02:00
Andrei Kortunov
407a737fe4
Merge pull request #2611 from Capostrophic/effect
[Regression] Make sure instant FX abilities get detected when they're supposed to
2019-11-28 08:20:39 +04:00
David Cernat
b74e3a7e2e [Client] Include spellIds in Cast packets again, fixing problem from 190c404b38 2019-11-28 00:11:51 +02:00
Bret Curtis
62b9f1a2f7
Merge pull request #2610 from akortunov/warnfix2
Fix some build warnings
2019-11-27 21:24:44 +01:00
Capostrophic
77f076ff11 Make sure instant FX abilities get detected when supposed 2019-11-27 17:15:48 +03:00
David Cernat
bbf9f20053 [Client] Stop sending WorldKillCount packets or incrementing local kills
This means the server scripts are now required to send a WorldKillCount packet as a reply to ActorDeath packets sent by clients. This gives the server full control over which kills are counted, while also solving the previous problem of kills being counted only for actors that had finished their death animations.
2019-11-27 11:21:29 +02:00
Capostrophic
0adc2df65f Make SameFaction work (bug #5213) 2019-11-23 14:47:50 +03:00
David Cernat
8da6a7fd9b [Server] Fix mixed-up bindings for Chat functions 2019-11-20 21:01:18 +02:00
Capostrophic
eed92c824e Make sure hand-to-hand shortcut is not saved 2019-11-20 19:57:21 +03:00
bzzt
f09125fc93 perf regression fix 2019-11-20 13:37:00 +00:00
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
2019-11-19 17:16:48 +02:00
Andrei Kortunov
d0643d266a Do not use fallthrough in switches 2019-11-19 16:10:18 +04:00
Andrei Kortunov
73f43ba750 Do not use screen fading during game loading if there is no current cell (bug #5211) 2019-11-18 22:24:19 +04:00
Andrei Kortunov
4118b20608 Allow ActionOpen and ActionTalk only for player (bug #5210 2019-11-18 12:41:11 +04:00
Alexei Dobrohotov
4208f10e81
Merge pull request #2600 from akortunov/master
Take in account caster's race height when launch magic bolt
2019-11-17 21:04:55 +03:00
elsid
f156c9522e
Avoid virtual call in SoundManager dtor 2019-11-17 18:50:11 +01:00
elsid
8083df4567
Avoid virtual call in Animation dtor 2019-11-17 18:50:11 +01:00
elsid
b4794e8ca5
Avoid virtual call in OpenAL_Output dtor
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: warning: Call to virtual function during destruction [clang-analyzer-optin.cplusplus.VirtualCall]
    deinit();
    ^
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: note: This destructor of an object of type '~OpenAL_Output' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: note: Call to virtual function during destruction
2019-11-17 18:50:11 +01:00
elsid
b55f5ab648
Avoid virtual call in WindowManager ctor
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        loadUserFonts();
        ^
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: This constructor of an object of type 'WindowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: Call to virtual function during construction
2019-11-17 18:50:11 +01:00
elsid
cf01df31be
Remove unused variable initialization
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: warning: Value stored to 'material' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
            osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
                           ^
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: note: Value stored to 'material' during its initialization is never read
2019-11-17 18:50:11 +01:00
Andrei Kortunov
6861d9d5e5
Merge pull request #2510 from elsid/ai_open_door
Open door when it is on the way to a next path point (bug #5073)
2019-11-17 21:21:22 +04:00
Andrei Kortunov
d1e0fa575e Take in account caster's race height when launch magic bolt (bug #5209) 2019-11-17 16:37:38 +04:00
Andrei Kortunov
6554130f6f
Merge pull request #2594 from Capostrophic/summonsummon
Minor summoned creature cleanup fixes
2019-11-17 10:47:07 +04:00
Andrei Kortunov
8dbbe42f21 Add missing isNpc() check (bug #5206) 2019-11-17 09:17:03 +04:00
Bret Curtis
454b9f1964
Merge pull request #2597 from akortunov/coverity
CoverityScan fixes, part 2
2019-11-14 21:08:03 +01:00
Alexei Dobrohotov
f332df8839
Fix terrain shadows checkbox loading 2019-11-14 19:50:59 +03:00
Andrei Kortunov
b21dc17538 Attempt to shut up CoverityScan warnings about tainted values 2019-11-14 18:28:38 +04:00
Alexei Dobrohotov
b5992b380e
Merge pull request #2586 from unelsson/allowselectionalledges
Allow selecting cell edges everywhere
2019-11-14 17:25:48 +03:00
Andrei Kortunov
b210e99abc Avoid divizion by zero 2019-11-14 17:43:21 +04:00
Nelsson Huotari
120583f443 optimize isInCellSelection calls 2019-11-14 11:28:49 +02:00
Andrei Kortunov
3970baeb84 Fix possible usage of destroyed variable 2019-11-13 15:46:49 +04:00
Andrei Kortunov
34873b6065 Fix dead code 2019-11-13 15:29:18 +04:00
Andrei Kortunov
5561eb5415 Do not discard division reminder 2019-11-13 15:18:18 +04:00
Andrei Kortunov
238dcdbbd4 Fix copy-paste error 2019-11-13 15:14:30 +04:00
Andrei Kortunov
5c6ca82c45 Clamp fallback value from config 2019-11-13 15:10:19 +04:00
Andrei Kortunov
079c77ff22 Avoid zero division 2019-11-13 14:57:22 +04:00
Andrei Kortunov
ca2a524a5f Avoid null pointer dereference 2019-11-13 14:50:42 +04:00
Andrei Kortunov
af41e9acc1 Initialize variables to avoid undefined values 2019-11-13 14:47:29 +04:00
Capostrophic
120b7dcd2f Clean up summoned creatures when corpses are disposed 2019-11-12 21:44:46 +03:00
David Cernat
1d8668305c [Client] Send PlayerSpellbook packet when contracting or curing disease 2019-11-12 17:44:38 +02:00
Capostrophic
1097c2cfc4 Minor summoned creature cleanup fixes 2019-11-12 17:50:06 +03:00
Capostrophic
9c78e8cc56 Make sure movement not controlled by animation has valid velocity
Fixes erroneously always normalized movement speed in first person
2019-11-12 17:33:44 +03:00
Alexei Dobrohotov
a1ed0144e1
Merge pull request #2590 from akortunov/guifixes
UI textures scaling corrections
2019-11-10 13:53:27 +03:00
David Cernat
8f7a267129 [General] Add scale and bloodType to creature records in RecordDynamic 2019-11-10 09:20:45 +02:00
David Cernat
afb9bd7eb5 [General] Implement script records for RecordDynamic packets 2019-11-09 21:34:09 +02:00
Andrei Kortunov
1835a39c57 Do not show shields in the 1st-person view when shield sheathing is enabled 2019-11-09 17:48:05 +04:00
Andrei Kortunov
6a625b1dac Scale magic items frames in the quick keys menu 2019-11-09 15:00:50 +04:00
David Cernat
383d6ecea6 [Server] Update log message related to server password 2019-11-09 08:46:56 +02:00
David Cernat
20d1e7654c [General] Create SystemPacket category and move Handshake packet to it 2019-11-09 05:12:00 +02:00
David Cernat
5762a36fc2 Add OpenMW commits up to 7 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
2019-11-08 06:20:41 +02:00
Andrei Kortunov
f335044026
Merge pull request #2587 from Capostrophic/sheathing
Minor sheathing-related changes
2019-11-07 20:04:03 +04:00
Capostrophic
5a5bc0bef8 Uncheck sheathing checkboxes automatically when appropriate
Fix their order and bogus saveSettingBool calls
2019-11-07 17:24:43 +03:00
Andrei Kortunov
6eb8e0cf4d Display magic effects according to research page 2019-11-07 11:05:18 +04:00
Capostrophic
5eab913a9c Make additional anim sources dependency more obvious 2019-11-05 21:41:56 +03:00
Capostrophic
7885b8c75e Sheathing-related changes
Add weapon and shield sheathing and use additional anim sources checkboxes into the Advanced tab of the launcher
Remove outdated information from the documentation
2019-11-04 20:34:06 +03:00
Nelsson Huotari
45d43045eb Remove unused std::string 2019-11-04 12:29:37 +02:00
Nelsson Huotari
aeb0ccff90 Allow selecting cell edges everywhere 2019-11-04 12:16:08 +02:00
Nelsson Huotari
8f6dc78217 Get vertex height from data, if not available in visible cells. 2019-11-04 00:09:23 +02:00
Nelsson Huotari
9677203215 Don't allow vertex selection outside visible cells 2019-11-04 00:09:23 +02:00
Nelsson Huotari
d186bcb46f Update selection during transient edit, clear to a single function. 2019-11-03 13:27:27 +02:00
Andrei Kortunov
678d2e6e7d
Merge pull request #2584 from Capostrophic/shadows
Resolving 0.46.0 release shadow-related blockers
2019-11-03 08:35:30 +04:00
Alexei Dobrohotov
5ae91465ee
Fix gamepad zoom value calculation 2019-11-02 19:47:05 +03:00
Capostrophic
208608cbd0 Fix a typo and a mistake 2019-11-02 18:06:39 +03:00
Capostrophic
0e2380d471 Add the most basic shadow settings into the launcher 2019-11-02 18:06:39 +03:00
Alexei Dobrohotov
b700c98e8f
Merge pull request #2581 from akortunov/deceleration
Implement actors movement deceleration (feature #4544)
2019-10-31 15:59:18 +03:00
Bret Curtis
ec9a593fc3
Merge pull request #2578 from akortunov/mouse
Implement mouse wheel bindings (bug #2679)
2019-10-31 13:14:29 +01:00
Andrei Kortunov
61ab7f3c1e Implement actors movement deceleration (feature #4544) 2019-10-31 14:41:12 +04:00
Michael Stopa
e4bec88a68 Implement mouse wheel bindings (bug #2679) 2019-10-30 20:45:51 +04:00
Alexei Dobrohotov
7328db4d6b
Fix small typo in body part record verifier 2019-10-30 17:51:36 +03:00
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images" 2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression
Store raw data about fog of war instead of RGBA images
2019-10-30 13:45:55 +01:00
Andrei Kortunov
45ab6e1430 Implement UTF-8 support for script parser (bug #4598) 2019-10-30 14:59:47 +04:00
David Cernat
54301f5f89 Add OpenMW commits up to 29 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
2019-10-29 23:49:31 +02:00
David Cernat
bde9f7b817 Add OpenMW commits up to 20 Oct 2019
# Conflicts:
#	apps/openmw/mwgui/recharge.cpp
#	apps/openmw/mwrender/globalmap.cpp
#	apps/openmw/mwrender/globalmap.hpp
#	apps/openmw/mwworld/inventorystore.cpp
2019-10-29 22:26:35 +02:00
David Cernat
05b5a7b32d [Client] Trigger crimes when using take all on containers 2019-10-29 21:17:01 +02:00
Alexei Dobrohotov
7488f402d5
Merge pull request #2576 from akortunov/warnfix
Fix warnings about variable re-declaration
2019-10-29 15:03:54 +03:00
Andrei Kortunov
d278e5d4af Fix warnings about variable re-declaration 2019-10-29 13:48:08 +04:00
Capostrophic
c6e431d862 Avoid copying strings in SearchVisitor and readReferenceCollection 2019-10-28 19:28:14 +03:00
Capostrophic
ee4fa93bd4 Rework prevent merchant equipping setting again 2019-10-28 01:58:23 +03:00
Andrei Kortunov
15cd305253 Reset idle animation only when play movement animation (bug #5196) 2019-10-27 12:33:28 +04:00
David Cernat
adcac2675a [Client] Fix warnings related to destructors for processors 2019-10-26 16:43:08 +03:00
David Cernat
b97322b4b1 [General] Modernize packet style for PlayerInventory 2019-10-26 14:01:08 +03:00
Alexei Dobrohotov
1f616c5613
Merge pull request #2569 from akortunov/holstered_shield
Ignore shields sheathing for creatures without sheathing bone
2019-10-26 12:00:07 +03:00
Andrei Kortunov
b27089f7be
Merge pull request #2560 from Capostrophic/geteffect
Fix GetEffect result when running on dead actors
2019-10-26 12:47:58 +04:00
David Cernat
cbe58b1c24 [General] Modernize packet style for PlayerFaction 2019-10-26 11:42:40 +03:00
Andrei Kortunov
7cd4fa4706 Ignore shields sheathing for creatures without sheathing bone 2019-10-26 12:41:16 +04:00
David Cernat
c9f3ee1819 [Client] Make PlayerResurrect use new resurrection handling from 6450d84473 2019-10-26 09:12:06 +03:00
Bret Curtis
9f039fac87
Merge pull request #2520 from unelsson/transientlandshapeedit
[Review phase] Editor: Transient land shape editing
2019-10-25 00:26:43 +02:00
Koncord
a74bf1baec [Client] Mark derived processor classes as final
(cherry picked from commit 7748e582a8)
2019-10-24 22:16:17 +03:00
David Cernat
0e94eb8b74 [General] Use regular ints for weather states for consistency w/ OpenMW 2019-10-24 20:08:08 +03:00
David Cernat
904f804ea2 [General] Modernize packet style for PlayerSpellbook 2019-10-24 19:27:37 +03:00
Bret Curtis
2040ca5637
Merge pull request #2555 from akortunov/encoding
Encode ID's in all places to UTF-8
2019-10-24 00:48:12 +02:00
David Cernat
4f9e6b0e3e [General] Modernize packet style for PlayerCellState 2019-10-23 17:46:21 +03:00
Bret Curtis
afb218fe29
Merge pull request #2564 from Capostrophic/enchant
Remove on-strike enchantment support for ranged weapon types (bug #5190)
2019-10-23 15:11:36 +02:00
David Cernat
96a71c1ced [General] Modernize packet style for PlayerBook 2019-10-23 02:02:27 +03:00
Bret Curtis
39fd12c065
Merge pull request #2568 from elsid/settings_parser_tests
Settings parser tests
2019-10-23 00:30:16 +02:00
David Cernat
d66bca8605 [General] Modernize packet style for PlayerTopic 2019-10-23 01:24:13 +03:00
Nelsson Huotari
c957f0544c Remove unneeded brackets 2019-10-23 00:34:54 +03:00
Nelsson Huotari
fdc73b87ba Remove includes that aren't needed any more 2019-10-23 00:07:41 +03:00
Nelsson Huotari
9e5db10288 const ref float -> float 2019-10-23 00:02:24 +03:00
Nelsson Huotari
ac5b356e8d Always initialize landShapeNew 2019-10-23 00:01:23 +03:00
Nelsson Huotari
6f9f59dd58 declare cellId and cellCoords in smallest possible scope 2019-10-22 21:26:55 +03:00
Nelsson Huotari
fdcc7fa1d7 0 to nullptr 2019-10-22 21:26:55 +03:00
Nelsson Huotari
a13edbdb42 Bump shape calculation to function 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8d3e7f2815 fix normals at cell edges, better coding standards 2019-10-22 21:26:55 +03:00
Nelsson Huotari
0f6ddfe8e6 change include, cleanup 2019-10-22 21:26:55 +03:00
Nelsson Huotari
12349f4e48 cleanup 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c556885d71 remove unused Qt signal 2019-10-22 21:26:55 +03:00
Nelsson Huotari
deb122ffdb Add optional post-processing (smooth/rough), add/fix tooltips. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
2d34b63b0b Fix logic of land loading when no cell, land or landdata. Fix also draw. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
71eff60d22 Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize 2019-10-22 21:26:55 +03:00
Nelsson Huotari
a1348d94f9 add missing final specifiers 2019-10-22 21:26:55 +03:00
Nelsson Huotari
16ba32ffd5 assignments to member initialization list 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c2de645c8c override, virtual -> final, remove unused variables, public to private. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a3070e680 Fix shape brush setting description 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8a9ca0b3ec Generate new WNAM record based on new land heights, add comments 2019-10-22 21:26:55 +03:00
Nelsson Huotari
96be82a047 Remove terrain vertex selection and brush button when exiting editMode 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8acfa2600f Terrain shape editing related fixes 2019-10-22 21:26:55 +03:00
Nelsson Huotari
5b9debc554 use enum for mbrushshape initialization 2019-10-22 21:26:55 +03:00
Nelsson Huotari
4f9ec24e41 use enum for brushshape at scenetoolshapebrush 2019-10-22 21:26:55 +03:00
Nelsson Huotari
bae8636ec0 Fix brusshape enum values 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c031543420 use enum for brush shapes 2019-10-22 21:26:55 +03:00
Nelsson Huotari
388edfd8cc change manual memory management to std::unique_ptr 2019-10-22 21:26:55 +03:00
Nelsson Huotari
da4abcd7c1 std::set to std::unique and erase. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a44cae572 white iterator loop to C++11 range-based for loop. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
bccf36fdbc Convert normals calculations mostly to osg::Vec3f 2019-10-22 21:26:55 +03:00
Nelsson Huotari
45b0f034c3 Split complex if-logic into multiple reasonably named functions 2019-10-22 21:26:55 +03:00
Nelsson Huotari
0ce971c1bb Revert back to less aggressive component-level changes. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
69083369f8 use std::fill instead of for 2019-10-22 21:26:55 +03:00
Nelsson Huotari
3599e804e1 Fix the default value of mBrushSize 2019-10-22 21:26:55 +03:00
Nelsson Huotari
dc7dc93320 Remove unused functions, improve formatting, handle terrain edit click 2019-10-22 21:26:55 +03:00
Nelsson Huotari
1046d57190 Remove unneeded forward declarations. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
55b3fd4418 Use float calculations for circle brush, keep tool options in memory. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
23e7c71a5a Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
8f3c22ccc3 Remove TerrainShapeMode::fixEdges 2019-10-22 21:25:10 +03:00
Nelsson Huotari
1a3fc435b9 Fix alterHeight bugs, don't let broken land edit pass. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
ff18595a86 Reduce code duplification, add bool value to limiting 2019-10-22 21:25:10 +03:00
Nelsson Huotari
60c0a25004 Fix smooth tool and flatten tool. Default tool strength to 8. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
54e13954e8 Improve land steepness limiting code 2019-10-22 21:25:10 +03:00
Nelsson Huotari
4a2d8aaf97 Handle mBrushSize 1. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
16138fc896 Transient land shape editing 2019-10-22 21:25:10 +03:00
Bret Curtis
262d87846c
Merge pull request #2047 from akortunov/holstered_shield
Shields holstering support
2019-10-22 16:46:12 +02:00
Andrei Kortunov
d3a3b2f1f6 Shields holstering support (feature #5193) 2019-10-22 09:02:59 +04:00
elsid
862f50346c
Add tests for settings parser 2019-10-21 22:47:24 +02:00
Bret Curtis
36119ec2c4
Merge pull request #2562 from Capostrophic/weather
Weather-related fixes (incl. bug #4783)
2019-10-21 21:56:02 +02:00
David Cernat
0206d1813c [General] Modernize packet style for PlayerQuickKeys 2019-10-21 16:55:21 +03:00
David Cernat
4f98d67ed4 [General] Modernize packet style for PlayerJournal 2019-10-21 07:01:36 +03:00
Alexei Dobrohotov
678970b01d
Merge pull request #2565 from elsid/update_recastnavigation
Update recastnavigation
2019-10-21 02:51:28 +03:00
elsid
045ceeac11
Replace foreach macro by for-loop 2019-10-20 20:08:16 +02:00
elsid
07660b5605
Fix detournavigator tests 2019-10-20 18:59:14 +02:00
Alexei Dobrohotov
5d5ec1cf63
Merge pull request #2550 from elsid/fix_path_rebuild
Fix rebuild path for walking actors (Bug #5181)
2019-10-20 16:05:29 +03:00
Capostrophic
fc7b4d73a8 Remove on-strike enchantment support for ranged weapon types (bug #5190) 2019-10-20 13:34:42 +03:00
Alexei Dobrohotov
85a5355e5c
Merge pull request #2563 from akortunov/ammofix
Fix OnStrike bows charges
2019-10-20 11:25:12 +03:00
Andrei Kortunov
dd781b3da2 Fix OnStrike bows charges (regression #5191) 2019-10-20 10:21:47 +04:00
elsid
e4d0af6a6d
Use z coordinate for path distance when diff by z is greater then actor height 2019-10-19 22:01:32 +02:00
Capostrophic
43b1b9dfa2 Weather-related fixes (incl. bug #4783)
Simplify some calculations
Fix Blizzard weather direction
Fix sky direction during storm
2019-10-19 22:47:21 +03:00
elsid
81832f8e17
Reuse distance functions 2019-10-19 12:51:37 +02:00
bzzt
1316816148 fix #5176 2019-10-18 13:37:00 +00:00
Alexei Dobrohotov
dec64a7fba
Fix typos in invalid spell effect warnings, clarify them 2019-10-17 23:45:27 +03:00
David Cernat
1ab5916078 [Client] Reorder RecordHelper's overrideRecord() methods alphabetically 2019-10-17 06:58:56 +03:00
David Cernat
520cedb553 [Client] Use overrideRecord name for related functions in RecordHelper 2019-10-16 18:05:52 +03:00
David Cernat
2fc50d7280 [Client] Fix includes for RecordHelper 2019-10-16 15:34:25 +03:00
David Cernat
aa06056d00 [Client] Add createRecord() function to RecordHelper 2019-10-16 13:14:32 +03:00
David Cernat
13deaa88f2 [Client] Fix typo in code used for setting creature base inventories 2019-10-15 08:49:32 +03:00
David Cernat
835ae816a1 [Client] Use a template to combine RecordHelper's existence checks 2019-10-15 08:47:54 +03:00
David Cernat
17020fc13a [Client] Use a template to combine RecordHelper override functions 2019-10-15 07:21:48 +03:00
Andrei Kortunov
6e6d6d7bda Use forward declaration 2019-10-14 15:40:35 +04:00
Andrei Kortunov
606b73ee96 Use rain settings from openmw.cfg (bug #4262) 2019-10-13 22:32:23 +04:00
David Cernat
d113f81237 [Client] Set correct worldspace for cell overrides in RecordHelper 2019-10-13 13:42:03 +03:00
Capostrophic
bc5d54a161 Fix GetEffect result when running on dead actors 2019-10-12 19:06:10 +03:00
Andrei Kortunov
31e78ed41f Rework 'prevent merchant equipping' feature 2019-10-12 14:17:03 +04:00
David Cernat
02bca3f52d [Client] Fix if check in ObjectList::setMemberShorts() 2019-10-11 21:53:53 +03:00
David Cernat
19418f4953 [Client] Don't ignore entire Actor packet if one actor can't be found 2019-10-11 21:29:21 +03:00
Capostrophic
ce943b4f9e Make enchantments affect all actors with an inventory (bug #5186) 2019-10-11 19:29:12 +03:00
Andrei Kortunov
19e9ece291
Merge pull request #2551 from Capostrophic/onpcequip
Set OnPCEquip properly when a race can't equip an item (bug #5182)
2019-10-11 20:07:35 +04:00
Andrei Kortunov
67bef9a3a1
Merge pull request #2554 from Capostrophic/summon
Make sure summoned creatures are removed upon caster death (#5183)
2019-10-11 20:06:16 +04:00
Alexei Dobrohotov
ccb557edf0
Merge pull request #2552 from akortunov/greeting
Split greetings from AiWander
2019-10-11 02:11:46 +03:00
Alexei Dobrohotov
cdbe58c33a
Merge branch 'master' into windspeed 2019-10-11 02:04:30 +03:00
Andrei Kortunov
2fc819cdae Encode ID's in all places to UTF-8 (bug #3977) 2019-10-10 20:52:32 +04:00
Capostrophic
e9009f8d10 Make sure summoned creatures are removed upon caster death 2019-10-10 17:57:45 +03:00
Nelsson Huotari
78f2a5181d Default brush size to 1 2019-10-10 14:27:22 +03:00
Nelsson Huotari
fbb9800e89 Better terrain texture ID handling 2019-10-10 14:27:22 +03:00
Nelsson Huotari
301c05662b assignment to memb. init. list, publics to private, virtual -> final 2019-10-10 14:27:22 +03:00
Andrei Kortunov
69aceb5c1e Split greetings from AiWander (bug #4594) 2019-10-10 09:28:40 +04:00
Alexei Dobrohotov
b7a1e6561b
Merge pull request #2080 from akortunov/recharge
Recharge items outside of player inventory
2019-10-09 23:37:10 +03:00
David Cernat
d163f1b6da [General] Turn WorldKillCount into a Worldstate packet
Rename the old WorldKillCount that was a Player packet into PlayerPlaceholder. Rename the unused CellCreate that was a Worldstate packet into WorldKillCount. On the server, move kill count-related script functions from QuestFunctions to WorldstateFunctions.
2019-10-08 11:09:08 +03:00
Capostrophic
c718f89325 Set OnPCEquip properly when a race can't equip an item (bug #5182) 2019-10-07 23:38:22 +03:00
Andrei Kortunov
c51aba0b13 Recharge items outside of player's inventory (bug #4077) 2019-10-07 22:59:43 +04:00
elsid
d1d6ba3ed0
Fix rebuild path for walking actors
Ignore z coordinate for not swimming nor flying actors to calculate
distance from actor destination to last path point. If walking actor
destination point is floating above the ground then a point on navmesh
may be too far away when z coordinate is included. In this case path
will be rebuild on each AI_REACTION_TIME.
2019-10-07 20:25:07 +02:00
Andrei Kortunov
f75f9cb337 Use localized faction name when using TFH 2019-10-07 12:14:22 +04:00
David Cernat
4a34666c59 Add OpenMW commits up to 7 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
2019-10-07 08:19:21 +03:00
Andrei Kortunov
f0b73e0a27 Do not store owners for items in container stores (bug #1933) 2019-10-05 17:29:00 +04:00
Andrei Kortunov
2b2f63c919
Merge pull request #2538 from Capostrophic/animation
Use random attack strength if there's no wind up animation (bug #5059)
2019-10-02 08:23:13 +04:00
Alexei Dobrohotov
6f99747fff
Merge pull request #2507 from elsid/door_stuck
Fix actors stuck in closing door (bug #5138)
2019-10-01 22:39:58 +03:00
elsid
7fbc696d44
Change angle direction by rolling dice to avoid rotating door 2019-09-29 13:44:06 +02:00
elsid
6253d2a7ac
Undo door rotation once 2019-09-29 13:42:51 +02:00
Andrei Kortunov
ca46da8b04 Do not stack initially added scripted items (bug #5136) 2019-09-29 13:08:52 +04:00
David Cernat
031acffcbe [General] Implement cell records for RecordDynamic packets, part 1
New interior cells can be now be created that are either blank or based on existing interior cells.
2019-09-28 13:12:48 +03:00
David Cernat
18a7ac5940 [Client] Make it possible to override Cell records in ESMStore 2019-09-28 13:10:43 +03:00
David Cernat
0b85829e38 [Client] Make it possible to unload Cells & clear CellStores from World 2019-09-28 13:09:03 +03:00
Alexei Dobrohotov
e744090339
Merge pull request #2535 from akortunov/activate
Implement vanilla-style AiActivate
2019-09-26 00:42:43 +03:00
Capostrophic
4d381d0804 Use random attack strength if there's no wind up anim (bug #5059) 2019-09-24 22:42:04 +03:00
Andrei Kortunov
e5564df8cb Implement vanilla-style wind speed calculations (bug #4449) 2019-09-24 10:59:58 +04:00
Andrei Kortunov
48aba76ce9 Implement vanilla-style AiActivate (bug #4456) 2019-09-24 09:30:39 +04:00
Capostrophic
421a9d2e50 [Regression] Fix pickpocket crashes 2019-09-23 23:56:37 +03:00
David Cernat
339428872e [Client] Fix infinite loop in CellController
Previously, using CellController::getCellStore() to get an unloaded CellStore would make its references get loaded in the process, with the CellStore's loadRefs() then running updateMergedRefs(), which in turn – before getting as far as setting the CellStore's state to State_Loaded – would call CellController::hasLocalAuthority() on its accompanying ESM::Cell, which would then run CellController::isActiveWorldCell(), which would then run CellController::getCellStore() to get the CellStore again, which – still being marked as unloaded – would run the whole loop again... and again.
2019-09-23 21:18:38 +03:00
David Cernat
d4df2948dd [Client] Use clearer wording for comment in GUIController 2019-09-23 20:30:33 +03:00
David Cernat
219f0cb88e [Client] Fix typo in 56f084c9c0 by using correct function 2019-09-23 07:55:16 +03:00
Andrei Kortunov
b360deaec3 Store raw data about fog of war instead of RGBA images (bug #5108) 2019-09-22 19:59:12 +04:00
Alexei Dobrohotov
ac5491b5c2
Merge pull request #2534 from akortunov/toggleview
Improve resurrection handling
2019-09-22 02:02:03 +03:00
Andrei Kortunov
eb1245664f
Merge pull request #2533 from Capostrophic/levelledlist
Fix chance none logic for nested levelled lists (bug #5169)
2019-09-21 20:58:13 +04:00
Andrei Kortunov
6450d84473 Improve resurrection handling 2019-09-21 20:22:45 +04:00
Andrei Kortunov
0ff8e83a39
Merge pull request #2532 from Assumeru/undefined
Fix undefined behaviour
2019-09-21 18:35:08 +04:00
Evil Eye
3d3ffdfcd8 override eraseStatic for dialogue 2019-09-21 16:24:05 +02:00
Capostrophic
7c9a9d7de0 Fix chance none logic for nested levelled lists (bug #5169) 2019-09-21 14:30:38 +03:00
David Cernat
6828d83a42 [Client] Always hash input for password dialogs
Additionally, clean up repetitive code in GUIController.
2019-09-21 14:26:02 +03:00
David Cernat
3903ac6526 [Server] Add script functions for getting SHA256 hashes & random strings 2019-09-21 14:22:19 +03:00
Alexei Dobrohotov
acc4811d12
Merge branch 'master' into guifixes 2019-09-20 20:03:02 +03:00
okdshin
c15b3377da [General] Add PicoSHA2 hash generator to extern 2019-09-20 10:25:34 +03:00
Andrei Kortunov
7cb6a9c1e9 Do not allow to use quick keys during chargen 2019-09-20 07:27:34 +04:00
Andrei Kortunov
1bddbbcfa0 Check if related menus are allowed when using cycle hotkeys (bug #5167) 2019-09-20 07:27:27 +04:00
Andrei Kortunov
a4d196f33f Force view change when using Force1stPerson and Force3rdPerson commands (bug #5168) 2019-09-19 21:48:43 +04:00
David Cernat
7caa6cd8fe [Client] Prevent ActorAI spam from actors starting combat in scripts 2019-09-19 13:58:01 +03:00
David Cernat
ca21bc35c2 [Server] Add script functions that read & send ScriptGlobalShort packets 2019-09-19 08:46:54 +03:00
David Cernat
cc25612b8d Add OpenMW commits up to 18 Sep 2019
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
2019-09-18 23:46:08 +03:00
Alexei Dobrohotov
fb87778493
Merge branch 'master' into organic-locks 2019-09-18 20:36:40 +03:00
Andrei Kortunov
94a281370f Continue scripts execution after player's death (bug #5166) 2019-09-17 22:40:51 +04:00
Evil Eye
32de86d114 merge master 2019-09-17 20:31:53 +02:00
Evil Eye
7c8b82f45c move locking behaviour to cellref 2019-09-17 20:30:37 +02:00
Andrei Kortunov
85bb4a76f6 Improve faction items handling (bug #5164) 2019-09-17 19:09:08 +04:00
Andrei Kortunov
4a6d2cbaff Do not allow player to take items from evidence chests (bug #3609) 2019-09-17 19:08:33 +04:00
Andrei Kortunov
649a14dfae
Merge branch 'master' into activation 2019-09-16 10:52:16 +04:00
Andrei Kortunov
a7cfe5853c
Merge pull request #2522 from Capostrophic/extradata
Refactor NIF extra data and particle modifier handling
2019-09-16 10:19:49 +04:00
Capostrophic
480000da07 Use Open action as fallback for companion activation (bug #5161) 2019-09-15 23:17:36 +03:00
elsid
209e33f5ce
Open door when it is on the way to a next path point 2019-09-15 21:16:00 +02:00
elsid
653a391084
Do not open doors when actor has no path
When actor is not going anywhere it doesn't require to go through doors
so there is no need to open them.
2019-09-15 21:12:33 +02:00
elsid
d4b7b3e999
Check for AiPackage type before find nearby door 2019-09-15 21:12:29 +02:00
David Cernat
56f084c9c0 [Client] Fix packet spam for repetitive setting of the same global value 2019-09-15 16:10:09 +03:00
David Cernat
ceb16bb6f8 [Client] Reimplement temporary fix from c65d6c1328
The real reason for the crash remains to be fixed.
2019-09-14 19:41:34 +03:00
David Cernat
afa704ce95 [Server] Add OnScriptGlobalShort event 2019-09-14 13:09:01 +03:00
David Cernat
e424bd9bc3 [General] Implement ClientScriptSettings packet, part 2
The packet can now set which client globals get packets sent about them when their values change on clients.
2019-09-14 09:37:19 +03:00
Capostrophic
790531671a Fix tests 2019-09-13 21:29:49 +03:00
Capostrophic
8baddefdbd Refactor extra data and particle modifier handling
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
2019-09-13 20:26:22 +03:00
Evil Eye
85d52ec183 oops 2019-09-11 22:05:24 +02:00
Alexei Dobrohotov
6128279dbf
Merge pull request #2517 from unelsson/terraintextureselection
[Final tests] Editor: Terrain texture selection
2019-09-11 14:09:45 +03:00
Capostrophic
718dbd3f9a Use object ID as the substitution for their name (bug #5158) 2019-09-11 00:06:50 +03:00
Capostrophic
6b74630f6e Preparation work
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
2019-09-10 23:38:16 +03:00
Capostrophic
9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 2019-09-10 22:56:04 +03:00
Evil Eye
a86a8ecc0e Allow locking/picking just about everything 2019-09-10 21:53:26 +02:00
Nelsson Huotari
4ccb951126 move check to outermost scope 2019-09-10 12:15:19 +03:00
Nelsson Huotari
0880923189 Consistency for variable and header argument names. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
6dc3d8b44b More readable code 2019-09-10 12:15:19 +03:00
Nelsson Huotari
780055899d Don't add empty primitive sets to geometry. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
3becacf6d1 Remove globals, const int& -> int, values to const ref. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1dcee833a1 Less verbose syntax 2019-09-10 12:15:19 +03:00
Nelsson Huotari
5a143fe99d Remove extra include 2019-09-10 12:15:19 +03:00
Nelsson Huotari
39ab449431 Only allow selection of cells in view 2019-09-10 12:15:19 +03:00
Nelsson Huotari
dc8de6c6e6 Make less copies 2019-09-10 12:15:19 +03:00
Nelsson Huotari
001ca68cc7 Remove empty lines 2019-09-10 12:15:19 +03:00
Nelsson Huotari
46ee639892 pass by const ref and other fixes 2019-09-10 12:15:19 +03:00
Nelsson Huotari
20ab7df19f Fixes, cleanup. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1a08944a8b Remove unused code, clarifications, optimizations 2019-09-10 12:15:19 +03:00
Nelsson Huotari
d6722c7492 Terrain texture selection, support for vertex selection 2019-09-10 12:15:19 +03:00
Evil Eye
56b6a7ada4 Fix #5155 2019-09-09 22:29:59 +02:00
David Cernat
3acfbad55d [General] Implement ClientScriptSettings packet, part 1
For starters, the new packet can set which client scripts have all of their variables synchronized between players. The previous hardcoded list of IDs for synchronized scripts has been removed.
2019-09-09 10:28:35 +03:00
David Cernat
25e27ccb95 [General] Use placeholder packet ID for unused CellCreate packet 2019-09-09 10:22:20 +03:00
Andrei Kortunov
d58f93f388 Use sayDone() only for scripting backward compatibility 2019-09-06 09:19:41 +04:00
David Cernat
ca67587b89 Add OpenMW commits up to 5 Sep 2019
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-09-05 21:41:50 +03:00
Andrei Kortunov
c9deb1b325 Generate sCrimeMessageReport only once per frame (bug #5012) 2019-09-05 20:16:03 +04:00
Andrei Kortunov
58be8dc976
Merge pull request #2513 from Capostrophic/crime
Make sure failed pick/trap attempts are a crime (bug #5149)
2019-09-05 18:51:16 +04:00
Capostrophic
c89c14bb68 Rename objectOpened() to make its role more clear 2019-09-05 17:36:49 +03:00
Capostrophic
8317dc0709 Make sure failed pick/trap attempts are a crime (bug #5149) 2019-09-05 17:29:49 +03:00
James Stephens
bafbc0a055 Cancel door sound if collision is detected and the sound is playing 2019-09-05 07:49:53 +00:00
Alexei Dobrohotov
2daecc633e
Revert Vampirism behavior upon death to 0.45.0-like state
Until we figure out the better way to handle vampire stuff tangled together with post-death animation magic effect reset.
2019-09-04 16:42:34 +03:00
David Cernat
190c404b38 [Client] Calculate spell success in more appropriate place
Previously, creatures with fast spellcasting animations would cast their spells before their success had actually been calculated, causing them to fail.
2019-09-02 23:50:56 +03:00
James Stephens
7d3f6e1cd9 Altered process so that cost only appears on spell purchase window.
Added myself to authors
2019-09-02 17:18:56 +00:00
James Stephens
b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 2019-09-02 17:13:56 +00:00
James Stephens
1cd1bfca74 Fixes bug #4650 2019-09-02 16:49:29 +02:00
David Cernat
95967ea289 [General] Rename unused ObjectReset packet into ObjectHit 2019-09-01 08:30:03 +03:00
David Cernat
6dccdfe0c1 [Client] Load up TES3MP's settings in the same map as OpenMW's settings
This allows the "font size" property to be read when the chat window is created.
2019-08-28 06:37:33 +03:00
Andrei Kortunov
b6044d231a Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146) 2019-08-27 22:42:41 +04:00
David Cernat
3a1e3cf0f5 [Client] Prevent chat key from switching to chat window while in console 2019-08-27 15:23:12 +03:00
David Cernat
a9f1481e5c [Client] Revert changes to key focus setting as per 56539fee4f 2019-08-27 15:22:11 +03:00
David Cernat
a52d32602d [Client] Fix code style in PlayerList 2019-08-27 09:29:43 +03:00
Andrei Kortunov
84b3aaedaa
Merge pull request #2506 from akortunov/refactor
Rename getWeaponPart() function
2019-08-27 10:05:44 +04:00
Andrei Kortunov
c059bf04cc Rename getWeaponPart() function 2019-08-27 09:55:02 +04:00
David Cernat
3e1c96a49c [Client] Fix crash by not trying to enable markers for invalid players 2019-08-26 21:10:02 +03:00
David Cernat
78a9a428a6 [Client] Remove unnecessary mwmp::Main::pressedKey() function
Additionally, add comment around where it was originally used.
2019-08-26 15:41:45 +03:00
David Cernat
e0f623fb87 [Client] Move check for preventing auto equipping to correct spot 2019-08-26 15:39:56 +03:00
David Cernat
e15428e139 [General] Remove "created by" stamps added by IntelliJ 2019-08-26 12:33:28 +03:00
elsid
16170131b7
Add enum type for door state 2019-08-25 15:21:00 +02:00
David Cernat
9350e1d484 [General] Split up Attack packets into Attack and Cast ones
Create an entirely new PlayerCast packet for that purpose, but rename the already existing but unused ActorInteraction into ActorCast.
2019-08-25 09:35:23 +03:00
Alexei Dobrohotov
43a58e181f
Merge pull request #2455 from Capostrophic/input
Revert questionable input manager decisions
2019-08-24 15:02:50 +03:00
David Cernat
353e7d530a Add OpenMW commits up to 18 Aug 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-22 22:44:00 +03:00
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
2019-08-22 15:38:15 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
2019-08-22 08:40:32 +03:00
David Cernat
f671c0bddc Add OpenMW commits up to 1 Apr 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
2019-08-21 23:54:39 +03:00
David Cernat
8729c3c5e3 Add OpenMW commits up to 9 Mar 2019
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
2019-08-21 19:04:04 +03:00
David Cernat
95a5607509 Add OpenMW commits up to 22 Feb 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
2019-08-21 17:29:24 +03:00
David Cernat
6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
2019-08-21 15:48:07 +03:00
David Cernat
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-21 14:37:54 +03:00
David Cernat
68886e7539 Add OpenMW commits up to 2 Dec 2018
# Conflicts:
#	.travis.yml
#	README.md
2019-08-21 13:08:56 +03:00
David Cernat
cbba81df03 Add OpenMW commits up to 14 Nov 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
2019-08-21 09:04:36 +03:00
David Cernat
3efffe92e3 Add OpenMW commits up to 5 Nov 2018
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
2019-08-21 05:08:50 +03:00
David Cernat
fba07194cf Add OpenMW commits up to 29 Oct 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-20 13:15:00 +03:00
David Cernat
056591b957 Add OpenMW commits up to 14 Sep 2018
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-20 12:14:57 +03:00
David Cernat
889bcec7f8 Add OpenMW commits up to 1 Sep 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/difficultyscaling.cpp
#	apps/openmw/mwscript/transformationextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-20 11:31:51 +03:00
David Cernat
84cab59057 Add OpenMW commits up to 19 Aug 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
2019-08-20 10:06:15 +03:00
David Cernat
0339958e21 [General] Rename Log class into TimedLog 2019-08-19 21:39:33 +03:00
Andrei Kortunov
bd18655d23
Merge pull request #2439 from Capostrophic/jumping
Fix jumping mechanics framerate dependency (bug #4991)
2019-08-18 10:57:11 +04:00
Andrei Kortunov
b58c632c20
Merge pull request #2502 from akortunov/master
Optimize custom bones search visitor
2019-08-18 10:36:01 +04:00
Andrei Kortunov
fe71ce9cb2 Optimize custom bones search visitor 2019-08-18 10:30:21 +04:00
Andrei Kortunov
ed8828d3bc
Merge pull request #2457 from Capostrophic/sneak
Sneaking consistency fixes (bug #5103)
2019-08-18 08:57:22 +04:00
Andrei Kortunov
661d11c83e
Merge pull request #2465 from Capostrophic/duration
Human-readable light source duration (feature #5091)
2019-08-18 08:43:51 +04:00
Andrei Kortunov
d0bc06b849
Merge pull request #2438 from Capostrophic/camera
Rewrite messed up playerlooking switch handling (bug #5078)
2019-08-17 23:15:21 +04:00
capostrophic
e5331aab28 Escape number signs in object names for tooltips 2019-08-17 21:53:52 +03:00
elsid
ad05de44ae
Use 3d coordinates to detect stuck
To able water and flying creatures move to player going up or down.
2019-08-17 18:09:00 +02:00
elsid
7b94183d83
Revert "Take in account actor half extents for obstacle check"
This reverts commit 5434e92437.
2019-08-17 17:55:49 +02:00
Andrei Kortunov
f7917964a0
Merge pull request #2484 from Capostrophic/fallbackanim
Allow SwimRunForward state WalkForward fallback (bug #5126)
2019-08-17 12:45:25 +04:00
Andrei Kortunov
ca724d45a1
Merge pull request #2498 from akortunov/master
[Regression] inject bones for NPC's with custom animation models
2019-08-17 12:21:34 +04:00
Andrei Kortunov
6156ab45de [Regression] inject bones for NPC's with custom animation models 2019-08-17 12:17:13 +04:00
Alexei Dobrohotov
1eac6f67db
Merge pull request #2496 from Capostrophic/reverb
Change the default reverb preset to improve underwater FX transition
2019-08-17 00:29:29 +03:00
Andrei Kortunov
0afb142b8e [Regression] restore ammo inventory sounds 2019-08-16 21:56:14 +04:00
capostrophic
99710e8f55 Allow SwimRunForward state WalkForward fallback (bug #5126) 2019-08-16 20:46:22 +03:00
Andrei Kortunov
786a6c6d42 Use a common doors rotation code in the "lock" command handler 2019-08-16 21:30:24 +04:00
capostrophic
f779529cab Change the default reverb preset to improve underwater FX transition 2019-08-16 17:37:38 +03:00
David Cernat
ab93b5ddc5 [General] Use PlayerItemUse packets when using items through quick keys 2019-08-16 05:50:07 +03:00
elsid
4d86bf3bf2
Update rotated world objects in navigator 2019-08-15 18:19:19 +02:00
David Cernat
ae5200cbb2 [General] Implement light records for RecordDynamic packets 2019-08-14 21:10:53 +03:00
Alexei Dobrohotov
17991164e4
Merge pull request #2489 from ArgonianAccount/class-quiz
Class quiz fixes
2019-08-13 21:47:30 +03:00
David Cernat
6160293e86 [Client] Don't clear placeholder summons in CastSpell::inflict() 2019-08-12 15:12:34 +03:00
Andrei Kortunov
deeccb2783
Merge pull request #2461 from Capostrophic/geteffect
Use up-to-date magic effects for GetEffect (bug #3894)
2019-08-11 22:20:20 +04:00
ArgonianAccount
53facf7baa Class quiz fixes 2019-08-12 00:54:02 +12:00
Alexei Dobrohotov
e10bbea7c0
Revert 3.4-breaking 8b1ed6c 2019-08-11 12:07:49 +03:00
Alexei Dobrohotov
5640a305e2
Merge pull request #2487 from akortunov/arrows
Corrections for extended weapon animations feature
2019-08-10 20:00:34 +03:00
Andrei Kortunov
6019f6507d Corrections for extended weapon animations feature 2019-08-10 20:57:37 +04:00
Julien Valentin
8b1ed6c357
fix Sunglare bug with osg 3.6 2019-08-10 18:28:03 +02:00
Andrei Kortunov
1f7d2f8da0 Revert "Do not use a separate GlowUpdater for every arrow in quiver"
This reverts commit b7c214b1bc.
2019-08-09 21:38:03 +04:00
Andrei Kortunov
b09f0f8c2d
Merge pull request #2458 from Capostrophic/jump
Don't "jump" with 0 vertical velocity in all cases (bug #5106)
2019-08-09 21:03:24 +04:00
Alexei Dobrohotov
307e9ba666
Merge pull request #2413 from akortunov/weapon
Refactor weapon types behaviour
2019-08-09 20:02:10 +03:00
capostrophic
26f59e47db Improve readability 2019-08-09 19:56:21 +03:00
capostrophic
a9c4b18d38 Make sure cast chance checks mana when necessary (bug #5112) 2019-08-09 19:27:25 +03:00
Andrei Kortunov
134631ad72
Merge pull request #2463 from Capostrophic/crit
Vanilla-friendly ranged crits (bug #5067)
2019-08-09 20:23:56 +04:00
Andrei Kortunov
fcd6e915d4 Fallback for long animation groups 2019-08-09 19:40:30 +04:00
Andrei Kortunov
123ca175c8 Fallback for short weapon groups 2019-08-09 19:40:30 +04:00
Andrei Kortunov
afaff8231d Use the Weapon Bone as fallback 2019-08-09 19:40:30 +04:00
Andrei Kortunov
f0cef772fa Refactor weapon types behaviour
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
2019-08-09 19:40:27 +04:00
Andrei Kortunov
07cf93f4db Update weapon state when we cancel attack animation (bug #5124) 2019-08-09 09:17:36 +04:00
David Cernat
1d09763bad [Client] Allow blanking out the enchantment IDs of records using a base 2019-08-08 08:05:10 +03:00
Alexei Dobrohotov
ed364a1e29
Merge pull request #2476 from akortunov/arrows
Use magic glow for enchanted arrows
2019-08-07 17:32:38 +03:00
Andrei Kortunov
b7c214b1bc Do not use a separate GlowUpdater for every arrow in quiver 2019-08-07 12:58:18 +04:00
Andrei Kortunov
8557346fbd Use glow for enchanted arrows (feature #5122) 2019-08-07 12:58:14 +04:00
unknown
2a53f6bc3e Merge branch 'master' of https://github.com/OpenMW/openmw into script-respawn 2019-08-07 10:56:21 +02:00
David Cernat
14af0be657 [General] Include AI alarm & flee for creatures/NPCs in RecordDynamic 2019-08-07 11:21:22 +03:00
David Cernat
ef432d1419 [General] Include AI services for creatures/NPCs in RecordDynamic 2019-08-07 10:44:07 +03:00
Andrei Kortunov
1eed511b4e Use enchanted glow for pulled arrows 2019-08-07 09:45:10 +04:00
Andrei Kortunov
4c92f0c4e1 Move getEnchantmentColor() from Animation to Class 2019-08-07 08:51:46 +04:00
unknown
6baa5da6c9 Fix scripts not executing on respawn 2019-08-06 21:30:21 +02:00
Andrei Kortunov
06ba80e19b
Merge pull request #2469 from Capostrophic/instant
Apply instant effects of permanent spells in AddSpell immediately (bug #5055)
2019-08-06 07:57:18 +04:00
capostrophic
cac05ef826 Sneaking consistency fixes (bug #5103)
Correct pickpocketing behavior when not actually sneaking
Fix first person swimming animation regression when sneaking stance is on
Move typical sneaking use case checks into mechanics manager
Correct awareness checks
2019-08-05 20:22:03 +03:00
Andrei Kortunov
ad8b10c8db
Merge pull request #2464 from Capostrophic/enchant
Ignore on-strike enchanted projectile charge (#5104)
2019-08-05 11:32:16 +04:00
David Cernat
18e2a14645 [General] Implement tool-related records for RecordDynamic packets 2019-08-04 17:53:18 +03:00
capostrophic
6928adcee1 Prevent front() and operator[] from causing undefined behavior 2019-08-04 14:47:33 +03:00
Alexei Dobrohotov
4d4a21ff09
Merge pull request #2460 from Capostrophic/swim
Don't force-trace down swimming actors (bug #5089)
2019-08-03 23:23:12 +03:00
Alexei Dobrohotov
b3fe85fb6d
Merge pull request #2324 from elsid/aiwander_navmesh
Use navmesh for AiWander
2019-08-03 23:11:18 +03:00
Alex Rice
e7ae7a8ca6 Allow user controller bindings 2019-08-03 19:55:58 +00:00
elsid
6c46d929c2
Build path to first pathgrid node by navmesh 2019-08-03 16:10:55 +02:00
elsid
f684c90932
Make angular velocity depending on actor speed
To avoid moving in circles for actors with high speed.
2019-08-03 16:06:04 +02:00
David Cernat
4100d93dea [General] Implement ingredient records for RecordDynamic packets 2019-08-03 06:19:22 +03:00
capostrophic
82ac99ec56 Apply instant FX in AddSpell immediately (bug #5055) 2019-08-02 21:26:47 +03:00
capostrophic
f8c07ca9dc Don't "jump" with 0 vertical velocity in all cases (bug #5106) 2019-08-02 18:16:47 +03:00
capostrophic
e9c71a3808 Ignore on-strike enchanted projectile charge (#5104) 2019-08-02 18:15:27 +03:00
capostrophic
ff133bd740 Don't clamp final actor fight rating to 0 (bug #5105)
Fix werewolf aggro distance
2019-08-02 18:11:48 +03:00
David Cernat
300cef0073 [Server] Allow setting of container record flags in SetRecordFlags() 2019-08-01 21:28:03 +03:00
Alexei Dobrohotov
3f2b63122d
Merge pull request #2467 from Capostrophic/stream
[Regression] Editor: Avoid locale-related settings parsing issues
2019-08-01 20:39:06 +03:00
elsid
4ad04a28f9
Reset path after AiTravel is fast forwarded
Otherwise actor will keep going to the first path point that may be
unreachable.
2019-08-01 15:13:03 +02:00
David Cernat
0189d19d14 [Server] Clear new types of records in ClearRecords() 2019-08-01 15:47:13 +03:00
Artem Nykolenko
610e87cb24 Fix Non-swimming enemies entering water if player is water walking (bug #5099) 2019-08-01 10:02:35 +00:00
Andrei Kortunov
264a769827
Merge pull request #2466 from Capostrophic/doll
[Regression] Avoid confusing inventory doll with player in non-uniform scaling
2019-08-01 13:10:40 +04:00
capostrophic
5341ca4e22 [Regression] Avoid locale-related conversion issues in editor 2019-08-01 11:47:31 +03:00
David Cernat
247d2fad30 [General] Implement activator & static records for RecordDynamic packets 2019-08-01 09:48:57 +03:00
capostrophic
2affb8ed63 Human-readable light source duration (feature #5091) 2019-07-31 21:37:20 +03:00
Alexei Dobrohotov
1a2f51ef6f
Merge pull request #2415 from Assumeru/unix-console
Unix console hotkeys
2019-07-31 21:34:09 +03:00
capostrophic
dcbe76d888 [Regression] Avoid confusing inventory doll with player 2019-07-31 17:34:32 +03:00
capostrophic
e2496af5c5 Vanilla-friendly ranged crits (bug #5067) 2019-07-31 13:55:09 +03:00
capostrophic
e7ec27e45d Use up-to-date magic effects for GetEffect (bug #3894) 2019-07-31 01:06:06 +03:00
capostrophic
6fe429c4e8 Don't force-trace down swimming actors (bug #5089) 2019-07-31 00:45:54 +03:00
capostrophic
15bf05215e Revert questionable input manager decisions
Remove Options Menu shortcut
Revert to more pleasant 0.45.0 Escape behavior
Re-enable keyboard GUI arrow conversion feature
Remove gamepad button release handling
2019-07-30 19:48:46 +03:00
Capostrophic
4e54ed86b3 Fix jumping mechanics framerate dependency (bug #4991) 2019-07-29 15:45:57 +03:00
Capostrophic
0b074f2211 Rewrite messed up playerlooking switch handling (bug #5078) 2019-07-29 15:44:17 +03:00
David Cernat
e9336e53fc [General] Implement container and door records for RecordDynamic packets 2019-07-27 03:45:50 +03:00
Alexei Dobrohotov
facbb2e0db
[Regression] Make sure unloaded objects can be opened 2019-07-20 00:12:05 +03:00
Chris Djali
576285573b
Merge pull request #2404 from Capostrophic/framerate
Make framerate limit configurable in the launcher
2019-07-19 16:16:20 +01:00
Andrei Kortunov
69277b52d0
Merge pull request #2451 from Capostrophic/sounds
Fix combat sound inconsistencies (bugs #5092, #5093)
2019-07-19 08:03:33 +04:00
Artem Nykolenko
d996b565a5 Improve character window resizing (bug #4276) 2019-07-17 00:44:36 -04:00
Alexei Dobrohotov
29ebfe709e
Play 'Hand To Hand Hit' only for fatigue damage (bug #5093) 2019-07-14 23:56:38 +03:00
Alexei Dobrohotov
65ee420ab9
Only play on-strike failure sound on the player (bug #5092) 2019-07-14 23:42:42 +03:00
David Cernat
57f84914c3 [Client] Prevent permanent deletion of player markers on cell changes 2019-07-14 22:42:55 +03:00
Alexei Dobrohotov
366906ac51
Fix paralyzed actors' death animations 2019-07-12 12:31:10 +03:00
David Cernat
48ebdb38c7 [Client] Set LocalPlayer's killer for damage over time spell effects
Simplify related code that sets LocalActors' killers for damage over time spell effects.
2019-07-06 14:44:04 +03:00
nalal
7316c8aafd
Added functionality for TES3MP server to catch system signals
This should permit the TES3MP server to catch when a "SIGTERM"(Standard program stop) or "SIGINT"(Ctrl+C) is sent to the process and allow that to initiate the standard shutdown procedure by halting the networking loop peacefully.
2019-07-06 04:03:50 -07:00
Axel Vestin
c0f66ac70c Fixes Albemic typo in OpenMW-CS 2019-07-06 00:13:30 +02:00
jeremy
962462c1c5 Removed unnecessary calls to stopSound3D
playSound3D (the one taking a ptr) already stops the sound if it's playing.
2019-07-04 22:54:39 +02:00
jeremy
c8c06ceee9 Fixed SoundManager::stopSound when output is not initialized (bug #4600 probably) 2019-07-04 22:48:33 +02:00
Evil Eye
cb4664b31b Remove arrow key behaviour as it's in MyGUI now 2019-07-03 22:38:07 +02:00
Evil Eye
405c556ce9 Merge branch 'master' of https://github.com/OpenMW/openmw into unix-console 2019-07-03 21:58:06 +02:00
Nat Meo
bcc5142b32 Issue #4202: Open .omwaddon files without needing to open openmw-cs first. 2019-07-02 16:07:38 +00:00
Justin Ivany
643f259cbf Adding option for cursor speed when using gamepad 2019-07-02 11:19:10 +00:00
Nat Meo
af1e5e01b4 Issue #5005: Instance window via Scene window 2019-07-01 23:26:05 +00:00
Justin Ivany
49f2615d2b Fix scrolling with controller on gui 2019-07-01 17:32:20 -03:00
David Cernat
94a9292cc6 [Client] Use correct index when unassigning quickkeys from WindowManager 2019-07-01 13:48:45 +03:00
Alexei Dobrohotov
9dfee1dfe2
Fix invisibility/chameleon alpha (thanks Hrnchamd) 2019-06-30 16:13:11 +03:00
Alexei Dobrohotov
19dc01232c
Fix CenterOnCell target rotation 2019-06-30 16:03:24 +03:00
Capostrophic
b8afe14206 Disallow paralyzed actors to greet the player (bug #5074) 2019-06-29 13:31:36 +03:00
Andrei Kortunov
633b8e26ad
Merge pull request #2436 from Capostrophic/enchanting
Correct cast style behavior when there's no item picked (bug #5075)
2019-06-29 13:01:13 +04:00
Capostrophic
cbb22f0f63 Correct cast style behavior when there's no object (bug #5075) 2019-06-28 15:52:37 +03:00
Capostrophic
453068cc7d Disallow actors to start combat with themselves (bug #3550)
Allow creatures to play initial attack dialogue
Don't add combat package to dead actors
2019-06-27 19:50:54 +03:00
Alexei Dobrohotov
3cbe4ab85d
Fix idlestorm blend mask (bugs #4240, #5071) 2019-06-22 23:05:20 +03:00
Capostrophic
9502e9f3f7 Disable FPS limit spinbox by default and set the maximum to 1000
Make window border and framerate limit labels consistent with other labels
2019-06-22 18:15:19 +03:00
Capostrophic
b87b29eeb0 Make framerate limit configurable in the launcher 2019-06-22 18:15:19 +03:00
Andrei Kortunov
b9a1e4d796
Merge pull request #2425 from Capostrophic/esm
Signedness fixes
2019-06-21 10:01:10 +04:00
Capostrophic
df89c6b6ce Make unarmed creature attacks affect shield condition again (bug #5069) 2019-06-20 20:45:52 +03:00
David Cernat
77952440f6 [Client] Clean up handling of draw states 2019-06-19 08:24:53 +03:00
Capostrophic
3aa65273c5 Signedness fixes 2019-06-18 14:47:10 +03:00
David Cernat
301fff7fe5 [Client] Always allow spellcasting from dedicated players and actors 2019-06-17 04:21:43 +03:00
Alexander Perepechko
19b0b056e5 Remove spell FX and VFX after playing the death animation (bug #5060) 2019-06-13 21:42:25 +00:00
Andrei Kortunov
4fcbc1c96b
Merge pull request #2391 from Capostrophic/contentselector
Content selector: don't add file namesakes (bug #2395)
2019-06-10 10:15:19 +04:00
Andrei Kortunov
dcf03f6785
Merge pull request #2416 from Capostrophic/cast
Make Player->Cast select the spell instead (bug #5056)
2019-06-10 09:39:23 +04:00
Andrei Kortunov
a62b6910ba
Merge pull request #2411 from Capostrophic/fader
Make sure fade operations properly end (bug #4639)
2019-06-10 08:58:26 +04:00
Capostrophic
56539fee4f Partially revert "Get rid of redundant setKeyFocusWidget() method" 2019-06-09 02:12:44 +03:00
David Cernat
01804af100 [Client] Add updateInventoryWindow() method to LocalPlayer 2019-06-09 01:00:01 +03:00
David Cernat
49fa35a516 [Client] Use ObjectActivate packets when picking up items from inventory 2019-06-09 01:00:01 +03:00
Capostrophic
295ee11063 Make Player->Cast select the spell instead (bug #5056) 2019-06-08 17:08:39 +03:00
Alexei Dobrohotov
ef2a7160fa
Fix automovement toggling on "joystick used" flag 2019-06-08 15:06:04 +03:00
Evil Eye
67fb19c2b9 fix deletion when not at end of line and implement ^LEFT and ^RIGHT 2019-06-07 18:41:35 +02:00
Evil Eye
4aca8240e5 implement ^W and ^U in the console 2019-06-06 22:09:54 +02:00
Capostrophic
596dbbe70b Make sure fade operations properly end (bug #4639) 2019-06-06 12:25:01 +03:00
Alexei Dobrohotov
61db93e7da
Merge pull request #2407 from akortunov/scrollbars
Add separate textures for scrollbars
2019-06-06 09:09:55 +03:00
Capostrophic
25e52f7dfe Use 2D distance for fight rating of vertically moving actors (bug #4961) 2019-06-05 21:41:02 +03:00
Andrei Kortunov
a02f730a77
Merge pull request #2406 from Capostrophic/invalid
Erase effects with invalid indices from spells (bug #5050)
2019-06-03 09:21:11 +04:00
Andrei Kortunov
08716ed330
Merge pull request #2409 from Capostrophic/input
Correct always run behavior when both a gamepad and a keyboard are used
2019-06-03 08:18:46 +04:00
Capostrophic
b7afb213ae "Handle" RepairedOnMe scripting function (feature #4255) 2019-06-03 02:17:32 +03:00
Capostrophic
70635ed1e2 Correct always run behavior when both a gamepad and a keyboard are used 2019-06-02 22:57:31 +03:00
Capostrophic
d98a90194b Erase effects with invalid indices from spells (bug #5050) 2019-06-02 14:56:39 +03:00
Andrei Kortunov
2436652181
Merge pull request #2405 from Capostrophic/idlestorm
Improve face shielding behavior in general case (bug #4240)
2019-06-02 08:41:32 +04:00
Andrei Kortunov
34fe896f4e
Merge pull request #2400 from Capostrophic/colorcode
Escape number signs in cell/region names (bug #5047)
2019-06-02 08:06:40 +04:00
Alexei Dobrohotov
8ebecb7584 Merge branch '7' into 'master'
fixes pitch black ripples in shadow

See merge request OpenMW/openmw!123
2019-06-01 12:13:14 +00:00
Andrei Kortunov
ae935a8084 Add separate textures for scrollbars (feature #5051) 2019-06-01 16:12:03 +04:00
Capostrophic
5cd781b3eb Experimental folder handling rewrite 2019-05-31 20:01:46 +03:00
Alexei Dobrohotov
58f8d1ac04
Merge pull request #2402 from akortunov/console
Make console to do not hide other GUI windows
2019-05-30 13:41:00 +03:00
Capostrophic
e7208bb80e Improve face shielding behavior in general case (bug #4240) 2019-05-30 12:16:25 +03:00
Andrei Kortunov
792fbfe2e1 Fix type in the preprocessor directive 2019-05-30 09:19:33 +04:00
bzzt
403171e083 fixes pitch black ripples in shadow 2019-05-29 13:37:00 +00:00
Andrei Kortunov
1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 2019-05-29 17:10:57 +04:00
Alexei Dobrohotov
44a07efc27
Fix trapped soul object verifier warning 2019-05-29 02:54:19 +03:00
Capostrophic
9a19af5b33 Escape number signs in cell/region names (bug #5047) 2019-05-28 23:02:30 +03:00
Andrei Kortunov
4d292425b3
Merge pull request #2398 from Capostrophic/saydone
Make SayDone return 1 on the frame speech is started (bug #4879)
2019-05-28 22:55:07 +04:00
Andrei Kortunov
f9143decc9
Merge pull request #2397 from Capostrophic/gamepad
Analogue movement fixes
2019-05-28 22:45:42 +04:00
Capostrophic
e095d51999 More queue handling adjustments 2019-05-26 19:23:42 +03:00
Capostrophic
c975dab7c3 Update say sound queue explicitly once per frame 2019-05-26 18:46:53 +03:00
Capostrophic
4c2b694b29 Make SayDone return 1 on the frame speech is started (bug #4879) 2019-05-26 18:00:50 +03:00
Alexei Dobrohotov
e0fb411fc8 Merge branch '2' into 'master'
stop making new reflacttetures at intext change

See merge request OpenMW/openmw!116
2019-05-24 14:08:09 +00:00
bzzt
6c310c64d2 stop making new reflacttetures at intext change 2019-05-24 13:37:00 +00:00
Capostrophic
f271ac255d Avoid conflicts between gamepad movement and always run setting 2019-05-24 12:50:16 +03:00
Capostrophic
40c1db32bd Apply analogue speed mult to fatigue loss 2019-05-24 12:50:16 +03:00
Andrei Kortunov
fae5843347 Setup the ICO settings only once instead of every loading (bug #5025) 2019-05-24 08:04:20 +04:00
Andrei Kortunov
ab03b9ac1c Do not sort the Land store every savegame load - it is static anyway (bug #4844) 2019-05-24 08:04:20 +04:00
Andrei Kortunov
57176ff8d4 Unload viewer and stop background jobs before resources unloading 2019-05-24 08:03:45 +04:00
David Cernat
f29bfb6b8e [Client] Add debug for received kill counts 2019-05-22 23:20:44 +03:00
David Cernat
4d40df3ea8 [Server] Don't automatically send kill count packets to other players
This should be handled in server scripts instead so that servers with respawning NPCs can be have kills shared across parties and witnesses instead of shared across all players on the server.
2019-05-22 22:13:42 +03:00
Alexei Dobrohotov
7c46102f0c
Merge pull request #2389 from akortunov/fmt
Introduce a custom format() function
2019-05-21 21:45:52 +03:00
Alexei Dobrohotov
54ee08cb75
Merge pull request #2396 from akortunov/master
Remove BOM from CPP files
2019-05-21 21:22:34 +03:00
Andrei Kortunov
6832a2fa9a Remove BOM from CPP files (allows to build OpenMW with LCC on Elbrus) 2019-05-21 19:22:34 +04:00
David Cernat
abc4090a0f [Client] Fix loop in ActiveSpells::getEffectDuration() 2019-05-20 23:09:54 +03:00
Andrei Kortunov
e679190f31 Introduce a custom format() function to get rid of boost::format() and hackish replace() 2019-05-20 09:20:01 +04:00
Alexei Dobrohotov
0ee73d89f0
Correct selling prices of creature merchants 2019-05-19 23:43:40 +03:00
Alexei Dobrohotov
c66ddea429
Merge pull request #2392 from akortunov/guifixes
Get ride of some redundant GUI stuff
2019-05-18 19:05:01 +03:00
Andrei Kortunov
add3b9dcea
Merge pull request #2390 from Capostrophic/launcher
Launcher: Clone content list button (feature #4784)
2019-05-18 09:04:50 +04:00
Andrei Kortunov
faf940546b Get rid of redundant setKeyFocusWidget() method 2019-05-17 19:09:40 +04:00
Andrei Kortunov
675be20a0f Get rid of redundant ControllerRepeatClick class 2019-05-17 10:49:00 +04:00
Andrei Kortunov
ac8fa54e6e Get rid of redundant MWScroll class 2019-05-17 10:23:34 +04:00
Capostrophic
3f73766304 Make enchanting make more sense (bug #5038) 2019-05-15 18:40:52 +03:00
Capostrophic
686049679c Launcher: Clone content list button (feature #4784) 2019-05-15 18:17:57 +03:00
Andrei Kortunov
7023e86d19
Merge pull request #2388 from Capostrophic/animation
Hardcode the correct first person sneaking anim speed (bug #4787)
2019-05-15 09:02:53 +04:00
Andrei Kortunov
316c79fecd
Merge pull request #2387 from Capostrophic/spells
Don't break GetSpellEffects execution if the spell doesn't exist
2019-05-15 08:55:54 +04:00
Andrei Kortunov
6bf5960b96
Merge pull request #2386 from Capostrophic/waiting
Exit waiting at the correct time when the player is in air
2019-05-15 08:44:47 +04:00
Capostrophic
1de984364a Hardcode the correct first person sneaking anim speed (bug #4787) 2019-05-15 01:46:55 +03:00
Alexei Dobrohotov
3d3e9f373c
Merge pull request #2384 from akortunov/ranks
Fix RaiseRank/LowerRank script functions
2019-05-15 01:42:59 +03:00
Capostrophic
5f7343ad7f Don't break GetSpellEffects execution if the spell doesn't exist 2019-05-14 21:24:03 +03:00
Andrei Kortunov
f775f7977b Fix RaiseRank/LowerRank script functions (feature #4316) 2019-05-14 21:43:19 +04:00
Capostrophic
272df29a12 Exit waiting at the correct time when the player is in air 2019-05-14 20:38:41 +03:00
Capostrophic
485ed903c4 Enchanting window stays open after a failed attempt (feature #5034) 2019-05-14 17:16:37 +03:00
Andrei Kortunov
a79955352f Revert MR !103 and !105 since they cause issues with dialogue window 2019-05-14 14:22:54 +04:00
Andrei Kortunov
55767eaf7e
Merge pull request #2380 from Capostrophic/faction
Allow scripted faction leaving using PCLowerRank (feature #5036)
2019-05-13 21:21:47 +04:00
Andrei Kortunov
27737d4258 Fix an exception during reload when container windows is active.
It is a regression in the animated containers feature.
2019-05-13 17:59:32 +04:00
Alexei Dobrohotov
bb0c989f87
Clear expelled status when leaving faction 2019-05-13 10:22:03 +03:00
Alexei Dobrohotov
d37cb871d6
Fix last-minute typo 2019-05-13 09:50:32 +03:00
Capostrophic
555e43855d Allow scripted faction leaving using PCLowerRank (feature #5036) 2019-05-12 20:57:54 +03:00
David Cernat
023ead937f [Server] Fix stack overflows by preventing infinite growth in Lua stack 2019-05-12 01:58:18 +03:00
David Cernat
6322ae081d [Server] Add extern to folders used to search for include files 2019-05-12 01:54:28 +03:00
Capostrophic
144b1b9b06 Magic armor mitigation for creatures (feature #5033) 2019-05-11 19:21:49 +03:00
Capostrophic
c67eb6d9db Drop bogus accounting for armor rating from weapon priority 2019-05-11 19:06:45 +03:00
Alexei Dobrohotov
4a5e2d1d4e
Merge pull request #2281 from akortunov/shaders
Minor water shader fixes
2019-05-11 18:07:58 +03:00
Capostrophic
62482657fc GetWeaponType returns -2 for picks and -3 for probes (feature #5031) 2019-05-11 14:18:29 +03:00
Alexei Dobrohotov
0cea76c684
Merge pull request #2375 from akortunov/warnfix
Do not copy pointers during iteration
2019-05-11 14:10:01 +03:00
Andrei Kortunov
ef4042703d
Merge pull request #2373 from Capostrophic/barter
Make offered price caps barter-specific (bug #5028)
2019-05-11 15:05:41 +04:00
Andrei Kortunov
9ba6f5f36c Do not copy pointers during iteration 2019-05-11 09:44:30 +04:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map
Do not re-render maps for all active cells during cell transitions
2019-05-11 02:30:38 +03:00
Phillip A
c4d5203e14 Fix MR !103 breaking of dialogue with actors with no greetings 2019-05-09 23:28:43 +00:00
Capostrophic
9d191055bf Make offered price caps barter-specific (bug #5028) 2019-05-09 21:19:10 +03:00
Bret Curtis
e0af6532ec
Merge pull request #2371 from Capostrophic/sneak
Don't toggle sneaking when controls are disabled
2019-05-07 09:52:21 +02:00
Frederic Chardon
6619150b23 Do not show magnitude for ingredients 2019-05-06 23:48:13 +00:00
Alexei Dobrohotov
310e19d47f Merge branch 'ptr-fix' into 'master'
Make sure pointers are set before GUI windows are brought up

See merge request OpenMW/openmw!103
2019-05-06 20:33:25 +00:00
Phillip Andrews
a481d2dc1a Make sure pointers are set before GUI windows are brought up
This most noticiably fixes an issue when resting in a bed while levitating.
2019-05-06 14:53:20 -05:00
Alexei Dobrohotov
1d12d778ea
Merge pull request #2370 from akortunov/herbalism
Container search tweaks
2019-05-06 22:34:12 +03:00
Capostrophic
4787e6b9a7 Don't toggle sneaking while controls are disabled 2019-05-06 22:30:07 +03:00
Andrei Kortunov
7214f24f5c Ignore containers, when we search for owner 2019-05-06 23:06:13 +04:00
Andrei Kortunov
abe1009e98 Do not resolve container's content during search 2019-05-06 23:05:31 +04:00
Capostrophic
cb9d16cf5f Support negative effect magnitude in spell/ingredient/potion tooltips 2019-05-05 21:27:48 +03:00
David Cernat
3805edaf78 [Server] Don't crash when adding a requiredDataFile w/ no checksum twice 2019-05-05 17:39:49 +03:00
Capostrophic
458c0bba41 Avoid using null pointer for player's cell in moveObjectImp 2019-05-05 16:43:32 +03:00
Capostrophic
3add9765c3 Fix spell deletion for character without a birthsign 2019-05-04 21:51:36 +03:00
Alexei Dobrohotov
15142a608d
Merge pull request #2344 from xyzz/delete-spell
Add a button to delete spells from spellwindow
2019-05-04 21:05:12 +03:00
Alexei Dobrohotov
acae586765
Merge pull request #2365 from akortunov/guifixes
Refactor Settings::Manager::apply()
2019-05-04 21:01:15 +03:00
Andrei Kortunov
4f42fe5595 Refactor Settings::Manager::apply() 2019-05-04 21:38:36 +04:00
Alexei Dobrohotov
e4ef7e8d3f
Merge pull request #2355 from akortunov/transparency
Use the StateSetUpdater to modify alpha for Animation objects
2019-05-04 20:24:01 +03:00
Alexei Dobrohotov
1bfe0e43af
Merge pull request #2360 from akortunov/guifixes
Do not track resolution settings changes in the InputManager
2019-05-04 20:23:03 +03:00
Alexei Dobrohotov
632e7b973b
Merge pull request #2349 from akortunov/pinning
Allow to maximize windows via Shift + Double Click
2019-05-04 20:21:30 +03:00
Alexei Dobrohotov
a737935748
Merge pull request #2363 from akortunov/herbalism
Additional herbalism-related tweaks
2019-05-04 13:57:17 +03:00
Andrei Kortunov
c91d1e7394 Ignore containers without resolved content for Detect spells 2019-05-04 14:40:32 +04:00
Andrei Kortunov
29cfd2c583 Do not respawn container if player did not touch it 2019-05-04 14:09:09 +04:00
Andrei Kortunov
c01153569d Add missing Organic flag check for herbalism 2019-05-04 12:36:58 +04:00
Alexei Dobrohotov
4f74d09179
Handle GetAngle axis more gracefully too 2019-05-04 00:24:23 +03:00
Alexei Dobrohotov
6aef52931f
Merge pull request #2166 from akortunov/distant_slider
Rework the viewing distance slider
2019-05-03 21:19:47 +03:00
Alexei Dobrohotov
74112976b2
Merge pull request #2085 from akortunov/herbalism
Native graphics herbalism support
2019-05-03 20:58:22 +03:00
Andrei Kortunov
4513c5516c Increase the viewing distance cap in the slider when the Distant Terrain is enabled 2019-05-03 10:23:10 +04:00
Andrei Kortunov
5876a417c3 Use the StateSetUpdater to modify alpha for Animation objects (bug #5001) 2019-05-03 08:18:52 +04:00
Andrei Kortunov
ed859c41be
Merge pull request #2353 from Capostrophic/drop
Make Drop behavior closer to vanilla (bug #4999)
2019-05-03 08:12:46 +04:00
Andrei Kortunov
861d41f4a4 Native graphics herbalism support (feature #5010) 2019-05-02 23:03:47 +04:00
Capostrophic
3c18079c14 Handle invalid instruction axis more gracefully 2019-05-02 20:50:05 +03:00
Andrei Kortunov
0cd8d4b842 Do not track resolution settings changes in the InputManager (bug #4902) 2019-05-02 19:00:47 +04:00
Bret Curtis
05ee769518
Merge pull request #2357 from Capostrophic/overflow
Editor: Don't accept overflowing input in NPC fields
2019-05-02 13:55:01 +02:00
Andrei Kortunov
c5ac580e74 Allow to maximize windows via Shift + Double Click (feature #3999) 2019-05-01 20:15:11 +04:00
Ilya Zhuravlev
1d02c1ef37 engine: fix window creation when SDL returns different-sized window 2019-04-30 14:25:24 -04:00
Capostrophic
548d336933 Editor: Don't accept overflowing input in NPC fields 2019-04-30 20:41:23 +03:00
Capostrophic
b42f981200 Make Drop and soulgem instruction behavior closer to vanilla (bug #4999) 2019-04-30 19:06:02 +03:00
Andrei Kortunov
c3fdccac1f Do not use the xbase_anim.kf as a fallback for werewolves (bug #5004) 2019-04-30 17:51:38 +04:00
Andrei Kortunov
0bec84342c
Merge pull request #2346 from Capostrophic/shaders
Make sure forcePPL and clamp are defined in the editor
2019-04-30 07:24:43 +04:00
Capostrophic
05d94d35f9 Make disabled shadow defines map static 2019-04-29 19:31:46 +03:00
Capostrophic
9f9b7cb0ae Init shadow defines in the editor too for a good measure 2019-04-29 19:21:37 +03:00
Capostrophic
158f4e23cb Make sure forcePPL and clamp are defined in the editor 2019-04-29 19:21:37 +03:00
Ilya Zhuravlev
16d2db8492 android: remove unused file 2019-04-28 18:21:48 -04:00
Ilya Zhuravlev
7865ffa1a7 android: Switch to C++ 2019-04-28 18:21:31 -04:00
Andrei Kortunov
c610a58cf0 Improve reset of idle animations (bug #4847) 2019-04-28 22:28:24 +04:00
Andrei Kortunov
1832f1759d AI: use a consistent check if a target is hidden (bug #4920) 2019-04-28 16:41:10 +04:00
Alexei Dobrohotov
b77bd9cf9b Merge branch 'issue-4971' into 'master'
Bug #4971: OpenMW-CS: Make rotations display as degrees instead of radians

See merge request OpenMW/openmw!100
2019-04-26 14:20:52 +00:00
Nat Meo
a3b7a12fe7 Bug #4971: OpenMW-CS: Make rotations display as degrees instead of radians 2019-04-25 14:26:28 -04:00
Andrei Kortunov
c36a22653f
Merge pull request #2348 from Capostrophic/music
Increase music crossfade time to 1 second
2019-04-25 21:36:42 +04:00
Capostrophic
6e98cd8eaa Increase music crossfade time to 1 second 2019-04-25 20:26:40 +03:00
Alexei Dobrohotov
5e405ca679
Merge pull request #2347 from akortunov/pinning
Make pinnable windows hiding persistent
2019-04-25 20:15:05 +03:00
Andrei Kortunov
8e48493264 Make pinnable windows hiding persistent (feature #4994) 2019-04-25 21:05:43 +04:00
Ilya Zhuravlev
e057ea171f spell window: don't manually recalculate edit box width every update 2019-04-25 09:13:32 -04:00
Ilya Zhuravlev
e1ce15efb5 spellwindow: do onWindowResize in ctor after dimensions are set 2019-04-25 08:51:57 -04:00
Ilya Zhuravlev
26ac7412a0 Spell window: dynamically resize the edit box, change delete button caption 2019-04-25 08:46:11 -04:00
Ilya Zhuravlev
2ee0b1287b spellmodel: add a break to getSelectedIndex 2019-04-25 06:14:12 -04:00
David Cernat
02e646e838 [Client] Use check for credits file that makes more sense 2019-04-25 04:39:25 +03:00
David Cernat
437854180c [Client] Clean up variable & function names in mwmp/Main.cpp 2019-04-25 04:29:54 +03:00
Ilya Zhuravlev
6c96b5653b Add a button to delete spells from spellwindow 2019-04-24 19:22:47 -04:00
Andrei Kortunov
28252bb359 Merge branch 'hashRefID' into 'master'
Remove string copy in CellStore::search

See merge request OpenMW/openmw!77
2019-04-24 16:46:13 +00:00
Capostrophic
8abe92fe41 Don't recover normalise speed setting every frame 2019-04-24 16:22:56 +03:00
Capostrophic
34ea9ea813 Add an option to restore MCP-like movement behavior 2019-04-24 16:21:12 +03:00
Capostrophic
c7ac06b960 Always account for every follower travelling 2019-04-24 16:21:12 +03:00
Andrei Kortunov
95d6a99c7f Do not use the CPU affinity of OSG viewer (bug #4785) 2019-04-24 14:51:00 +04:00
Bret Curtis
b43eb56b7c
Merge pull request #2336 from akortunov/logging
Use the logging system for compiler errors
2019-04-24 12:00:44 +02:00
Andrei Kortunov
df94bfbf29
Merge pull request #2343 from Capostrophic/vfx
Tweak object VFX scaling (bug #4989)
2019-04-24 10:47:35 +04:00
David Cernat
f6db7d4fc5 [Client] Avoid sending repeated ObjectDelete packets about an object 2019-04-24 00:52:11 +03:00
David Cernat
7523a73346 [Server] Fix return values for server functions providing system info 2019-04-23 23:40:41 +03:00
David Cernat
d8919dcec6 [Server] Refer to data files instead of plugins in var & function names 2019-04-23 22:45:25 +03:00
Andrei Kortunov
bd2188a0f8 Use the logging system for compiler errors 2019-04-23 22:20:18 +04:00
Bret Curtis
2cc359a205
Merge pull request #2339 from akortunov/mygui
Increase required MyGUI version to 3.2.2
2019-04-23 16:43:14 +02:00
Capostrophic
f2638b58c1 Tweak object VFX scaling (bug #4989) 2019-04-22 21:27:33 +03:00
Andrei Kortunov
9059971a69 Increase required MyGUI version to 3.2.2 2019-04-22 20:52:18 +04:00
Andrei Kortunov
6a01e4cd8a Fix arguments order for raytracing in the getHitContact() (bug #4990) 2019-04-22 20:46:38 +04:00
uramer
2531378d0b make getEffectDuration to look for a specific effect 2019-04-21 20:53:38 +02:00
Andrei Kortunov
626a05f825
Merge pull request #2128 from Capostrophic/blood
Support all eight possible blood types (feature #4958)
2019-04-21 21:14:30 +04:00
Alexei Dobrohotov
3e61ef32e7
Merge pull request #2332 from akortunov/particles
Apply looping particles when adding spell to existing actor
2019-04-21 10:39:17 +03:00
Andrei Kortunov
09686d684e Update background texture if a new one is empty (regression #4986) 2019-04-20 11:40:42 +04:00
Andrei Kortunov
5508e67aad Apply looping particles when adding spell to existing actor (bug #4918) 2019-04-20 09:52:15 +04:00
Capostrophic
f0433704b4 Only collect every unique magic bolt sound once (bug #4964) 2019-04-17 19:23:50 +03:00
Alexei Dobrohotov
89a0b2d2d4 Merge branch 'issue-4805' into 'master'
Bug #4805: NPC movement speed calculations do not take race Weight into account

See merge request OpenMW/openmw!89

(cherry picked from commit 98f52fa8ad8d8746786c529373db81f8602135df)

61682570 Bug #4805: NPC movement speed calculations do not take race Weight into account
0c8308bc Revert "Bug #4805: NPC movement speed calculations do not take race Weight into account"
4b43e91f Change to only affect movement speed and not animation speed
a66ae118 Use adjustScale() to adjust movement calculation instead of using race weight
6295eadc Make sure height is also factored into movement speed
fde0ca8b Remove height from movement calculation and factor in cell reference scale
2019-04-17 14:28:49 +00:00
Andrei Kortunov
e534153d00 Use friendly hits only for player's followers (bug #4984) 2019-04-16 17:12:37 +04:00
Capostrophic
7814bd1b76 Support eight possible blood types (feature #4958) 2019-04-14 18:48:31 +03:00
Andrei Kortunov
6b49ce965b Do not update drowning state for actors outside of AI distance (bug #4980) 2019-04-14 18:09:11 +04:00
Andrei Kortunov
4da21942af Do not use the actors processing range to determine a maximum range of AiTravel (bug #4979) 2019-04-14 17:51:12 +04:00
Capostrophic
2c473d84ee Fix zero division in enchantment magnitude calculation 2019-04-14 12:47:11 +03:00
Alexei Dobrohotov
5b8fc5a151
Merge pull request #2314 from OpenMW/stdc++14
bump from C++11 to C++14
2019-04-12 17:34:18 +03:00
Capostrophic
0333cd2dd4 Fix frozen rain when water refractions are disabled 2019-04-12 16:43:18 +03:00
terabyte25
27292ef4a3 Disable quick keys when fighting and spellcasting are disabled (bug #4962) 2019-04-12 13:08:55 +00:00
Bret Curtis
f4e113e7c1
Merge pull request #2277 from akortunov/terrain
Camera-related fixes
2019-04-12 11:17:20 +02:00
Bret Curtis
4fa529e093
Merge pull request #2320 from akortunov/cursorfix
[Regression] Fix disappearing cursor in the self-enchanting menu
2019-04-12 11:10:29 +02:00
Bret Curtis
785a667517
Merge pull request #2302 from akortunov/guifixes
Scalable UI textures
2019-04-12 11:09:30 +02:00
Andrei Kortunov
f165d22cde Fix a regression with disappearing cursor in the self-enchanting menu 2019-04-12 08:29:45 +04:00
Andrei Kortunov
9b716a2f8d
Merge pull request #2311 from Capostrophic/random
Use dice rolls instead of chance for spell magnitude (bug #4945)
2019-04-12 07:59:38 +04:00
Bret Curtis
10643a10f2
Merge branch 'master' into lighting 2019-04-11 09:55:09 +02:00
Capostrophic
85e99182ce Revise light source configuration (bug #4965)
Set up attenuation less awkwardly
Use global attenuation settings for magic light source
Use constant attenuation settings
2019-04-10 22:31:31 +03:00
Capostrophic
424716977b Only play miss sound for player attacks (bug #4969) 2019-04-10 22:28:22 +03:00
Bret Curtis
2ab7f903d7 make use of std::make_unique to test that MSVC2015 can handle that 2019-04-10 11:09:44 +02:00
Andrei Kortunov
31ddb0a482 Allow to calculate UI skin size based on texture resolution (feature #4968) 2019-04-10 10:34:07 +04:00
terrabyte25
61c3847a12 Add magic animation option to advanced page 2019-04-08 14:21:51 -05:00
Andrei Kortunov
413207f9af Reset old record, if its ID does not match with ID of new record (bug #4932) 2019-04-08 22:24:49 +04:00
Capostrophic
d4c1bd81b6 Use dice rolls instead of chance for spell magnitude (bug #4945) 2019-04-08 20:25:30 +03:00
Andrei Kortunov
14b756a692 Use a generic logging system for RecastNavigation 2019-04-08 20:31:21 +04:00
Alexei Dobrohotov
e9f6c11cc9
Merge pull request #2309 from akortunov/enchant_animations
Add an option to use casting animations for magic items
2019-04-08 18:54:07 +03:00
Andrei Kortunov
0079a6bf05 Correct the Enchant skill progress (bug #4963) 2019-04-08 16:15:19 +04:00
Bret Curtis
ca6f1bdd13
Merge pull request #2288 from Capostrophic/magiceffect
Validate spell effect argument (bug #4927)
2019-04-08 13:51:02 +02:00
Andrei Kortunov
35facc5cde Add an option to use casting animations for magic items (feature #4962) 2019-04-08 15:41:29 +04:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback
Make fallback map static to simplify constructors
2019-04-07 17:43:59 +02:00
bzzt
391f6faffb Remove unused defaultViewer / defaultViewPoint 2019-04-07 11:21:09 +04:00
bzzt
e908790584 Inherit the view point from main camera for water RTT cameras 2019-04-07 11:21:07 +04:00
Andrei Kortunov
489e5c6cce Store preloaded terrain view in the main thread 2019-04-07 11:15:21 +04:00
bzzt
63ab7345be Reuse traversal result for different traversal with same view point
Rename eyePoint to viewPoint to match OSG conventions (eyePoint is the camera position, viewPoint is for LOD handling)
2019-04-07 11:14:37 +04:00
uramer
c89efd251c [General] Implement CellReset packet, stage 2 2019-04-07 01:27:15 +02:00
Nelsson Huotari
4c4fb0d955 Add include 2019-04-06 10:38:59 +03:00
Nelsson Huotari
69f900349c Remove unnecessary include 2019-04-06 10:07:07 +03:00
Nelsson Huotari
ee4a8d2166 Add various coordinate conversion functions 2019-04-05 01:54:10 +03:00
Bret Curtis
1766a252dc
Merge branch 'master' into voiceover 2019-04-04 19:54:22 +02:00
Capostrophic
af80eddc0e Use loudness data for 2D voiceover (bug #4947) 2019-04-04 19:07:29 +03:00
Capostrophic
1424399118 Disable any footstep sounds when flying (bug #4948) 2019-04-04 17:22:24 +03:00
Capostrophic
7202f45771 Only allow resting in air when a bed is used 2019-04-04 17:22:24 +03:00
Capostrophic
be125aa996 Add spell effect argument validation (bug #4927) 2019-04-01 16:22:24 +03:00
Bret Curtis
aacc275e9c
Merge pull request #2299 from Capostrophic/position
Replicate vanilla Position/SetPos behavior more closely (bug #3109)
2019-04-01 08:58:50 +02:00
Capostrophic
80a65e81dd Only set attack type randomly if "best attack" is on (bug #4942) 2019-03-31 22:20:26 +03:00
Capostrophic
3a0e374dc6 Replicate vanilla Position/SetPos behavior more closely (bug #3109) 2019-03-31 14:17:06 +03:00
bzzt
ed4ce4609b Do not re-render maps for all active cells during cell transitions 2019-03-30 09:10:48 +04:00
Bret Curtis
2c57abc245
Merge branch 'master' into dialoguefix 2019-03-29 15:07:45 +01:00
Andrei Kortunov
a302ec9c65 Make fallback map static to simplify constructors 2019-03-29 15:30:49 +04:00
Bret Curtis
886c77bced
Merge pull request #2145 from akortunov/rest
Update jail state once instead of for every single hour
2019-03-27 13:14:22 +01:00
Chris Djali
1860d720bc
Merge pull request #2263 from akortunov/actor_culling
Do not recreate shaders to update transparency
2019-03-26 14:13:50 +00:00
Bret Curtis
d727a2f25c
Merge pull request #2285 from Capostrophic/mainmenu
Avoid menu button textures vertical cutoff
2019-03-25 13:33:03 +01:00
Bret Curtis
1e9eac568f
Merge pull request #2249 from akortunov/cache
Implement generic caching system
2019-03-25 13:32:23 +01:00
Capostrophic
93f78aad60 Avoid menu button texture vertical cutoff 2019-03-24 22:55:27 +03:00
Bret Curtis
354f904a24
Merge pull request #2279 from akortunov/map
Optimize map window update
2019-03-24 16:45:16 +01:00
uramer
6cb4d5ec35 [General] Implement CellReset packet, stage 1 2019-03-24 13:23:13 +01:00
David Cernat
8aad93b904
Merge pull request #519 from TES3MP/0.7.0-alpha
[General] Update positions for dead players on other clients
2019-03-24 03:54:43 +02:00
David Cernat
3effd5f1ff [General] Update positions for dead players on other clients
Dead players will now show up at the correct cell and position for living players, making server scripts that allow players to revive each other much more functional.
2019-03-24 03:52:05 +02:00
Capostrophic
6dbd875f75 Disallow binding some reserved keys (bug #3282) 2019-03-23 22:56:30 +03:00
bzzt
1143985bc7 Do not update map texture if it did not change 2019-03-23 16:22:57 +04:00
bzzt
d707eaac36 Use ICO for water shader 2019-03-23 15:44:03 +04:00
bzzt
231e629e66 Store map widgets and textures in one vector instead of 4 different ones 2019-03-23 07:46:41 +04:00
David Cernat
4692f29b9d
Merge pull request #517 from uramer/0.7.0markers
update player map markers when client changes cell
2019-03-22 21:39:06 +02:00
David Cernat
8ff2d1b829 [General] Rename CellReplace packet into CellReset 2019-03-22 21:33:34 +02:00
bzzt
c2176945bd Do not use the delayed map cells update 2019-03-22 18:58:34 +04:00
Bret Curtis
bbbdefce5f
Merge pull request #2275 from elsid/fix_map_iteration
Use auto for map value_type in range-based for loops
2019-03-22 11:13:58 +01:00
elsid
5434e92437
Take in account actor half extents for obstacle check 2019-03-21 23:15:47 +03:00
elsid
1e8bf3846e
Remove unused argument 2019-03-21 23:15:47 +03:00
elsid
287433efa8
Stop walking for water and flying creatures after single stuck 2019-03-21 23:15:47 +03:00
elsid
a65f60e1f1
Build path only by navmesh for wandering near spawn 2019-03-21 23:15:47 +03:00
elsid
ff67a9e233
Build straight path for wandering flying and water creatures 2019-03-21 23:15:47 +03:00
elsid
ebdff5d96e
Check for height map when cast ray for AiWander path 2019-03-21 23:15:47 +03:00
elsid
e033b0c565
Avoid build path through the ground for flying wandering creatures 2019-03-21 23:15:46 +03:00
elsid
e82d65a2c7
Use if-continue to skip build path 2019-03-21 23:15:46 +03:00
elsid
fa7b304e78
Use auto for map value_type in range-based for loops
To avoid implicit call of copy constructor for
pair<const K, V> to pair<K, V> conversion.
2019-03-21 23:09:42 +03:00
uramer
3b2098382b update player map markers when client changes cell 2019-03-21 16:27:15 +01:00
Chris Djali
e14682e353
Merge pull request #2273 from AnyOldName3/conformant-comparator
Use irreflexive, asymmetric comparator as required by the spec.
2019-03-20 23:55:03 +00:00
AnyOldName3
32da9a8ab1 Use irreflexive, asymmetric comparator as required by the spec. 2019-03-20 23:32:01 +00:00
David Cernat
91f82d845c [Server] Add GetMillisecondsSinceServerStart() server function 2019-03-20 20:02:31 +02:00
David Cernat
bd677726bf [Server] Add StatsFunctions that get/set damage to attributes/skills 2019-03-20 18:54:35 +02:00
David Cernat
9fc4c83858 [Client] Send skill/attribute packets when skills/attributes are damaged 2019-03-20 18:40:46 +02:00
David Cernat
ece39748de [Server] Fix typo causing recursion in deprecated actor list function 2019-03-20 17:01:21 +02:00
Capostrophic
695cd5bb49 Minor NpcAnimation cleanup 2019-03-20 16:11:21 +03:00
Bret Curtis
7ccfec4d21
Merge pull request #2270 from akortunov/animfix
Fixes for werewolf animations
2019-03-20 12:32:11 +01:00
Andrei Kortunov
be12d241da Reset current attack during force update (bug #4922) 2019-03-20 12:28:29 +04:00
Andrei Kortunov
e171d34192 Init NPC type properly in the NpcAnimation 2019-03-20 12:28:03 +04:00
elsid
ccb325c663
Add override to fix warnings 2019-03-20 00:19:26 +03:00
Andrei Kortunov
7501f18d21 Avoid the 'structurally dead code' warning 2019-03-19 09:16:03 +04:00
Andrei Kortunov
7995a92672 Initialize missing variables 2019-03-19 09:12:31 +04:00
Andrei Kortunov
fd5e9cf271 Catch possible boost::bad_any_cast exception 2019-03-19 09:11:14 +04:00
David Cernat
5c4d3df551 [Server] Deprecate DoesFileExist(), add DoesFilePathExist() 2019-03-19 04:52:58 +02:00
David Cernat
2cdabddc0e [Server] Move most MiscellaneousFunctions to ServerFunctions 2019-03-19 04:25:33 +02:00
David Cernat
b46767de6e [Server] Clean up recent additions to ServerFunctions 2019-03-19 03:57:16 +02:00
Bret Curtis
b819690e82
Merge pull request #2264 from akortunov/optimize_terrain
Delete composite map layers in the background thread
2019-03-18 13:52:17 +01:00
bzzt
aa5a071aef Delete composite map layers in the background thread 2019-03-18 14:00:50 +04:00
Bret Curtis
e2ed90e67b
Merge pull request #2262 from akortunov/guifixes
[Regression] Fix missing \n characters on the active effects tooltips
2019-03-18 08:59:31 +01:00
Bret Curtis
d56733149c
Merge pull request #2201 from akortunov/optimize_terrain
Optimize terrain
2019-03-18 08:59:10 +01:00
Bret Curtis
4e3de9b00c
Merge pull request #2206 from Capostrophic/title
Loop title screen music (bug #4896)
2019-03-18 08:58:14 +01:00
bzzt
5ec28e09c9 Do not recreate shaders to update transparency 2019-03-18 10:37:53 +04:00
Andrei Kortunov
c6cb91ce61 Limit maximum FOV value 2019-03-18 10:27:30 +04:00
bzzt
6029ed4ecc Reject empty quad tree nodes at the cell level without land data 2019-03-18 10:27:29 +04:00
Andrei Kortunov
80e0fbdd88 Fix missing \n characters on the active effects tooltips 2019-03-18 08:47:46 +04:00
elsid
4624f31788
Report navigator stats 2019-03-17 22:15:18 +03:00
Capostrophic
abae35e88b Loop title screen music (bug #4896) 2019-03-17 21:05:52 +03:00
Capostrophic
168e758921 Correct look and behavior of some setting sliders 2019-03-17 06:44:42 +03:00
Bret Curtis
433893e733
Merge pull request #2256 from unelsson/instance_viewcell
Editor: Implement exterior cell view from Instances table
2019-03-16 20:47:40 +01:00
Nelsson Huotari
2b674cedaa Implement view cell from r-type hint 2019-03-16 14:38:51 +02:00
Capostrophic
dd03d3b231 Print SDL version at startup 2019-03-15 19:07:31 +03:00
Andrei Kortunov
2ed05a5195 Implement generic caching system 2019-03-14 09:10:19 +04:00
Bret Curtis
f62c1c59b4
Merge pull request #2241 from Capostrophic/console
Use selected object local variables in the console (feature #3893)
2019-03-13 15:42:43 +01:00
David Cernat
331fa86844 [Server] Call OnServerPostInit after OnRequestDataFileList
This allows different actions to be taken in OnServerPostInit based on what the data files being used are.
2019-03-12 05:36:33 +02:00
David Cernat
a0ec9dfd2e [Server] Rename OnRequestPluginList into OnRequestDataFileList 2019-03-12 03:18:57 +02:00
David Cernat
986528c67d [Server] Add error message as argument to OnServerScriptCrash 2019-03-12 02:15:20 +02:00
Bret Curtis
7b1a62fc1d
Merge pull request #2247 from akortunov/loadtex
Allow to override texture records in the game
2019-03-11 21:05:30 +01:00
Andrei Kortunov
943279abbb Consider land texture with given ID and index as override for base texture with the same ID and index (bug #4736) 2019-03-11 20:19:19 +04:00
Bret Curtis
cb1a5f3679
Merge pull request #2245 from elsid/navigator_refactor
Refactor navigator related code
2019-03-11 07:51:43 +01:00
elsid
518e34b403
Remove useless variables 2019-03-10 23:58:48 +03:00
elsid
614d5243c3
Make NavMeshCacheItem consistent
Move all logic related to this type into its methods.
2019-03-10 23:07:36 +03:00
Capostrophic
dd952c3ddb Fix extra space in "no script" showvars output 2019-03-10 17:12:43 +03:00
Capostrophic
578beb6305 Use selected object local variables in console (feature #3893) 2019-03-10 17:09:54 +03:00
elsid
ccc709a316
Store guarded navmesh cache item in shared_ptr
Remove useless SharedGuarded type.
2019-03-10 17:06:19 +03:00
elsid
0479ebf5ae
Remove unused actors and navmeshes on update
When there is only one actor (player) on a scene and it moving to other
cell first it will be removed from navigator then added. Remove cause
navmesh removing for its half extents. After it is added navmesh for
same half extents is created and added. While this all happens there are
still jobs for old navmesh are processing. Old navmesh still exists
because it is stored by shared pointer. So jobs take tiles from cache
and place them into old navmesh. After that other jobs take same tiles
from cache (half extents and coordinates are equal) and place them into
other navmesh. dtNavMesh changes tile data on add and remove. Adding tile
to two dtNavMesh corrupts tile in both nameshes.
2019-03-10 17:06:15 +03:00
Bret Curtis
1078708da0
Merge pull request #2235 from akortunov/aifix
[0.45 regression] Fix AI regressions
2019-03-10 11:48:48 +01:00
Bret Curtis
a4b647db3e
Merge pull request #2236 from Capostrophic/audio
Fix EAGAIN error leading to packets getting lost (bugs #4906, #4909)
2019-03-10 11:40:09 +01:00
Andrei Kortunov
08202f8185 Fix missing null check 2019-03-10 11:03:51 +04:00
David Cernat
552a94a0ca [Server] Add OnServerScriptCrash script event 2019-03-10 00:46:40 +02:00
Capostrophic
d1967562a3 Fix the last audio packet getting lost 2019-03-09 21:25:16 +03:00
Andrei Kortunov
2a08b85998 Combat AI: normalize hit chance in the weapon priority calculation 2019-03-09 22:24:50 +04:00
Andrei Kortunov
5f0c8a4783 Combat AI: decrease priority multiplier for enchantments (bug #3830) 2019-03-09 22:05:24 +04:00
Bret Curtis
947bf880df
Merge pull request #2232 from elsid/fix_div_by_zero
Do not scale duration when timescale is zero
2019-03-09 18:06:53 +01:00
Bret Curtis
9b190eceab
Merge pull request #2230 from akortunov/preloading
Minor preloading improvements
2019-03-09 17:56:18 +01:00
elsid
d3bdf912a4
Do not scale duration when timescale is zero 2019-03-09 17:14:07 +03:00
Bret Curtis
573e64e9c9
Merge pull request #2184 from elsid/fix_startup_script
[Testing needed] Always run startup script once at engine start (bug #4877)
2019-03-09 14:04:06 +01:00
Bret Curtis
048cfdfac6
Merge pull request #2228 from Capostrophic/mainmenu
Fix main menu toggling again
2019-03-09 10:27:09 +01:00
Andrei Kortunov
12f9184d00 Allow to interrupt terrain preloading 2019-03-09 13:15:23 +04:00
Bret Curtis
c20e69ef24
Merge pull request #2227 from elsid/fix_twitchy_massive_creatures
Fix twitchy movement for massive creatures (bug #4907)
2019-03-09 02:11:11 +01:00
Bret Curtis
e3bde5ec91
Merge pull request #2226 from akortunov/projectilefix
Use relative animation time only for bows and crossbows
2019-03-08 22:52:10 +01:00
Bret Curtis
c2a7aa2932
Merge pull request #2225 from elsid/retry_async_navmesh_update_job
Support explicit limit of navmesh tiles for scene
2019-03-08 22:39:45 +01:00
Capostrophic
ca83b9ee90 Refactor main menu and settings toggling again 2019-03-08 23:09:57 +03:00
elsid
ea80a81538
Drop path points while tolerance allows 2019-03-08 22:33:34 +03:00
elsid
b9f21ec81a
Use custom steps size to make smooth path depending on half extents 2019-03-08 22:33:34 +03:00
elsid
8fd6b37e34
Make path point tolerance depending on actor half extents 2019-03-08 22:33:33 +03:00
bzzt
e0cf460ba3 Do not load terrain beyond the viewing distance 2019-03-08 22:15:27 +04:00
Andrei Kortunov
4c21776b94 Use relative animation time only for bows and crossbows (bug #3778) 2019-03-08 20:16:02 +04:00
elsid
f2e47d640d
Add option to limit max number of navmesh tiles 2019-03-08 17:39:04 +03:00
Bret Curtis
1e4bbe8997
Merge pull request #2223 from Capostrophic/animation
Fix raki creatures in Skyrim: Home of the Nords (bug #4810)
2019-03-08 15:25:45 +01:00
Andrei Kortunov
de41c98022 Refactor menu toggling 2019-03-08 13:36:44 +04:00
Capostrophic
b05531818c Fix raki creatures in Skyrim: Home of the Nords (bug #4810)
Make bip01 have higher priority than 'root node' node when determining the movement accumulation root
2019-03-07 21:09:00 +03:00
Bret Curtis
c55141d18d
Merge pull request #2217 from Capostrophic/shader
Move forcePPL and clamp to global shader defines (task #4869)
2019-03-07 16:56:09 +01:00
Bret Curtis
df6112aa35
Merge pull request #2221 from akortunov/iter
Use C++11-style loops in the game world instead of iterators
2019-03-07 16:53:18 +01:00
Perry Hugh
b8b7568ce5 Correct odd toggling menu behavior. 2019-03-07 11:41:48 +01:00
Bret Curtis
088de40365
Merge pull request #2218 from akortunov/warnfix
Fix MSVC warning about variable re-declaration
2019-03-07 11:37:07 +01:00
Bret Curtis
a5d7efc009
Merge pull request #2207 from CyberShadow/gettooltipinfo-var
[Trivial] Reuse a previously-saved value
2019-03-07 11:36:44 +01:00
Bret Curtis
9adb557833
Merge pull request #2211 from Capostrophic/messages
Small script verifier tweaks
2019-03-07 10:11:56 +01:00
Andrei Kortunov
d23a0ce2ae Use C++11-style loops in the game world instead of iterators 2019-03-07 12:39:57 +04:00
Andrei Kortunov
dcec9df345 Fix MSVC warning about variable re-declaration 2019-03-07 08:08:13 +04:00
Bret Curtis
8bd7effae1
Merge pull request #2212 from elsid/navigator_log_spam
Do not build path by navigator for pure water and flying creatures
2019-03-06 21:37:41 +01:00
Bret Curtis
41d1521f1d
Merge pull request #2213 from elsid/min_path_point_tolerance
Use min point tolerance to prevent face wrong direction (bug #4814)
2019-03-06 21:36:43 +01:00
Bret Curtis
7e5c7064af
Merge pull request #2214 from CyberShadow/pull-20190305-225227
DRY skill widget updates in stats window
2019-03-06 21:36:16 +01:00
Vladimir Panteleev
9d5fc7954f
DRY skill widget updates in stats window
The skill widgets were configured in two places: initial creation, and
updates. The former was redundant, and duplicated the functionality of
the latter.

To fix this redundancy, replace the duplicate code with a call to
setValue.
2019-03-05 22:52:30 +00:00
Capostrophic
0cdc46dfd6 Move forcePPL and clamp to global shader defines (bug #4869) 2019-03-05 23:36:08 +03:00
elsid
cf1e1d9f4b
Use min point tolerance to prevent face wrong direction (bug #4814)
When next path point is too close to actor and it has speed 0,
it can face direction not pointing to path target.
2019-03-05 23:18:55 +03:00
elsid
eb45f99880
Remove unused code 2019-03-05 23:18:55 +03:00
elsid
5405efd3b5
Do not build path by navigator for pure water and flying creatures
They don't need to move by surfaces and to open/close doors.
2019-03-05 22:45:05 +03:00
Capostrophic
44da71fdb3 Restructure script verifier message 2019-03-05 20:47:19 +03:00
Capostrophic
59f7df187d Add explicit variant of Journal 2019-03-05 20:47:05 +03:00
Bret Curtis
cb29dc7b85
Merge pull request #2209 from akortunov/effectfix
[Regression] Fix magic glow update for sheathing weapons
2019-03-05 17:05:17 +01:00
Andrei Kortunov
bcf086d72d Fix magic glow update for sheathing weapons 2019-03-05 11:51:56 +04:00
fredzio
93ffdc915d SearchVisitor copy a new std::string everytime CellsStore::search is
called. Use a reference instead
2019-03-05 06:07:59 +01:00
elsid
84fbb486d3
Fix switch from invalid navmesh number to valid 2019-03-04 22:59:47 +03:00
elsid
80051db8f8
Update rotated objects in navigator 2019-03-04 22:59:39 +03:00
elsid
8c08c3c7d6
Update moved objects in navigator 2019-03-04 22:59:39 +03:00
elsid
27d7452267
Update scaled objects in navigator 2019-03-04 22:59:39 +03:00
elsid
2e063d59ce
Update scaled agent half extents in navigator (bug #4763) 2019-03-04 22:59:39 +03:00
elsid
43b39e8418
Use not scaled player half extents as default to find path 2019-03-04 22:59:38 +03:00
elsid
1218e4e15d
Use player half extents only to find path in exterior cells 2019-03-04 22:59:20 +03:00
Vladimir Panteleev
12bbecacfd
Reuse a previously-saved value 2019-03-04 16:23:57 +00:00
Bret Curtis
14c93b3df0 Revert "Merge pull request #2204 from elsid/fix_navigator_update"
This reverts commit 26fb0e7a0f, reversing
changes made to 42b2391303.
2019-03-04 11:06:15 +01:00
Bret Curtis
84ce9814fd
Merge pull request #2203 from elsid/update_recastnavigation
Update recastnavigation
2019-03-03 20:48:50 +01:00
elsid
b51a54e976
Update rotated objects in navigator 2019-03-03 16:46:41 +03:00
elsid
f394ace4d5
Update moved objects in navigator 2019-03-03 16:46:41 +03:00
elsid
133d7447f3
Update scaled objects in navigator 2019-03-03 16:46:41 +03:00
elsid
1f41d5721d
Update scaled agent half extents in navigator (bug #4763) 2019-03-03 16:46:39 +03:00
elsid
c066ee9dc5
Use not scaled player half extents as default to find path 2019-03-03 16:21:12 +03:00
elsid
a4f300f810
Use player half extents only to find path in exterior cells 2019-03-03 16:21:09 +03:00
elsid
895899b25b
Fix tests 2019-03-03 13:46:24 +03:00
elsid
2b3bc4fe61
Add detailed output for osg::Vec3f in tests 2019-03-03 13:46:24 +03:00
Perry Hugh
37f5ab2104 Gamepad controls now sent to keyboard input, excluding joystick. Added right thumbstick button to toggle mouse emulation. 2019-03-03 09:21:00 +00:00
Bret Curtis
aa513bba29
Merge pull request #2202 from Capostrophic/icon
Fix enchanted item icon update
2019-03-03 01:03:28 +01:00
Perry Hugh
313611b79d Analogue Joystick Movement 2019-03-02 23:46:48 +00:00
Capostrophic
2f38e4fbb3 Fix enchanted item icon update 2019-03-02 20:01:42 +03:00
Bret Curtis
79fca2e7c6
Merge pull request #2095 from akortunov/reflections
Add more settings to water reflections
2019-03-02 15:37:06 +01:00
Bret Curtis
f6127a30c0
Merge pull request #2199 from akortunov/guifixes
Use C++11-style loops in the GUI instead of iterators
2019-03-02 15:36:54 +01:00
Bret Curtis
e7bf89d3d5
Merge pull request #2200 from akortunov/warnfix
Replace boost GCD by the homebrew implementation
2019-03-02 15:36:25 +01:00
Perry Hugh
7b6f41c5c3 Correct gamepad default bindings to exactly match vanilla XBOX, create fair interplay between toggling main menu and options menu, allow toggling menus at any time. 2019-03-02 14:28:26 +00:00
Andrei Kortunov
bf5f68a4d8 Replace boost GCD to the homebrew implementation 2019-03-02 17:32:05 +04:00
Andrei Kortunov
9398117ea7 Allow to do not reflect terrain 2019-03-02 14:26:14 +04:00
Andrei Kortunov
00ab552184 Add more settings to water reflections in exteriors (feature #4859) 2019-03-02 14:26:14 +04:00
Bret Curtis
cd70354f34
Merge pull request #2190 from akortunov/terrain
Make Distant Terrain configurable
2019-03-02 11:19:45 +01:00
Andrei Kortunov
8df8bd3f37 Use C++11-style loops in the GUI instead of iterators 2019-03-02 13:27:59 +04:00
Andrei Kortunov
56fea4b062 Add setting to control composite geometry size 2019-03-01 18:02:40 +04:00
bzzt
9d44e18af6 Allow to configure terrain vertex LOD 2019-03-01 18:02:38 +04:00
bzzt
fd94d7f7ff Make Distant Terrain more configurable (feature #4890) 2019-03-01 14:51:13 +04:00
Bret Curtis
cf20682d0c Merge branch 'gamepad-sneak-shortcut' into 'master'
Gamepad - Toggle Sneak Shortcut

See merge request OpenMW/openmw!73
2019-02-28 20:11:51 +00:00
Grigory Latyshev
3872d7476b Move makeOsgVec3f() to settingsutils.hpp
Remove all other makeOsgVec3f() implementations
2019-02-28 20:03:42 +00:00
Andrei Kortunov
a14c832f4f Fix Boost version check in the launcher 2019-02-28 15:11:30 +04:00
David Cernat
12cef51122
Merge pull request #2192 from Capostrophic/bzzt
Port minor fixes from bzzt's branch
2019-02-28 12:55:58 +02:00
AnyOldName3
ac18983f37 Finish gldebug location move 2019-02-28 00:02:07 +00:00
AnyOldName3
3d917fcbad Add basic OpenGL debug callback 2019-02-28 00:02:07 +00:00
Perry Hugh
3ac5481ab4
Enable toggling sneak via gamepad. 2019-02-27 14:03:16 -08:00
elsid
619a111a11
Run startup script once at engine start when game is running (bug #4877) 2019-02-27 22:55:13 +03:00
Perry Hugh
c6fb94d6cb xbox-bindings 2019-02-27 13:29:48 +00:00
bzzt
bcbee08a1b Fix creature model instance preloading 2019-02-27 00:15:39 +03:00
bzzt
5ffb40e8ba Don't preload terrain when loading an interior save 2019-02-27 00:02:57 +03:00
Bret Curtis
735bcf17c2 Merge branch 'boost-gcd-deprecation' into 'master'
Fix boost deprecation warning

See merge request OpenMW/openmw!66
2019-02-26 18:02:01 +00:00
AnyOldName3
cd4303da23 Add preprocessor check to determine which common_factor header to use. 2019-02-26 17:03:07 +00:00
elsid
33f6fb258d
Option to set specific random seed for random number generator 2019-02-26 09:36:34 +03:00
Bret Curtis
f6da025f02
Merge pull request #2188 from Capostrophic/memory
Always include <memory> for smart pointers in MWGui
2019-02-25 20:16:21 +01:00
Capostrophic
216e1ab16f Always include <memory> for smart pointers in MWGui 2019-02-25 18:50:51 +03:00
Bret Curtis
dc1c2358b9
Merge pull request #2089 from akortunov/qthelp
Editor: Add basic info window
2019-02-25 16:40:11 +01:00
Bret Curtis
3316938dfc
Merge pull request #2182 from Capostrophic/format
Replace Boost format and replace_all where possible
2019-02-24 20:17:31 +01:00
Bret Curtis
56d5fc788c
Merge pull request #2163 from Capostrophic/hello
AI data handling minor revisions
2019-02-24 20:14:08 +01:00
Capostrophic
e70cc10305 Some more de-boosting 2019-02-24 03:20:20 +03:00
Capostrophic
8ecd0b82a4 Replace Boost format and replace_all where possible 2019-02-24 03:20:20 +03:00
Bret Curtis
d4564a9be7
Merge pull request #2180 from akortunov/includes
Remove redundant includes
2019-02-24 01:14:16 +01:00
David Cernat
a508a0faf8 [Server] Turn GetArguments() from ScriptFunctions into Utils function 2019-02-24 01:43:04 +02:00
Bret Curtis
44920352ce
Merge pull request #2181 from Capostrophic/boost
Get rid of Boost.Array
2019-02-23 23:54:30 +01:00
Capostrophic
594ea39f5d Revise AI data handling
Make Hello 16-bit unsigned as it's intended to be
Get rid of redundant mHasAI boolean
Always save AI data subrecord
Adjust creature and NPC default rating values to Morrowind defaults
2019-02-23 21:00:47 +03:00
Bret Curtis
4a69d96483 Merge branch 'esm_name_template_fix' into 'master'
Make sure that proper operator function of ESM:FIXED_STRING is used for char[N] argument

See merge request OpenMW/openmw!63
2019-02-23 13:39:15 +00:00
Bret Curtis
8e3b10b5b4 Merge branch 'detour_navigator_unit_test_fix' into 'master'
Fix DetourNavigatorNavMeshTilesCacheTest on Windows

See merge request OpenMW/openmw!65
2019-02-23 07:59:03 +00:00
Bret Curtis
f8b34bf7f1 Merge branch 'preview_levelled_item' into 'master'
Fixes #4703 Disable preview for item leveled list

Closes #4703

See merge request OpenMW/openmw!57
2019-02-23 07:49:18 +00:00
Bret Curtis
df2de8a661
Merge pull request #2068 from Capostrophic/normalweapons
Make normal weapon resistance behavior closer to vanilla (bug #4384)
2019-02-23 08:38:30 +01:00
Andrei Kortunov
f5eacfcf63 Support for temporary stunted magicka effects 2019-02-23 09:17:06 +04:00
Andrei Kortunov
fcdb0c16bf Update jail state once instead of for every single hour 2019-02-23 09:17:06 +04:00
Andrei Kortunov
3032b177a1 Remove redundant includes 2019-02-23 08:02:12 +04:00
Capostrophic
58788de7c4 Get rid of Boost.Array 2019-02-22 23:16:34 +03:00
Capostrophic
4138e29ca4 Add option to restore the previous ammo behavior 2019-02-22 17:18:23 +03:00
Bret Curtis
ba491a8af0
Merge pull request #2069 from Capostrophic/skeleton
Use the skeleton from the NPC's set model (bug #4747)
2019-02-22 15:12:24 +01:00
Bret Curtis
cc214cf6b0
Merge pull request #2082 from Capostrophic/teleporting
Make magic teleportation attempts detectable even when teleportation is disabled (bug #3765)
2019-02-22 15:07:36 +01:00
Bret Curtis
c815a2cb42
Merge pull request #2107 from Capostrophic/idledialogue
Move idle dialogue playback from AiWander (bug #4594)
2019-02-22 15:06:39 +01:00
Bret Curtis
4d09c8bb50
Merge pull request #2126 from Capostrophic/sneaking
Account for running/sneaking stances while in air (bug #4797)
2019-02-22 15:04:55 +01:00
Bret Curtis
d2b93fc702
Merge pull request #2146 from Capostrophic/quest
Make quest status update handling closer to vanilla (bug #4815)
2019-02-22 15:04:14 +01:00
Bret Curtis
942f7f776d
Merge pull request #2168 from Capostrophic/gamepad
Option to disable controller (feature #3980)
2019-02-22 15:03:01 +01:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix
Fix some issues, found by PVS-Studio
2019-02-22 15:01:37 +01:00
Bret Curtis
55fc04e462
Merge pull request #2175 from Capostrophic/includes
Include cleanup
2019-02-22 14:56:20 +01:00
Bret Curtis
09d57c5154
Merge pull request #2177 from akortunov/alpha
Handle initial actor's transparency
2019-02-22 14:55:59 +01:00
elsid
2342a31add
Add more tests for TileCachedRecastMeshManager 2019-02-22 11:49:02 +03:00
elsid
73734fc04d
Fix update navmesh for not changed objects
When update method is called for not changed object befor this change
all object tiles were considered as not object tiles and were removed.
Also this marked those tiles as changed. This lead to alternation
between remove and add each tile update method was called. Problem was
detected by using Animated Containers mod.
2019-02-22 11:48:31 +03:00
Capostrophic
b738cc0383 Make normal weapon resistance behavior closer to vanilla (bug #4384)
Check both the ranged weapon and the projectile before modifying the damage
Don't attempt to apply NPC-specific werewolf damage mult to damage to creatures
2019-02-22 00:01:21 +03:00
Capostrophic
64d5cd17d6 Move werewolf silver damage mult applying into a new function 2019-02-22 00:01:21 +03:00
Capostrophic
808b8ce8db Refactor normal weapon resistance 2019-02-22 00:01:21 +03:00
David Cernat
dcbc9d1831 [Client] Print cells for actor deaths 2019-02-21 21:51:02 +02:00
Capostrophic
7a7e390099 Make unsuccessful magic teleportation attempts detectable (bug #3765) 2019-02-21 18:38:09 +03:00
Andrei Kortunov
629a6be477 Handle initial actor's transparency (bug #4860) 2019-02-21 14:57:55 +04:00
Andrei Kortunov
097c649885 Use enumerable instead of magic number 2019-02-21 14:57:31 +04:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
Shadows
2019-02-20 15:35:49 +00:00
Bret Curtis
7566370981
Merge pull request #2160 from Capostrophic/topicindex
Fix hiding three-column (Cyrillic) topic index
2019-02-19 21:29:15 +01:00
Bret Curtis
bc71db947a
Merge pull request #2174 from Capostrophic/jumping
[0.45.0 regression] Correct jumping velocity
2019-02-19 21:28:53 +01:00
Capostrophic
c03ed4cd50 Include cleanup 2019-02-19 18:40:33 +03:00
Bret Curtis
fdb84dddc8
Merge pull request #2059 from Capostrophic/stacks
Don't stack scripted items (bug #2969)
2019-02-18 16:02:55 +01:00
Bret Curtis
09262e0336
Merge pull request #2170 from elsid/disable_navigator_option
Add option to disable DetourNavigator component (feature #4833)
2019-02-18 16:01:30 +01:00
Capostrophic
c20030d8c9 Correct jumping velocity 2019-02-18 16:22:01 +03:00
Andrei Kortunov
ff9afda18d Avoid to keep reference to the local 'encoder' variable outside the Engine::go() 2019-02-17 14:29:39 +04:00
Andrei Kortunov
9de0c9045a Fix API usage errors 2019-02-17 14:29:39 +04:00
Andrei Kortunov
229bd8505e Init missing variables 2019-02-17 14:29:39 +04:00
Andrei Kortunov
dc6ef15571 Simplify loop in the addSkills() 2019-02-17 14:29:39 +04:00
Andrei Kortunov
80c62a4fe1 Fix endsWith() call 2019-02-17 14:29:39 +04:00
Andrei Kortunov
ad9412a117 Remove some redundant checks 2019-02-17 14:29:36 +04:00
Andrei Kortunov
18a59df050 Throw exceptions by value instead of reference 2019-02-17 10:24:25 +04:00
elsid
da6df818ff
Fix update navmesh
Every updated object should produce a set of changed tiles where it is
placed. Before this change only current object tiles were updated. If
object was moved to another set of tiles then navmesh were not changed
in new tiles.

TileCachedRecastMeshManager::updateObject should add all new tiles if object
was moved and remove all no more used tiles. Both new and old tiles should be
marked as changed.

Also add tests to show desired result for add, update, remove.
2019-02-17 01:50:53 +03:00
elsid
9626b6ec42
Add option to disable DetourNavigator component to find paths 2019-02-16 15:50:58 +03:00
elsid
16675fd254
Return empty path when navmesh is not found for agent 2019-02-16 15:37:06 +03:00
elsid
1d3668cd22
Add Navigator interface 2019-02-16 15:37:06 +03:00
elsid
c68e64a2a7
Make navigator from settings manager setting in separate function 2019-02-16 14:41:11 +03:00
Capostrophic
39dcbacf44 Option to disable controller (feature #3980) 2019-02-15 18:40:22 +03:00
David Cernat
f3b8a5b909 [General] Check integrity of credits only on Windows clients
This avoids the problems that were encountered in Linux and macOS builds regarding this check while also still addressing the scenario where official Windows builds had their credits modified by people unrelated to the project.
2019-02-14 00:29:55 +02:00
David Cernat
222837976c [Server] Fix type name warning for Player
The warning in Visual Studio was: "'Player': type name first seen using 'class' now seen using 'struct'"
2019-02-13 21:56:47 +02:00
AnyOldName3
c68ccbc6b6 Use new common_factor header in the launcher, too 2019-02-13 18:37:01 +00:00
AnyOldName3
89d4d3be08 Fix boost deprecation warning 2019-02-13 14:49:36 +00:00
Azdul
2412017685 Fix DetourNavigatorNavMeshTilesCacheTest on Windows 2019-02-10 08:04:39 +01:00
Andrei Kortunov
b7adbe79b9 Allow localization to use implicit keywords (bug #4841) 2019-02-09 14:06:05 +04:00
Capostrophic
e9c6c11418 Fix hiding three-tab (Cyrillic) topic index 2019-02-08 10:53:50 +03:00
Capostrophic
0535de6ca0 Make quest status update handling closer to vanilla (bug #4815)
Don't update quest status if we're simply updating the quest index
Update quest status if a new entry is added regardless of its index
2019-02-08 10:25:31 +03:00
Bret Curtis
4a9abf1c1b
Merge pull request #2159 from Capostrophic/lighting
[0.45.0 regression] Fix upside-down night-time lighting
2019-02-07 11:27:22 +01:00
AnyOldName3
b1a5a72665 Restore previous night time directional light path 2019-02-07 00:27:26 +00:00
Capostrophic
796b87fde7 Fix upside-down night-time lighting 2019-02-06 23:53:13 +03:00
Bret Curtis
9e8bc29e3b
Merge pull request #2105 from Capostrophic/colorpicker
[0.45.0 regression] Editor: Fix color picker oddities
2019-02-06 10:07:21 +01:00
Capostrophic
e47f1ef3e3 Fix some color picker regressions
Don't assign invalid color returned when the color picker is closed by Cancel as the new color
Restore "picking finished" signal to make value saving work again
2019-02-05 18:02:47 +03:00
Bret Curtis
ffa3596fe4
Merge pull request #2152 from akortunov/headfix
[0.45 regression] Editor: hide hairs when helmet is used
2019-02-05 15:36:34 +01:00
Bret Curtis
d40f11bcb6
Merge pull request #2124 from Capostrophic/animation
[0.45.0 regressions] Revert poor animation decisions
2019-02-05 15:36:21 +01:00
Bret Curtis
a573efd30a
Merge pull request #2112 from Capostrophic/collision
[0.45.0 regression] Don't re-enable collision body for dead actors
2019-02-05 15:36:06 +01:00
Bret Curtis
a206f57f75
Merge pull request #2156 from Capostrophic/itemtaken
Fix redundant searchPtr call
2019-02-05 12:29:51 +01:00
Andrei Kortunov
6eb77e215b Remove looping particles from dead actors 2019-02-05 11:02:25 +04:00
Capostrophic
650cd47255 Fix redundant searchPtr call 2019-02-05 01:04:54 +03:00
Capostrophic
a584aa25ab Don't re-enable collision object for dead actors 2019-02-04 22:13:30 +03:00
Bret Curtis
bc1fbd5400
Merge pull request #2088 from akortunov/faction_table
Editor: Implement faction ranks table
2019-02-04 14:51:07 +01:00
Bret Curtis
f4313c02e1
Merge pull request #2153 from akortunov/glowing_windows
Native glowing windows support
2019-02-04 14:50:13 +01:00
Azdul
7940317e42 Make sure that proper operator function is used for char[N] argument 2019-02-03 09:32:32 +01:00
Andrei Kortunov
57d8df1a05 Do not check if additional animation sources are supported for every animation object 2019-02-03 11:27:48 +04:00
Andrei Kortunov
9e4a339ad3 Daytime node switch support (feature #4836) 2019-02-02 10:50:15 +04:00
Bret Curtis
4f938492e5
Merge pull request #2150 from akortunov/vfx
Update magic effects VFX immediately after effects update
2019-01-30 10:25:41 +01:00
Andrei Kortunov
11c17ad9d5 Hide hairs when replace the Head bodypart by item's one in the editor 2019-01-30 10:18:48 +04:00
Andrei Kortunov
dc3a17f1f6 Update magic effects VFX immediately after effects update (bug #4828) 2019-01-29 22:52:40 +04:00
Capostrophic
5c889f7359 Add creature-with-the-same-model soundgen fallback (bug #4813)
Creatures will use sounds of the first creature that has the same model in the record store when possible.
2019-01-29 16:29:47 +03:00
Capostrophic
b33016d89f Allow creatures to play Attack voiceover 2019-01-26 17:05:33 +03:00
Capostrophic
cec55119ca Move idle dialogue playback from AiWander (bug #4594) 2019-01-26 16:36:48 +03:00
Bret Curtis
f405b1e247
Merge pull request #2143 from akortunov/optimize
Optimize HUD update
2019-01-25 20:55:19 +01:00
Andrei Kortunov
8580a58ba0 Optimize HUD update (do not do unnecessary work) 2019-01-25 21:15:29 +04:00
Capostrophic
67450a7046 Don't apply effects when spell absorption is successful (bug #4820) 2019-01-25 15:09:22 +03:00
AnyOldName3
8482236a82 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2019-01-24 23:09:23 +00:00
Capostrophic
6660f2f8e6 Use the skeleton from the NPC's set model (bug #4747) 2019-01-25 01:02:27 +03:00
AnyOldName3
9d84853903 Fix nodemask snafu 2019-01-24 18:56:10 +00:00
Frederic Chardon
7ad93c1d3e Gmst typo in MWMechanics::NpcStats::increaseSkill 2019-01-24 13:33:18 +00:00
Azdul
32013d35f2 Formatting of CMakeLists made consistent with other CMakeLists files. 2019-01-23 14:21:11 +01:00
Azdul
6d8215ecb6 Google Test / Google Mock / OpenMW unit tests on Windows 2019-01-23 14:21:03 +01:00
David Cernat
1df1515c7e [Client] Add logging for invalid enchantmentIds in RecordHelper 2019-01-23 01:04:59 +02:00
David Cernat
999ce857c7 [Client] Add logging for records ignored due to their invalid baseIds 2019-01-23 00:48:06 +02:00
David Cernat
db7e09f441 [Client] Use more consistent logging when reading dynamic record packets 2019-01-23 00:38:05 +02:00
David Cernat
0fa116b47d [Client] Remove useless lines in RecordHelper 2019-01-23 00:20:51 +02:00
Capostrophic
f9a711d2fd Revert poor animation decisions
Start force-updated in-air animation from loop start
Make movement animations have higher priority than jump animations
Make jumping animations have higher priority than turning animations
Don't reset idle during landing animation
Don't play default landing sound if the character is not on ground
2019-01-22 23:21:33 +03:00
Stomy
71be4cdd20 Ensure Unique Instance Refnum after clone, add, or move 2019-01-21 19:30:11 +00:00
Koncord
0df32accca [Server] Fix ARM build 2019-01-21 12:02:02 +08:00
Bret Curtis
c5a67c2079
Merge pull request #2137 from elsid/navmesh_render
Avoid useless read of navmeshes from navigator
2019-01-20 20:32:24 +01:00
elsid
13e94ab194
Get navmesh to update osg node only if rendering is enabled 2019-01-20 21:09:06 +03:00
elsid
3572edab72
Update navmesh in a separate method 2019-01-20 19:28:23 +03:00
Andrei Kortunov
1e8b7f0f83 Fix -Wstring-plus-int warnings 2019-01-20 15:46:19 +04:00
Justin Ivany
33c7e4e948 Don't remove whitespace... 2019-01-17 20:17:18 -04:00
Justin Ivany
8d036a79eb Fixes #4703 Disable preview for item levelled list 2019-01-17 19:11:38 -04:00
Artur Rojek
f6e1aaae1a Use case-insensitive compare when searching for game data by the wizard.
Until now, the wizard was only comparing against an exact file name
match while searching for game data, eg. "data*.cab".
This patch makes it possible to locate game data regardless of case
sensitivity, eg. "Data*.cab".
2019-01-15 13:36:24 +01:00
David Cernat
fd40e8c971 [Client] Prevent ObjectState spam by not resending an already sent state 2019-01-15 14:26:00 +02:00
Capostrophic
05d5d7d57b Account for stances when the player is in air (bug #4797)
Make GetPCRunning and GetPCSneaking return 1 if the player is in air while the stance is toggled
Make sneaking skill usage possible if sneaking stance is toggled while in air
2019-01-15 00:25:26 +03:00
Capostrophic
8bb270c2bb Update moved object collisions even if the cell is the same (bug #4800) 2019-01-14 00:56:43 +03:00
David Cernat
6e47b65205 [Client] Set attribute increases & level progress after correct packets
Originally, the PlayerSkill packet contained skills, attribute increases and level progress. In 78441c769a, the attribute increases were moved to the PlayerAttribute packet and the level progress was moved to the PlayerLevel packet, but – due to an oversight – attribute increases and level progress were still being applied to the local player only when a PlayerSkill packet was received, based on whatever values were stored from the last PlayerAttribute and PlayerLevel packets.
2019-01-11 14:26:13 +02:00
David Cernat
f481c85e07 [Client] Use ADD before REMOVE for PlayerInventory in repair/recharge
Previously, when recharging or repairing an item, the client sent a PlayerInventory packet to the server with the old version of the item that was supposed to be removed and then it sent a PlayerInventory packet with the new version of the item that was supposed to be added.

Unfortunately, the current CoreScripts make it so custom items using generated IDs have their records deleted when they are completely removed from the world, however briefly, even if they are added back immediately afterwards. In practice, this meant that – before this commit – recharging or repairing a custom item led to its removal from the player inventory stored on the server, followed by the deletion of its record, followed by its readdition to the inventory (but with the record staying deleted). Logging out and logging back in immediately prevented the player from receiving the item anymore because of its now non-existent record.
2019-01-11 13:08:26 +02:00
David Cernat
8a99f215f6 [Client] Add LocalPlayer::sendItemChange() variant with mwmp::Item arg 2019-01-11 12:54:47 +02:00
David Cernat
db9c1b9882 [Client] Add MechanicsHelper::getItem() for getting mwmp::Item from Ptr 2019-01-11 12:53:26 +02:00
David Cernat
799241e8c6 [Client] Use informative error message for RefData::setCount() issue 2019-01-11 08:16:29 +02:00
Bret Curtis
8834ee95be
Merge pull request #2120 from Capostrophic/macros
Get rid of some remaining instances of C numeric limits
2019-01-10 18:59:34 +01:00
Bret Curtis
db74eb4466
Merge pull request #2094 from Capostrophic/editor
Cherry-pick cc9cii's minor editor improvements
2019-01-10 17:55:59 +01:00
Bret Curtis
9c795195d0
Merge pull request #2109 from Capostrophic/loops
Simplify some world loops
2019-01-10 11:44:41 +01:00
Bret Curtis
4617dea154
Merge pull request #2119 from akortunov/stringstream
Get rid of unnecessary string streams
2019-01-10 11:42:27 +01:00
Capostrophic
a71cfca580 Get rid of some remaining instances of C limit macros 2019-01-09 16:06:18 +03:00
Andrei Kortunov
3e20f36953 Handle invalid string length for hinting 2019-01-08 12:37:41 +04:00
Capostrophic
776c6c2fe6 Fix MSVC warning 2019-01-07 20:38:33 +03:00
Andrei Kortunov
0937f02598 Get rid of unnecessary string streams 2019-01-07 21:08:16 +04:00
Andrei Kortunov
b17702bf1f Do not restore birthsign abilities upon game load (bug #4329) 2019-01-07 20:18:21 +04:00
Bret Curtis
de24682e2f
Merge pull request #2115 from Capostrophic/slowfall
Don't reset player jumping flag unnecessarily (bug #4775)
2019-01-07 17:13:39 +01:00
Capostrophic
a1af1ff487 Fix extra semicolon, redundant getStore calls and random creature spawn loop 2019-01-07 17:48:41 +03:00
Bret Curtis
9d1c0d2b22
Merge pull request #2114 from Capostrophic/cleanup
Remove some redundant code
2019-01-07 14:59:39 +01:00
Capostrophic
403db9afe3 Don't reset player jumping flag unnecessarily (bug #4775) 2019-01-07 16:08:26 +03:00
Bret Curtis
573af17cf9
Merge pull request #2097 from akortunov/camerafix
Do not scale player's model in the 1st-person view depending on race
2019-01-07 13:57:21 +01:00
Bret Curtis
93e566a08e
Merge pull request #2117 from Capostrophic/aidata
Make Interiors of Illusion puzzle of Sotha Sil Expanded work (bug #4778)
2019-01-07 13:56:11 +01:00
Andrei Kortunov
ab0841cc3d Split physics update from world update in the profiler 2019-01-07 14:44:43 +04:00
Andrei Kortunov
02a43d0b32 Do not scale player's model in the 1st-person view depending on race (bug #4383) 2019-01-07 12:58:47 +04:00
Capostrophic
92d7f21926 Don't interrupt compilation when spell/effect functions are used for non-actors 2019-01-06 21:45:56 +03:00
David Cernat
43f195f0c7 [Client] Use clearer debug for actor initializations 2019-01-05 23:27:35 +02:00
David Cernat
2e1d4a9449 [Server] Fix non-Windows builds 2019-01-05 22:11:58 +02:00
Capostrophic
624db99bf2 Remove some redundant code 2019-01-05 01:25:52 +03:00
Capostrophic
27eb64c7f0 Clean up fallback record creation again 2019-01-02 13:49:04 +03:00
David Cernat
81e2e48561 [Client] Fix item magic casting synchronization for spell scrolls
Previously, spell scrolls were used up before their IDs could be included in attacks packets supposed to be sent for them.
2018-12-31 13:24:32 +02:00
David Cernat
d83160523f [Client] Add items required for item magic casting when they are missing 2018-12-31 06:55:35 +02:00
David Cernat
433a69a588 [Client] Send all data for newly initialized LocalActors at least once 2018-12-31 04:36:59 +02:00
David Cernat
e70fd2cf3a [Server] Accept clients with wrong password on servers with no password 2018-12-31 03:52:25 +02:00
David Cernat
eb52babf29 [Server] Print IP instead of name or PID for players unable to connect
The player name was always blank in such situations, providing no useful information. The PID was not useful in any way either.
2018-12-30 18:02:26 +02:00
David Cernat
e96091fd6b [General] Use more consistent variable names for password, address, etc. 2018-12-30 17:23:12 +02:00
Capostrophic
0ab5314755 Make scripted items not stack (bug #2969) 2018-12-30 18:18:33 +03:00
Capostrophic
8a266803eb Simplify some world loops 2018-12-30 15:36:42 +03:00
David Cernat
906d2a837d [Client] Send PlayerInventory packets when recharging items w/ soulgems 2018-12-30 11:58:33 +02:00
David Cernat
71679934a1 [Client] Send PlayerInventory packets when repairing items 2018-12-30 09:39:46 +02:00
David Cernat
5d9893ee92 [Client] Set actor killer correctly for spells that do damage over time
Additionally, clean up comments related to other code that sets actor killers.
2018-12-30 07:40:11 +02:00
David Cernat
6e1504f0a1 [Server] Use clearer variable & function names in TimerAPI 2018-12-30 04:15:53 +02:00
David Cernat
42b5a8054f [Server] Remove unusable position functions for players 2018-12-30 03:17:37 +02:00
Koncord
4ce0331f1b [Server] Fix GCC build 2018-12-29 15:54:08 +08:00
Bret Curtis
932691d199
Merge pull request #2091 from Capostrophic/fallheight
Avoid falling height reset if on-ground state wasn't actually updated (bug #4411)
2018-12-29 08:26:28 +01:00
Koncord
9343b8af2f [Server] Remove unused function 2018-12-29 14:02:08 +08:00
Koncord
c2230a8a21 [Server] Add MP flag to the server if enabled 2018-12-29 12:03:01 +08:00
Koncord
55cea491ca [Server] Introduce MS VC++ 2017 support 2018-12-29 11:57:26 +08:00
Koncord
6af2400752 [Server] Remove usages of get/set env. Add GetModDir function 2018-12-29 11:40:31 +08:00
Koncord
b3456a8841 [Server] Fix invalidation of iterators 2018-12-29 11:10:20 +08:00
Bret Curtis
d80d056140
Merge pull request #2098 from xyzz/fix-loading-screen-uaf
loadingscreen: Fix UaF in loading screen.
2018-12-28 18:58:04 +01:00
Bret Curtis
91b962c095
Merge pull request #2099 from xyzz/replace-volatile-atomic
Replace volatile bools with std::atomic<bool>
2018-12-28 16:41:07 +01:00
Capostrophic
7155e787b4 Clean up fallback record creation 2018-12-28 01:22:24 +03:00
David Cernat
343dd8b5ea [Client] Fix addition of items to player inventories
Previously, multiple stacks of the same item ID could overwrite data in each other because of how the logic in ContainerStore::add() works. For example, a stack of 5 grand soul gems with no souls would get added to the player, then the attempt to add a grand soul gem with a particular soul would retrieve the previous stack first before setting all of it to that soul, resulting in 6 grand soul gems with that soul.
2018-12-26 13:41:19 +02:00
David Cernat
76ac905efc [Client] Send PlayerInventory packets when trapping souls in soulgems 2018-12-26 12:25:00 +02:00
David Cernat
f853368641 [Client] Fix loss of player items in ContainerStore::unstack()
Previously, unstacking items for a player led to a PlayerInventory packet being sent about the items' removal.

This change makes it so both a packet about their re-addition and their removal are sent instead, cancelling each other out, which is inelegant, but arguably preferable to complicating the sending of PlayerInventory packets again.
2018-12-26 12:24:26 +02:00
Ilya Zhuravlev
1bdec2399f Make sure CopyFramebufferToTextureCallback is only called once and not every frame 2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
07e9ce84b3 Replace volatile bools with std::atomic<bool> 2018-12-24 14:19:35 -05:00
Ilya Zhuravlev
8e7c01b561 loadingscreen: Fix UaF in loading screen.
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
2018-12-24 14:18:26 -05:00
Ilya Zhuravlev
98b2c04404 android: Add a method so that we can send relative mouse movements from java. 2018-12-23 15:14:29 -05:00
Capostrophic
793c2a19d2 Cherry-pick cc9cii's editor improvements 2018-12-23 20:10:16 +03:00
Capostrophic
0bbcc0e787 Avoid falling height reset if onGround state didn't change (bug #4411) 2018-12-23 13:39:35 +03:00
Ilya Zhuravlev
09585b7208 android_main.c: Replace nullptr back to NULL since there are no nullptr in C 2018-12-22 22:21:26 -05:00
Andrei Kortunov
8687a49c19 Editor: Added basic info window 2018-12-21 18:51:02 +04:00
Andrei Kortunov
b4f3ce2a0a Editor: Implement faction ranks table (feature #4209) 2018-12-21 14:16:40 +04:00
Capostrophic
2681435857 Editor: handle AI settings, regional sound and levelled list "none" chances as shorts (bug #2987) 2018-12-20 19:51:55 +03:00
AnyOldName3
e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 2018-12-18 19:51:27 +00:00
David Cernat
5e38e8abdb [Server] Add GetArchitectureType() script function
Additionally, bring GetOperatingSystem() up-to-date by making it use the renamed function in Utils.
2018-12-17 11:55:50 +02:00
David Cernat
fa1700e2ab [Server] Add GetOperatingSystemType() script function 2018-12-17 11:32:31 +02:00
Bret Curtis
6d7aacab5e
Merge pull request #2053 from akortunov/animatedContainers
Native animated containers support
2018-12-17 10:00:07 +01:00
Bret Curtis
d2c88f0983
Merge pull request #2071 from Capostrophic/sneaking
Don't interrupt sneak and swim idles in attack ready state in first person view (bug #4750)
2018-12-17 09:34:27 +01:00
David Cernat
50714599d9 [Client] Spawn at exterior 0, -7 by default 2018-12-17 08:25:22 +02:00
Andrei Kortunov
a53333c3d5 Native animated containers support (feature #4730) 2018-12-13 23:11:16 +04:00
terrabyte25
c31fa3074e
Sanity check for text input in toggleWalking 2018-12-12 14:40:15 -06:00
Capostrophic
6083e5ed4b Don't interrupt sneak and swim idles in first person view (bug #4750) 2018-12-10 00:05:06 +03:00
David Cernat
afd17e5a48 [Client] Don't finish drag & drop that is supposed to be unsuccessful
This prevents items from vanishing when your attempt to drop them in a full container is denied.
2018-12-06 18:11:52 +02:00
Marc Zinnschlag
d791dcfbf3 Merged pull request #2051 2018-12-06 13:10:48 +01:00
Bret Curtis
32624cb3ed
Merge branch 'master' into colors 2018-12-06 09:59:13 +01:00
Bret Curtis
b296c4a3bb
Merge pull request #2058 from Capostrophic/collision
Don't consider non-solid actors truly levitating (bug #4746)
2018-12-06 09:56:16 +01:00
Capostrophic
7b33838b33 Don't consider non-solid actors truly levitating (bug #4746) 2018-12-05 23:37:32 +03:00
Bret Curtis
35ea8ecb0b
Merge pull request #2056 from Capostrophic/esmtool
esmtool cleanup
2018-12-05 20:58:25 +01:00
Capostrophic
7cae0017ac Display Ambient, Sunlight and Fog field values as colors (bug #4745) 2018-12-05 17:25:26 +03:00
David Cernat
a6c6db89fc [Client] Send object packets when scripts use PlaceItem/PlaceItemCell 2018-12-05 01:56:27 +02:00
Capostrophic
5c8c079718 Fix incorrect event argument which messed with hidden light pointers 2018-12-04 17:07:03 +03:00
David Cernat
d05a82a734 [Client] Avoid repetitive code when unequipping items in resurrection 2018-12-04 03:55:03 +02:00
Capostrophic
832870dc79 esmtool cleanup 2018-12-02 23:10:29 +03:00
Bret Curtis
c2c86fc4a5
Merge pull request #2052 from mp3butcher/master
fix moc achieving to reach unparsable boost code
2018-12-02 19:28:35 +01:00
Bret Curtis
807cab568e
Merge pull request #2050 from Capostrophic/markers
[Regression] Revert unnecessary case changes for fallback records
2018-12-02 11:16:20 +01:00
Bret Curtis
b1ca6c6e95
Merge pull request #2045 from akortunov/animfix
[Testing needed] Fix regressions in the animation system
2018-12-02 11:14:44 +01:00
mp3butcher
9de6c630f2 fix moc achieving to reach unparsable boost code 2018-12-01 21:27:43 +01:00
terrabyte25
35755eb1f1
[Client] Disallow opening inventory menu when not logged in 2018-12-01 10:51:33 -06:00
Capostrophic
7b5932a49d Add Invert X Axis option (feature #3610) 2018-12-01 19:08:02 +03:00
Capostrophic
c59513c30c Revert unnecessary case changes for fallback records 2018-12-01 17:12:27 +03:00
David Cernat
b7090b2550 [Server] Add experimental option for not crashing from Lua script errors
Additionally, fix return type of GetPluginEnforcementState()
2018-12-01 03:03:39 +02:00
David Cernat
b39e3f518b [Client] Use correct log levels for inventory and dynamic record packets 2018-11-30 23:38:16 +02:00
David Cernat
d8ca268067 [Server] Move plugin enforcement functions to ServerFunctions 2018-11-30 22:43:10 +02:00
David Cernat
2933526995 [Server] Include errors related to Lua calls in server logs 2018-11-30 22:01:02 +02:00
AnyOldName3
642002b302 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-29 01:19:01 +00:00
Andrei Kortunov
880ec3ce7b Fix visible sheaths for invisible actors 2018-11-24 14:57:41 +04:00
Andrei Kortunov
671f2811d5 Fix regressions in the animation system (bug #4729) 2018-11-23 20:22:37 +04:00
Andrei Kortunov
e8b3ae8706 Improve ResetActors command (bug #4723) 2018-11-20 21:53:27 +04:00
Andrei Kortunov
7438e20ee1 Fix shield displaying on inventory avatar (bug #4720) 2018-11-17 22:42:29 +04:00
Testman
6b3f598837
Use more descriptive terminology for chat modes
Changed "Chat disabled" to "Chat hidden", "Chat enabled" to "Chat visible" and "Chat in hidden mode" to "Chat appearing when needed".
2018-11-17 16:54:14 +01:00
Andrei Kortunov
68c170f065 Refactor tools to do not use boost exceptions and exit() command 2018-11-15 18:10:19 +04:00
Andrei Kortunov
059a8fd32a Refactor dynamic casts in the editor 2018-11-15 17:50:23 +04:00
Bret Curtis
a21792657a
Merge pull request #2034 from akortunov/guifixes
Improve GUI cleanup
2018-11-15 07:31:57 +01:00
Andrei Kortunov
5ac81cfbff Throw exceptions with some info int the editor if dynamic_cast failed 2018-11-14 15:53:43 +04:00
Andrei Kortunov
f20d1b1b72 Catch exception in the NIFTest 2018-11-14 15:52:36 +04:00
Bret Curtis
419e7ea5a2
Merge pull request #2035 from akortunov/coverity
Fix many Coverity Scan warnings
2018-11-14 09:44:30 +01:00
Bret Curtis
8a66dec865
Merge pull request #2031 from akortunov/warnfix
Fix some Clang 7 warnings
2018-11-14 09:43:39 +01:00
Andrei Kortunov
4ee15ddcb9 Fix many Coverity Scan warnings 2018-11-14 11:21:49 +04:00
David Cernat
e834a4ec74 [Client] Find closest enchantmentCharge in getItemPtrFromStore()
Enchanted inventory items continuously recharge their enchantment charges, which getItemPtrFromStore() should account for.

Additionally, prevent framelistener errors caused by PlayerItemUse packets about non-existent items.
2018-11-13 20:36:31 +02:00
Andrei Kortunov
5e071e3eb0 Add a missing check if mPtr is empty (bug #4715) 2018-11-13 10:32:23 +04:00
Andrei Kortunov
71f1a53090 Improve tooltips cleanup (bug #4714) 2018-11-13 10:00:12 +04:00
Bret Curtis
194232abde
Merge pull request #2029 from akortunov/actorfix
[Regression] Handle case in the editor when actor's bodypart was not found
2018-11-12 11:44:28 +01:00
Bret Curtis
0f29a73fc9
Merge pull request #2025 from Capostrophic/actorloops
Use C++11 for close actor-iterating loops and avoid some redundant operations
2018-11-12 10:43:49 +01:00
Andrei Kortunov
d2613e35a2 Fix some Clang 7 warnings 2018-11-09 19:42:59 +04:00
Andrei Kortunov
0065bccf24 Handle case in the editor when actor's bodypart was not found 2018-11-09 14:51:45 +04:00
AnyOldName3
02a8c6a7ce
Merge branch 'master' into pr/fix-hidpi-resolution 2018-11-08 23:05:07 +00:00
Bret Curtis
228f6b572f
Merge branch 'master' into prisonmarker 2018-11-08 21:11:24 +01:00
Bret Curtis
f6243fae83
Merge pull request #1615 from akortunov/holstered_weapons
Weapon sheathing
2018-11-08 20:44:20 +01:00
Capostrophic
6d48d9329e Avoid making string copies instead of references 2018-11-08 17:03:29 +03:00
Bret Curtis
3751bc2c11
Merge pull request #2030 from akortunov/warnfix
Fix some compiler warnings
2018-11-08 12:19:04 +01:00
Andrei Kortunov
ad36834671 Fix some compiler warnings 2018-11-08 13:16:04 +04:00
Stanislaw Halik
8fd71fe4ad fix rain delay when exiting water
When the particle system updates its internal state noting that it's
been culled, it stops emitting any further particles. Prevent it from
having that knowledge.

v2: Fix off-by-one-frame error following review by @AnyOldName3
2018-11-07 20:55:45 +00:00
Capostrophic
4cb4f82431 Don't use bitwise AND 2018-11-07 19:44:17 +03:00
Capostrophic
39f8637e95 Simplify some actor loops and avoid some redundant calculations 2018-11-06 17:56:53 +03:00
Capostrophic
4efe1bc892 Add prison marker record fallback definition (bug #4701) 2018-11-05 19:37:46 +03:00
Stanislaw Halik
5e3e01cac0 fix resolution on HiDPI displays under Windows
The same Windows functionality as scaling user interface elements,
confuses fullscreen games unless they set a particular of metadata to
indicate that they perform the scaling by themselves.

What happened was treating 2160p as 1440p despite the former being
chosen. The same occured with other game title prior to introducing the
metadata bits.

Fortunately with CMake there's no need to invoke the mt.exe "manifest
tool" manually.

Note that the setting of "per-monitor DPI aware" still leaves openmw
confused, hence the choice of global-DPI-aware.
2018-11-05 16:16:09 +00:00
Andrei Kortunov
92e45507d8 Weapon sheathing support, including quivers and scabbards (feature #4673) 2018-11-05 11:18:20 +04:00
Bret Curtis
c114e1278e
Merge pull request #1978 from akortunov/ffmpeg3
Migrate to FFMPEG3
2018-11-05 07:52:43 +01:00
Bret Curtis
a8d944e756
Merge pull request #2023 from elsid/navmesh_cache_limit
Navmesh cache limit
2018-11-05 07:51:48 +01:00
elsid
6e78fbb538
Double key size for item cache size 2018-11-05 02:21:19 +03:00
elsid
db5638bf6d
Add global recast allocator to allocate temp buffers on stack 2018-11-04 18:11:15 +03:00
Andrei Kortunov
f88d5e808c Rewrite media decoder to use FFMpeg 3.2+ API (task #4686) 2018-11-03 22:34:25 +04:00
elsid
2ba026e2b2
Limit navmesh cache size by data size + key size 2018-11-03 16:14:07 +03:00
Andrei Kortunov
829faf7b2c Improve toggleactorspaths console command 2018-11-03 10:42:14 +04:00
AnyOldName3
b178e1868a Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-03 00:27:40 +00:00
AnyOldName3
3c25e7b93d
Merge pull request #2010 from AnyOldName3/windows-debug-build-fix
Include missing Windows header before calling Windows-specific functions and switch CMake compile definitions to the new style.
2018-11-02 23:57:44 +00:00
AnyOldName3
e2ddb39591 Remove incorrect comment 2018-11-02 17:30:54 +00:00
Capostrophic
1de9674c81 AI package cleanup 2018-11-02 14:58:30 +03:00
Bret Curtis
5f5773f7df
Merge pull request #2009 from elsid/pathfinder_update_tolerance
Use default tolerance to drop last point from path
2018-11-02 00:21:08 +01:00
elsid
c52db75545 Use default tolerance to drop last point from path
Fixes AiEscort. Before actor tried to reach target with 0 tolerance.
Back to logic like it was before 4fe764c3a5 and bbd82a743 commits.
2018-11-02 01:12:41 +03:00
Capostrophic
a4eff1c871 Fix isWithinMaxRange function 2018-11-02 00:22:37 +03:00
AnyOldName3
d0c254bc7e Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-01 16:48:21 +00:00
elsid
792a0585c0 Add recastnavigation as subdirectory 2018-11-01 17:01:22 +01:00
AnyOldName3
0208cb8616
Merge pull request #2001 from AnyOldName3/enable-osg-logging
Allow OSG objects to be sent to the debug log.
2018-10-31 22:14:36 +00:00
AnyOldName3
6bbc1cb308
Remove outdated include 2018-10-31 19:32:52 +00:00
AnyOldName3
93843d024c Remove another duplicate operator<< 2018-10-31 16:26:53 +00:00
Andrei Kortunov
f1eb702851 Mark virtual methods in the mechanicsmanagerimp.hpp as overrides 2018-10-31 10:09:32 +04:00
AnyOldName3
3785ba6aa0 Merge upstream/master 2018-10-30 22:38:09 +00:00
AnyOldName3
eb44de3e6b Disable shadows properly for water reflection/refraction RTT targets, eliminating remaining OpenGL errors. 2018-10-30 22:34:53 +00:00
Bret Curtis
d6c674660a
Merge pull request #1633 from elsid/pathfinder_detour
Use recastnavigation for pathfinding (#2229)
2018-10-30 20:44:13 +01:00
Koncord
e162af0003 [Server] Disallow non void callbacks 2018-10-30 15:32:52 +08:00
Koncord
07a5f5296c [Server] Rework OnRequestPluginList callback. Add AddPluginHash function 2018-10-30 14:56:54 +08:00
Koncord
20a7619a4a [Server] Remove result from the OnPlayerConnect callback
Now it's recommended to use tes3mp.Kick() function
2018-10-30 13:18:32 +08:00
Koncord
f1e8569291 [Server] Remove result from the OnPlayerSendMessage callback 2018-10-30 13:13:07 +08:00
Koncord
efa362031e [Server] Remove unused Main callback 2018-10-30 13:03:37 +08:00
Koncord
b83e4056a8 [Server] Remove CallFF dependency as it not fully supported by Windows and MacOS 2018-10-30 12:59:47 +08:00
Koncord
585557ad8a [Server] Remove argument cast in the Call with va_args 2018-10-30 12:58:15 +08:00
Koncord
3101de5f02 [Server] Add kicked load status 2018-10-30 12:56:50 +08:00
Bret Curtis
3c53fe16e9
Merge pull request #1986 from akortunov/rootfix
[Regression] Handle RootCollisionNode exactly as in original engine
2018-10-29 22:47:04 +01:00
Bret Curtis
e65f254f7f
Merge pull request #1999 from akortunov/resurrect
[Regression] Make sure we reset current weapon animation when resurrect actor
2018-10-29 20:43:54 +01:00
Andrei Kortunov
f98fc8d7b4 Make sure we reset current weapon animation when resurrect actor (addition to bug #2626) 2018-10-29 22:47:04 +04:00
Marc Zinnschlag
a5efe0d596 Merged pull request #1998 2018-10-29 10:02:52 +01:00
Capostrophic
434b1fd0e3 Use Shift-C and Shift-V keybindings for View and Preview (feature #2845) 2018-10-29 01:53:49 +03:00
Bret Curtis
7f2baa9373
Merge pull request #1995 from Capostrophic/icons
Add icons for record context menu actions (feature #4506)
2018-10-28 22:22:42 +01:00
Bret Curtis
6f8a15afb0
Merge pull request #1996 from Capostrophic/cleanup
Clean up redundant getClass() calls in classes
2018-10-28 19:39:39 +01:00
Capostrophic
8757b3edd1 Add icons for Edit and Touch actions (kudos to akortunov) 2018-10-28 21:06:42 +03:00
Capostrophic
89b8eb029f Add icons for record context menu actions 2018-10-28 20:35:58 +03:00
Capostrophic
77b0ff7a75 Use real thrown weapon damage in tooltips and weapon rating (feature #4697) 2018-10-28 19:46:46 +03:00
elsid
49d81241db Merge branch 'master' into pathfinder_detour 2018-10-28 17:08:09 +03:00
Capostrophic
4b1d287eda Clean up redundant getClass calls in classes 2018-10-28 17:03:38 +03:00