mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 00:45:32 +00:00
Code Issues Releases Wiki Activity
25126 commits 38 branches 54 tags 122 MiB
Commit graph

18031 commits

Author SHA1 Message Date
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