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
elsid
50b6ae3e10
Fix calculation for shape local AABB
2018-10-28 16:58:22 +03:00
Bret Curtis
e7892361f6
Merge pull request #1994 from akortunov/actor_culling
...
Minor tweaks for actors processing range setting
2018-10-28 14:44:12 +01:00
Bret Curtis
3cd59d4a89
Merge pull request #1993 from akortunov/loadingbar
...
Center progress bar when there are active messageboxes
2018-10-28 14:43:33 +01:00
elsid
abc51a8a17
Add settings option to set max number of polygons per navmesh tile
2018-10-28 15:36:47 +03:00
Andrei Kortunov
06d226a1b7
Minor tweaks for actors processing range setting
2018-10-28 15:08:24 +04:00
Andrei Kortunov
6e05853478
Center progress bar when there are active messageboxes (bug #4691 )
2018-10-28 14:40:48 +04:00
Marc Zinnschlag
9dd0d641bc
Merged pull request #1931
2018-10-28 11:02:33 +01:00
Koncord
e5e13b21ae
[Client] Fix crash on drag&drop
2018-10-28 16:56:04 +08:00
Bret Curtis
9f4892ce92
Merge pull request #1990 from Capostrophic/absorption
...
Avoid making expensive visitEffectSources calls if no spell absorption effect is active
2018-10-27 17:45:48 +02:00
Capostrophic
abdf40e0d5
Avoid making expensive visitEffectSources calls if no spell absorption effect is active
2018-10-27 16:38:04 +03:00
Capostrophic
b6f23cd366
Make constants usage more obvious
2018-10-27 13:27:25 +03:00
David Cernat
c65d6c1328
[Client] Disable mListener methods in mwworld/containerstore
...
This should put an end to frequent crashes until I can fix the problem properly.
2018-10-27 02:19:45 +03:00
Capostrophic
4873d33642
Adjust magic light source linear attenuation (bug #3890 )
2018-10-27 01:27:05 +03:00
Andrei Kortunov
d2f3196ee8
Fix testcase for RootCollisionNode with MRK data
2018-10-26 21:21:34 +04:00
David Cernat
1baf82db32
[Client] Avoid PlayerSpellbook packet spam in some mods
2018-10-26 19:07:35 +03:00
Marc Zinnschlag
3ead33814f
Merge remote-tracking branch 'upstream/master'
2018-10-26 13:02:06 +02:00
Capostrophic
19ce1abcdf
Fix selected weapon HUD durability percentage
2018-10-26 12:53:15 +03:00
Andrei Kortunov
bf9e8c4556
Make spell absorption multiplicative (bug #4684 )
2018-10-26 12:36:58 +04:00
David Cernat
d9bc1abf48
[Client] Don't send ObjectScale packets if not logged in
2018-10-26 02:33:47 +03:00
David Cernat
a8cf1e02c4
[Client] Allow unilateral scripted container changes not from console
...
This prevents infinite loops in certain client scripts from mods that use while loops to determine that all items of a certain type have been removed from a container, such as in the script BCSwap2Arg from Better_Clothes.
2018-10-25 22:38:45 +03:00
Andrei Kortunov
e7de6b974a
Optimize actors processing
...
1. Do not update physics and animations for actors outside processing range (bug #4647 )
2. Do not render such actors
3. Add transparency to actors near processing border, so they will not pop up suddenly
2018-10-25 22:52:59 +04:00
Bret Curtis
0fad2449f3
Merge pull request #1982 from Capostrophic/condition
...
Avoid item condition and charge zero divisions
2018-10-25 17:22:02 +02:00
Capostrophic
c3e8d536cd
Implement getNormalizedEnchantmentCharge() method and use it
2018-10-25 16:16:07 +03:00
Capostrophic
54bd7b2dcf
Implement getItemNormalizedHealth() method and use it
2018-10-25 15:45:31 +03:00
Marc Zinnschlag
2c8bbde7ef
Merged pull request #1979
2018-10-25 11:16:26 +02:00
Marc Zinnschlag
4d88d6dd58
Merged pull request #1980
2018-10-25 11:06:22 +02:00
Bret Curtis
375354ab6b
Merge pull request #1974 from akortunov/coverity
...
Fix some issues found by Coverity Scan
2018-10-25 09:42:51 +02:00
AnyOldName3
1e2bf9c447
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-10-24 20:13:13 +01:00
Capostrophic
67de61e1fb
Avoid item condition and charge zero divisions
2018-10-24 19:06:55 +03:00
Capostrophic
4ce35c6ad5
Fix fixme behavior in interiors
2018-10-24 01:43:38 +03:00
David Cernat
99f8ef88a5
[Server] Add SetObjectActivatingPid() script function
2018-10-22 16:25:50 +03:00
Andrei Kortunov
61e6e359c4
Allow creatures to use the autogenerated collision box (feature #2787 )
2018-10-22 15:48:23 +04:00
David Cernat
17f13872aa
[Client] Use forceUpdate correctly in LocalPlayer::updateStatsDynamic()
...
Previously, the forceUpdate argument was useless, preventing dynamic stats from being sent by certain newly created characters.
2018-10-22 13:22:23 +03:00
Capostrophic
9809eef18e
Utilize the default soundgen entries when necessary (bug #4689 )
2018-10-21 11:32:23 +03:00
Andrei Kortunov
41e90bd56c
Unify random generator usage
2018-10-19 16:16:18 +04:00
Andrei Kortunov
46bf45a6e2
Remove redundant code
2018-10-19 16:16:18 +04:00
Bret Curtis
6c4116cc8b
Merge pull request #1972 from akortunov/equipfix
...
Force actor to the 'weapon equipped' state if the weapon disappeared in the middle of attack
2018-10-18 16:43:05 +02:00
Andrei Kortunov
8fa0ffcfe4
Catch exceptions inside the loadVoice() (bug #4685 )
2018-10-18 15:02:23 +04:00
Andrei Kortunov
d7d9050d4a
Force actor to the 'weapon equipped' state if the weapon disappeared in the middle of attack (bug #4646 )
2018-10-18 11:42:03 +04:00
AnyOldName3
474770eca8
Switch shadow map rendering to a specialised, simplified shader.
2018-10-16 21:23:31 +01:00
Bret Curtis
e406c5ff81
Merge pull request #1946 from akortunov/backupfix
...
Combat AI: check for obstacle before back up
2018-10-16 21:47:21 +02:00
Andrei Kortunov
13bd81f896
Try to use collisions from basic actor model if an animated one has no collisions (feature #4682 )
2018-10-16 22:28:19 +04:00
David Cernat
bfd7c83c4d
[Client] Fix backwards logic when setting type for AI attacks
2018-10-16 21:18:41 +03:00
elsid
03d4ce5e49
Log find path exception with level verbose, add more info to message
2018-10-15 23:25:42 +03:00
Bret Curtis
8cb407cfdf
Merge pull request #1969 from Capostrophic/soundgen
...
Support soundgen calls for activators (feature #4285 )
2018-10-15 14:43:11 +02:00
Capostrophic
bf3f82b9d4
Cleanup
2018-10-14 21:28:43 +03:00
Capostrophic
6ef7be3fd3
Re-enable using soundgen land for creatures
2018-10-14 20:18:17 +03:00
Capostrophic
19fd404b7b
Support soundgen calls for activators (feature #4285 )
2018-10-14 15:36:07 +03:00
Andrei Kortunov
ca07e3a364
Check for obstacle before back up (bug #4656 )
2018-10-14 12:22:43 +04:00
elsid
e57504ae7c
Lower log level
2018-10-13 22:22:15 +03:00
elsid
ed73d130f9
Cache navmesh tiles
...
Use LRU modification to hold currently used items. Use RecastMesh binary
data for item key.
Store original pointer of btCollisionShape in user pointer to make available
it as an identifier within all duplicates. Use pointer to heights data array
for btHeightfieldTerrainShape.
2018-10-13 22:22:12 +03:00
elsid
1a27489904
Add special type for object id
2018-10-13 22:16:35 +03:00
elsid
7c80bb9411
Support multiple threads for async nav mesh updater
2018-10-13 22:16:34 +03:00
elsid
7c5bedc35a
Reset shorcutting if actor can't move by z-axis on reaction time
...
If actor was shortcutting because it was swimming, then when it started
walking it still be shortcutting, but there will be no new path, because
shortcut path builds only for actor able moving by z-axis and pathfinder
path only for not shortcutting actor.
2018-10-13 22:16:34 +03:00
elsid
92b34e8bb4
Check whether can actor move along z-axis in separate function
2018-10-13 22:16:34 +03:00
elsid
bbd82a743a
Use different tolerance for path point and destination
2018-10-13 22:16:34 +03:00
elsid
ab090108cb
Assign world to local variable once per function
2018-10-13 22:16:34 +03:00
elsid
27a74725f1
Use osg::Vec3f
2018-10-13 22:16:34 +03:00
elsid
ff478aba6d
Use actor half extent for interior cells
2018-10-13 22:16:33 +03:00
elsid
346e9e3141
Add off mesh connections for doors without teleport
2018-10-13 22:16:33 +03:00
elsid
f8dbd5902f
Update doors objects in navigator
2018-10-13 22:16:33 +03:00
elsid
661da42bd2
Build path by navigator
2018-10-13 22:16:33 +03:00
elsid
d02beae5a8
Find path for actors according to their abilities to swim and walk
2018-10-13 22:16:33 +03:00
elsid
dc09674362
Add command and settings option to enable actors paths render
2018-10-13 22:16:32 +03:00
elsid
c95cea414c
Support water for NavMesh
2018-10-13 22:16:32 +03:00
elsid
72f211ef28
Add enums for area type and flags
2018-10-13 22:16:32 +03:00
elsid
fa23b590a4
Add unwalkable areas to NavMesh
2018-10-13 22:16:32 +03:00
elsid
f6a60790f8
Create collision shape for all avoided nodes
2018-10-13 22:16:31 +03:00
elsid
c3298d13a6
Add log sinks (stdout and file)
2018-10-13 22:16:31 +03:00
elsid
144e1a063b
Support animated objects
2018-10-13 22:16:30 +03:00
elsid
4aba0fa85f
Limit number of NavMesh tiles to add by distance from player tile
2018-10-13 22:16:30 +03:00
elsid
d2fd9abd51
Split RecastMesh into tiles
2018-10-13 22:16:30 +03:00
elsid
dbb1d99bff
Add NavMeshItem generation to fix update NavMesh for render
2018-10-13 22:16:30 +03:00
elsid
6f3028b8f9
Update navigator when unload cell or add/remove object to scene
2018-10-13 22:16:29 +03:00
elsid
937e8e1803
Allow to create empty RecastMesh
2018-10-13 22:16:29 +03:00
elsid
faaf50446d
Option to initially enable NavMesh render
2018-10-13 22:16:28 +03:00
elsid
02ce4a7e50
Log to detournavigator log cell load and unload
2018-10-13 22:16:28 +03:00
elsid
ed3a255f65
Do not use NavMesh to find changed tiles
2018-10-13 22:16:28 +03:00
elsid
d1e71f9322
Support btBoxShape for RecastMesh
2018-10-13 22:16:28 +03:00
elsid
70a369f70e
Add command to enable NavMesh render
...
togglenavmesh or tnm
2018-10-13 22:16:28 +03:00
elsid
dd5e6a61a3
Support btCompoundShape for RecastMesh
2018-10-13 22:16:27 +03:00
elsid
373adc6ec4
Option to enable/disable file names revisions
2018-10-13 22:16:27 +03:00
elsid
d1d034a1ec
Update NavMesh one by one tile in order from nearest to player
2018-10-13 22:16:26 +03:00
elsid
41caca24ee
Options to enable/disable write recast mesh and nav mesh into file
2018-10-13 22:16:26 +03:00
elsid
6d233ae868
Option in settings to enable/disable detour navigator debug log
2018-10-13 22:16:26 +03:00
elsid
0c8db84962
Load cells in order from nearest to player to furthest
2018-10-13 22:16:26 +03:00
elsid
0c8a7295e6
Use only player's half extents
2018-10-13 22:16:25 +03:00
elsid
fafba8ea0c
Use recastnavigation to find path
2018-10-13 22:16:25 +03:00
elsid
3d97e96f55
Add dependency to recastnavigation
2018-10-13 22:16:25 +03:00
elsid
e707202f88
Use local constant
2018-10-13 22:16:24 +03:00
elsid
ed89126828
Fix warning implicit conversion changes singedness
2018-10-13 22:16:24 +03:00
elsid
c866fdff86
Move physics object, heightfield, ptrholder into separate files
2018-10-13 22:16:24 +03:00
elsid
4fe764c3a5
Update and check for complete Pathfinder path by different methods
2018-10-13 22:16:24 +03:00
elsid
b6dd2119a6
Make Pathfinder constructor inline
2018-10-13 22:16:24 +03:00
elsid
92f52287bf
Make PathFinder::ClearPath inline
2018-10-13 22:16:24 +03:00
elsid
3655f19373
Set PathFinder::mCell to nullptr when clear path
2018-10-13 22:16:23 +03:00
elsid
85bbf9d034
Clear path without check for empty
2018-10-13 22:16:23 +03:00
elsid
ca3d0594b3
Do not store pointer to Pathgrid in PathFinder
2018-10-13 22:16:23 +03:00
elsid
3565d92e11
Make PathFinder::getPathCell inline
2018-10-13 22:16:23 +03:00
elsid
2ad3543088
Fix constant style
2018-10-13 22:16:23 +03:00
elsid
f9c651bdf3
Add const
2018-10-13 22:16:23 +03:00
elsid
2c464bd682
Evade obstacles after set rotation
2018-10-13 22:16:22 +03:00
elsid
eb10add0c4
Remove unused parameters
2018-10-13 22:16:22 +03:00
elsid
66e5a4d591
Remove useless variable
2018-10-13 22:16:22 +03:00
elsid
1a95b7a154
Remove duplicate zTurn call
2018-10-13 22:16:22 +03:00
elsid
d0bc1b75e8
Remove unused parameters
2018-10-13 22:16:22 +03:00
elsid
63b3a70ca8
Remove useless else
2018-10-13 22:16:22 +03:00
elsid
c9f3064cbd
Update ObstacleCheck once per frame
2018-10-13 22:16:22 +03:00
elsid
ad027d13fa
Remove unused
2018-10-13 22:16:21 +03:00
elsid
6d89241178
Check is path completed by osg::Vec3f position
2018-10-13 22:16:21 +03:00
elsid
2c6daa74a9
Simplify PathFinder::checkPathCompleted
2018-10-13 22:16:21 +03:00
elsid
6411c1955d
Fix indent
2018-10-13 22:16:21 +03:00
elsid
d3667945c5
Remove unused functions
2018-10-13 22:16:21 +03:00
elsid
31340a212a
Fix functions name style
2018-10-13 22:16:21 +03:00
elsid
2f424f6be2
Store aStarSearch result to deque
2018-10-13 22:16:20 +03:00
elsid
9b3756f8bc
Store path points in deque
2018-10-13 22:16:20 +03:00
elsid
925d909fea
Use rbegin
2018-10-13 22:16:20 +03:00
elsid
fbaa525c6f
Fix warning
2018-10-13 22:16:20 +03:00
elsid
4d868bec92
Use osg::Vec3f to store path nodes in Pathfinder
2018-10-13 22:16:20 +03:00
elsid
33dfe284bd
Mark local variables const which one does not change
2018-10-13 22:16:20 +03:00
elsid
0cfdf0c7b6
Remove unused virtual
2018-10-13 22:16:20 +03:00
David Cernat
d9dd7073cf
[General] Send certain packets only when logged in
...
Previously, client mods adding packet-sending scripts to the spawn area made clients send the associated packets as soon as they inputted their character name when joining a server using those mods. This made the clients either get disconnected for not replying to a handshake first, or it made them get kicked for sending object packets that are disallowed for players who are not logged in.
To fix this, LocalPlayer's hasFinishedCharGen() has been replaced with isLoggedIn(), because the former was already returning true when players inputted their names.
2018-10-13 15:36:13 +03:00
David Cernat
66d666d60c
[Client] Use less confusing terminology when displaying plugin mismatch
2018-10-13 14:40:49 +03:00
Marc Zinnschlag
b30e309532
Merged pull request #1967
2018-10-13 11:15:45 +02:00
David Cernat
bb834748c5
[Server] Log player kicks
2018-10-13 09:34:29 +03:00
David Cernat
a3111fbcc1
[Server] Use clearer error message when failing to bind port
2018-10-13 08:35:07 +03:00
Andrei Kortunov
dad0b78901
Avoid overflow when handling output characters (bug #4676 )
2018-10-12 20:41:03 +04:00
Sam Hellawell
df1667b6e4
Cleanup fix for equip item crash on Linux
...
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2018-10-11 21:49:24 +01:00
Sam Hellawell
1e171ad9fd
Fix crash when equipping item on linux
...
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2018-10-11 20:13:22 +01:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Capostrophic
47b1b0ac39
Re-fix water reflections while making a no-GUI screenshot
2018-10-10 22:44:26 +03:00
Capostrophic
4ec727c50b
Disallow to open the journal while settings window is open (bug #4674 )
2018-10-10 18:33:56 +03:00
Marc Zinnschlag
2d87d1d9d2
Merged pull request #1959
2018-10-10 15:05:29 +02:00
Marc Zinnschlag
d466785aa7
Merged pull request #1958
2018-10-10 15:04:32 +02:00
Marc Zinnschlag
38a3632be7
Merged pull request #1960
2018-10-10 14:56:51 +02:00
Andrei Kortunov
5617bb3f0c
Improve pitch factor handling for crossbow animations (bug #4672 )
2018-10-09 11:35:28 +04:00
David Cernat
e402a17757
[Client] Don't cast non-weapons to weapons in isUsingRangedWeapon()
...
This makes lockpicks and probes work again.
2018-10-09 09:54:13 +03:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Capostrophic
09aecb955c
getSkill usage cleanup (bug #4671 )
2018-10-08 17:06:30 +03:00
Capostrophic
cae2e84ab4
Trace the player down after enabling collision with TCL (bug #4669 )
2018-10-08 16:15:15 +03:00
Capostrophic
768c532b8f
Editor: display light source color as a color (bug #4668 )
2018-10-07 19:43:51 +03:00
Marc Zinnschlag
71f80db886
Merged pull request #1954
2018-10-07 11:25:32 +02:00
Bret Curtis
585313a71f
Merge pull request #1953 from Capostrophic/animation
...
Fix first person swimming animations
2018-10-06 14:24:48 +02:00
Capostrophic
03788edd63
Fix redundant drag call in instance dragging (bug #4593 )
2018-10-05 18:48:17 +03:00
Capostrophic
34e45efac3
Fix first person swimming animations
2018-10-05 17:29:49 +03:00
Marc Zinnschlag
503352e840
Merged pull request #1951
2018-10-03 13:23:56 +02:00
Marc Zinnschlag
b410d87aae
Merged pull request #1952
2018-10-03 13:19:28 +02:00
David Cernat
292536439e
[Server] Rename script functions for clearing packet vectors for players
2018-10-03 02:26:47 +03:00
Andrei Kortunov
07ccc5abdb
Remove non-looping effects after rest
2018-10-01 21:57:13 +04:00
Andrei Kortunov
3896a2eba6
Do not use a PartHolder for spell effect node
2018-10-01 20:18:20 +04:00
Andrei Kortunov
632045e145
Improve the 'part has no parents' warning
2018-10-01 20:18:19 +04:00
Andrei Kortunov
4dc424036f
Cleanup magic effects, when create a new ActorAnimation
2018-10-01 20:17:58 +04:00
David Cernat
c79660f721
[Server] Make inventory script functions consistent with others
...
Functions that add elements to a vector should not change the action. This fixes the last remaining oddity in Koncord's original implementation of inventory sync.
2018-10-01 18:29:50 +03:00
Capostrophic
674e33170b
Fix quick key system regressions (bug #4662 )
2018-09-30 21:16:02 +03:00
Marc Zinnschlag
38758a9555
Merged pull request #1944
2018-09-29 11:16:14 +02:00
Andrei Kortunov
43c7438e8e
Move WeakCache to components/misc
2018-09-28 16:47:47 +04:00
Marc Zinnschlag
33044add97
Merged pull request #1938
2018-09-28 11:31:45 +02:00
Marc Zinnschlag
3dc15d39e3
Merged pull request #1936
2018-09-28 11:30:13 +02:00
Capostrophic
2e98cad895
Fade out sun glare and specularity completely at night start, not sunset start
2018-09-27 17:34:46 +03:00
Andrei Kortunov
35abf7367c
Implement wearing priority for editor
2018-09-27 18:22:17 +04:00
Andrei Kortunov
ac848b0902
Use male bodyparts as fallback for females in the editor
2018-09-27 13:14:59 +04:00
Kyle Cooley
0096951f25
cleanup
2018-09-27 13:14:59 +04:00
Kyle Cooley
676fc48855
Re-add logic for empty model
2018-09-27 13:14:59 +04:00
Kyle Cooley
f43b70d77b
Centralize actor data, simplify logic
2018-09-27 13:14:59 +04:00
Kyle Cooley
c1ec926f43
Workaround inconsistencies with record status changes
2018-09-27 13:14:59 +04:00
Kyle Cooley
1518d630ca
Fix issue with body part events not propogating to actors
2018-09-27 13:14:59 +04:00
Kyle Cooley
031502b2ab
Reorganize ActorAdapter data, use weak cache for sharing
2018-09-27 13:14:59 +04:00
Kyle Cooley
2a9ebac572
Simplify update logic, update when race parts are changed.
2018-09-27 13:14:59 +04:00
Kyle Cooley
1276e0fa9b
Handle changes to race record when rendering actors
2018-09-27 13:14:59 +04:00
Kyle Cooley
b2115b60e6
Fix qt4 build
2018-09-27 13:14:59 +04:00
Kyle Cooley
6bece13a32
Use new Log class for error message
2018-09-27 13:14:59 +04:00
Kyle Cooley
97ac0a92dd
Move data handling out of rendering code, equip armor/clothes
2018-09-27 13:14:59 +04:00
Kyle Cooley
6b42f37918
Handle creatures too
2018-09-27 13:14:59 +04:00
Kyle Cooley
e2ac392a40
Move common stuff to scene util, fix errors with 1st person meshes
2018-09-27 13:14:59 +04:00
Kyle Cooley
8444ee9981
Start rendering npc's
2018-09-27 13:14:59 +04:00
Marc Zinnschlag
5fa9b32e76
Merged pull request #1937
2018-09-27 11:06:21 +02:00
Marc Zinnschlag
43880ca47b
Merged pull request #1919
2018-09-27 11:06:00 +02:00
Marc Zinnschlag
8b30f15df7
Merged pull request #1942
2018-09-27 11:05:22 +02:00
Marc Zinnschlag
c566514c9d
Merged pull request #1940
2018-09-27 10:50:04 +02:00
Andrei Kortunov
ee4ca87352
Traverse child nodes of cell node in the editor (bug #4654 )
2018-09-26 23:13:18 +04:00
Capostrophic
ba2fd8b795
Rename reflected absorb spells setting and add it to Advanced tab
2018-09-26 21:21:03 +03:00
Andrei Kortunov
8af021d729
Restore dynamic stats for actors in inactive cells (bug #1875 )
2018-09-26 07:46:28 +04:00
David Cernat
b76e00c66e
[Server] Call OnPlayerCellChange script event near start of cell change
...
This makes it possible to send custom records used by players for their equipment before the hardcoded exchange of equipment packets takes place.
Additionally, remove the check for dead players because it has no real use and can potentially cause problems.
2018-09-26 02:40:21 +03:00
Andrei Kortunov
0176ee389e
Handle length of UTF-8 strings properly in plugin metadata (bug #4653 )
2018-09-25 21:40:26 +04:00
Andrei Kortunov
bce8de5fe9
Respect selected encoding in the content selector (bug #4467 )
2018-09-25 21:39:18 +04:00
Capostrophic
d2cad229f8
Ugly hack: don't reset player idle and movement animations in first person view
2018-09-25 17:09:54 +03:00
Marc Zinnschlag
0e06a25f21
Merged pull request #1935
2018-09-25 12:11:20 +02:00
Capostrophic
77fb4d6dd2
Make sure the idle animations are reset while jumping
2018-09-24 19:30:02 +03:00
Capostrophic
56ef11b023
Reset sneak and swim idle animations when moving
2018-09-24 19:30:02 +03:00
Capostrophic
713330351b
Experimental animation regression fixes
...
Don't unnecessarily start movement and jump animations from loop start
Don't play movement animation until jumping animation finishes
2018-09-24 19:30:02 +03:00
Sergey Fukanchik
b2a52a5b6c
Change 'after function'-style doxygen comment to normal.
2018-09-24 14:59:10 +03:00
Marc Zinnschlag
6ce6108eb4
Merged pull request #1932
2018-09-24 11:57:08 +02:00
Marc Zinnschlag
84a2752db9
Merged pull request #1933
2018-09-24 11:53:07 +02:00
David Cernat
f100a660d4
[General] Fix ranged attack sync when using last throwing weapon or ammo
2018-09-24 11:30:53 +03:00
David Cernat
3f304866fd
[Client] Use clearer variable names in DedicatedPlayer::setEquipment()
2018-09-24 10:11:42 +03:00
Sergey Fukanchik
f00f35ba86
Add const to canRest()
2018-09-23 06:25:20 +03:00
Sergey Fukanchik
f2e11e6def
Fix MSVC C4596 illegal qualified name
2018-09-23 04:06:29 +03:00
Capostrophic
52da65b776
Fix issues with sun specularity (bug #4527 )
2018-09-23 03:39:06 +03:00
Sergey Fukanchik
44bcd9b25f
Fix tab characters
2018-09-23 02:46:29 +03:00
David Cernat
995d20348f
[General] Always use correct ranged weapon & ammo for ranged attack sync
...
Previously, the player's currently selected weapon was being used in ranged attacks as in the original melee-oriented attack sync, which meant that shooting one type of projectile and then equipping another while the old projectile was still in the air turned the old projectile into the new projectile upon impact.
Additionally, avoid running most of the code in MechanicsHelper::assignAttackTarget() for non-hitting melee and ranged attacks.
2018-09-23 02:30:31 +03:00
Sergey Fukanchik
c50ee22772
Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest().
2018-09-23 01:52:56 +03:00
Andrei Kortunov
cd60d4fdf0
Store character controller in the variable make code less bulk
2018-09-22 21:13:00 +04:00
Andrei Kortunov
2ac2d01432
Optimize drowning state update
2018-09-22 21:12:56 +04:00
Andrei Kortunov
90d35aaa8f
Handle current health level during levelup (bug #4649 )
2018-09-22 07:48:47 +04:00
Andrei Kortunov
b3fd173e00
Check if current weapon has health at all in HUD (bug #4648 )
2018-09-22 06:51:56 +04:00
Andrei Kortunov
1634284739
Cache player's position outside of loops
2018-09-21 22:39:47 +04:00
Andrei Kortunov
b9346798c6
Optimize combat music update
2018-09-21 22:34:18 +04:00
Andrei Kortunov
fb484c6fde
Optimize AI loop a bit
2018-09-21 19:02:28 +04:00
Marc Zinnschlag
7be9f2ca45
Merged pull request #1891
2018-09-21 11:38:19 +02:00
Andrei Kortunov
01b3f92f7e
Make coc and fixme console commands close to vanilla (bug #4292 , bug #4217 )
2018-09-20 16:25:02 +04:00
Andrei Kortunov
bdd9eba2b8
Use C++ limits instead of C ones
2018-09-20 16:02:26 +04:00
Andrei Kortunov
276b7830a9
Mass potion creation (feature #4642 )
2018-09-20 15:45:14 +04:00
Marc Zinnschlag
3761aaadfd
Merged pull request #1928
2018-09-20 13:31:56 +02:00
Marc Zinnschlag
82d37dda20
Merged pull request #1927
2018-09-20 13:31:41 +02:00
Marc Zinnschlag
29bc5cbecf
Merged pull request #1925
2018-09-20 13:14:55 +02:00
Andrei Kortunov
6f4f6a155f
Combat AI: take ranged weapon speed in account
2018-09-19 12:23:24 +04:00
Andrei Kortunov
62f6f174cf
Show attack speed of ranged weapons
2018-09-19 12:23:21 +04:00
Andrei Kortunov
989de05f80
Do not show duration for infinite light sources as -1
2018-09-18 15:23:16 +04:00
David Cernat
b5f46ada73
[General] Synchronize projectile speed for ranged attacks
...
This is done by including the final attackStrength used for ranged attacks in packets and then applying it in WeaponAnimation::releaseArrow() on other clients.
2018-09-18 01:13:48 +03:00
Andrei Kortunov
6d0e6ab012
Use book font by default in the text formatter
2018-09-17 22:24:21 +04:00
Andrei Kortunov
dda02bd696
Do not use book fonts for dialogue window
2018-09-17 19:56:36 +04:00
Andrei Kortunov
70ed8fd1a9
Use constants instead of widely used magic numbers (task #4645 )
2018-09-17 19:22:50 +04:00
Bret Curtis
07be9ae8ac
Merge pull request #1926 from akortunov/warnfix
...
Fix MSVC warning about possibly uninitialized movestate variable
2018-09-17 17:10:25 +02:00
Andrei Kortunov
9c8fc0557a
Fix MSVC warning about possibly uninitialized movestate variable
2018-09-17 14:45:16 +04:00
Marc Zinnschlag
06b2a23e74
Merged pull request #1768
2018-09-17 12:10:21 +02:00
Marc Zinnschlag
d76367918a
Merged pull request #1907
2018-09-17 12:10:00 +02:00
Marc Zinnschlag
c6b62308cd
Merged pull request #1921
2018-09-17 12:02:44 +02:00
Marc Zinnschlag
29f6ee30a6
Merged pull request #1922
2018-09-17 12:00:49 +02:00
Andrei Kortunov
2961f0d810
Allow to use the %Name for creatures (bug #4644 )
2018-09-16 21:53:28 +04:00
Capostrophic
95aa05e41b
Tweaks to script parser messages and pathgrid warnings
2018-09-16 16:47:33 +03:00
David Cernat
7281f9fc42
[Client] Prevent unilateral paralysis of dedicated players & actors
...
This is a temporary workaround until active effect synchronization is implemented.
2018-09-16 15:34:57 +03:00
Andrei Kortunov
ae1c054635
Make GetPCJumping return true only when jumping (bug #4641 )
2018-09-16 11:58:01 +04:00
Capostrophic
5909297809
Make underwater SFX always apply based on camera position (bug #4532 )
2018-09-15 23:26:07 +03:00
David Cernat
33a0886790
[Client] Fix synchronization of knockdown states
2018-09-15 04:59:06 +03:00
David Cernat
490303dc0b
[Client] Clean up MechanicsHelper::processAttack() slightly
...
The debug is now more descriptive and some code is now skipped for non-ranged attacks.
2018-09-15 04:11:43 +03:00
Capostrophic
5a86554f97
Cleanup
2018-09-14 21:55:50 +03:00
Capostrophic
c025427575
Implement enchantment record effect list verification (feature #1617 )
2018-09-14 21:06:50 +03:00
Capostrophic
d6560d3f20
Make several messages more strict and clean up topic info verifier
2018-09-14 21:06:50 +03:00
Capostrophic
5d1c1f25f7
Remove now redundant NPC fields checks
2018-09-14 21:06:50 +03:00
Capostrophic
015cd6064f
Implement basic enchantment record verifier (feature #1617 )
2018-09-14 21:06:50 +03:00
Capostrophic
dabdb0bfaf
Get rid of deprecated Messages::push_back()
2018-09-14 21:06:50 +03:00
Capostrophic
47b9008743
Renovate reference record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
0bdb7ea92f
Cleanup
2018-09-14 21:06:50 +03:00
Capostrophic
34ffaa2fe2
Make finishing touches to object record verifiers
2018-09-14 21:06:50 +03:00
Capostrophic
d1b2fc11ef
Use messages::add in object record verifiers
...
Add NPC head and hair body part existence checks and expand creature record verifier, update playable class checks in class record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
85dc1e4ef2
Revert unnecessary universalid changes in Journal record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
e1ae7a9b0e
Avoid duplicate duplicate pathgrid point warnings
2018-09-14 21:06:50 +03:00
Capostrophic
1e5330d9da
Use Messages::add in skill record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
35281d7c38
Use Messages::add in race, soundgen, spell and start script record verifiers
2018-09-14 21:06:50 +03:00
Capostrophic
b2b9bd94f0
Fix bolt object type
2018-09-14 21:06:50 +03:00
Capostrophic
8dcb58d745
Use Messages::add in Faction, Sound, Bodypart and Class record verifiers
2018-09-14 21:06:50 +03:00
Capostrophic
d433929194
Use Messages::add in birthsign record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
6b226eef8f
Use Messages::add in magic effect record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
5b8880c6fa
Update cell reference record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
dc847dce09
Add item icon checks to object record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
34077a6987
Purge unnecessary namespaces
2018-09-14 21:06:50 +03:00
Capostrophic
d90940011f
Add model checks to object record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
38ea7928f5
Add sound file checks to sound record verifier
2018-09-14 21:06:50 +03:00
Capostrophic
1f717def35
Update journal, start script and spell verifiers messages
2018-09-14 21:06:50 +03:00
Capostrophic
a6d3cd9190
Update topic info verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
14ef145b3b
Update region and pathgrid record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
a9ce155a7b
Update faction and body part record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
7535daa94d
Update class and race record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
fd1a3ad88d
Update object and script record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
cf7a8c5775
Update soundgen record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
5249492a31
Update skill record verifier messages
2018-09-14 21:06:50 +03:00
Capostrophic
51fdb94e34
Add texture check to birthsign verifier
2018-09-14 21:06:50 +03:00
Capostrophic
d3aa5840ec
Refactor magic effect record verifying
2018-09-14 21:06:50 +03:00
Bret Curtis
6035636e29
Merge pull request #1915 from akortunov/enterfix
...
Disable repeating for Accept GUI action
2018-09-14 15:17:47 +02:00
David Cernat
9d2dc96a2e
[Client] Use RANGED type for ranged attacks that haven't hit a target
2018-09-14 13:23:43 +03:00
David Cernat
af49f711ca
[Client] Add isUsingRangedWeapon() method to MechanicsHelper
2018-09-14 13:21:45 +03:00
Marc Zinnschlag
a0f7282966
Merged pull request #1820
2018-09-14 11:44:06 +02:00
Marc Zinnschlag
ea053d9f47
Merged pull request #1881
2018-09-14 11:43:11 +02:00
Andrei Kortunov
6066f02010
Do not use universal IDs for menu items
2018-09-13 22:15:59 +04:00
Marc Zinnschlag
252ed9bd4b
Merged pull request #1914
2018-09-13 11:53:21 +02:00
Andrei Kortunov
275d10e1f7
Add missing icons for UniversalId tables and use them in the editor menu (feature #912 )
2018-09-12 22:37:19 +04:00
Capostrophic
664c630ac0
Don't make sTo strings static references
2018-09-12 16:36:03 +03:00
Andrei Kortunov
e300a16b24
Use field for columns count instead of out integer
2018-09-12 14:31:01 +04:00
Andrei Kortunov
7a986f38da
Support for user-defined TrueType fonts
2018-09-12 14:31:01 +04:00
Andrei Kortunov
c9c0230d2a
Scale journal fonts separately from common ones
2018-09-12 14:31:01 +04:00
Andrei Kortunov
f89393fd62
Validate 'ttf resolution' option value
2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca
Improve GUI scaling (bug #3288 )
2018-09-12 14:31:01 +04:00
Marc Zinnschlag
6100e34051
Merged pull request #1912
2018-09-12 12:04:49 +02:00
Marc Zinnschlag
2ba15c86f8
Merged pull request #1913
2018-09-12 12:01:13 +02:00
Marc Zinnschlag
3fd40e4a4e
Merged pull request #1916
2018-09-12 11:58:39 +02:00
Marc Zinnschlag
50775dd411
Merged pull request #1917
2018-09-12 11:38:52 +02:00
Andrei Kortunov
0136f0552b
Do not update mIdleState directly
2018-09-11 22:24:44 +04:00
Andrei Kortunov
929d78d6a3
Randomize attacks for non-bipedal creatures with Weapon flag
2018-09-11 22:24:44 +04:00
Andrei Kortunov
0440c11ccd
Fix swim crossbow animations
2018-09-11 22:24:44 +04:00
David Cernat
3f6ca6f22b
[Client] Bring drawState fallback for actors up-to-date w/ attack types
2018-09-11 15:12:11 +03:00
David Cernat
9d2cf6629b
[Client] Fix logic for hand-to-hand attack sync
2018-09-11 15:07:44 +03:00
David Cernat
fcd31bf4a6
[General] Fix problems with the synchronization of ranged attacks
...
Projectile hits now send Attack packets with RANGED attacks, and their success or failure is now synchronized.
Strike enchantments no longer require a valid victim to be synchronized.
Additional debug messages have been added for attacks.
2018-09-11 11:56:45 +03:00
Andrei Kortunov
9918212a1e
Set focus to Close button when opening the container window (bug #4333 )
2018-09-11 11:22:26 +04:00
Andrei Kortunov
c2c24a76a4
Handle MyGUI exceptions inside destructors
2018-09-11 11:11:27 +04:00
Andrei Kortunov
d5bcc49079
Initialize missing struct fields
2018-09-11 11:11:24 +04:00
Andrei Kortunov
e5a81b1f99
Fix some issues, found by Coverity Scan
2018-09-10 16:35:27 +04:00
Andrei Kortunov
dcc1a122f7
Use drag and drop for ActionTake when InventoryWindow is active (bug #4543 )
2018-09-10 15:18:07 +04:00
David Cernat
31a9b77f34
[Client] Reset hitPosition in MechanicsHelper::resetAttack()
2018-09-10 12:34:33 +03:00
David Cernat
7d221509cd
[Client] Move item magic hook to correct location
...
Previously, synchronization for strike enchantments was partially broken because it triggered the sending of ITEM_MAGIC attack packets, which are only supposed to be sent when a spell is cast from a magical inventory item.
2018-09-10 12:02:21 +03:00
Andrei Kortunov
269ef7a559
Disable repeating for ENTER key in GUI
2018-09-10 12:55:00 +04:00
David Cernat
c9ad411dd3
[Client] Fix logic for setting applyProjectileEnchantment in attack sync
2018-09-09 22:33:48 +03:00
Andrei Kortunov
33a66b778f
Disable repeating for Accept action in keyboard navigation (bug #4260 )
2018-09-09 23:10:09 +04:00
Capostrophic
702868255a
Use sTo GMST in spellmaking menu (feature #4636 )
2018-09-09 13:56:58 +03:00
Capostrophic
6ab42919cf
Make sure the actor is actually crouching/running before tweaking movement speed
2018-09-08 22:43:09 +03:00
Evil Eye
6705e5aae4
forget about the setting till #2887 is implemented at least
2018-09-08 11:21:43 +02:00
David Cernat
8012d0d7b7
[General] Include hit position in PlayerAttack and ActorAttack packets
2018-09-08 05:29:49 +03:00
David Cernat
dcd4478028
[Client] Always stop sending weather updates when moving to an interior
2018-09-07 08:37:22 +03:00
Evil Eye
bbcdfd4078
Implements vanilla's off-by-one error, fixing #4611
2018-09-06 21:49:50 +02:00
Capostrophic
9408876b58
Utilize AI GMSTs for priority rating (feature #4632 )
...
Fix on-target effect rating calculation
2018-09-06 17:39:37 +03:00
David Cernat
113002ca19
[Client] Return early when processing actors that can't be initialized
2018-09-05 20:03:35 +03:00
Koncord
48f4792bc1
[Server] Add GetMaxPlayers, GetPort and HasPassword functions to API
2018-09-05 18:19:34 +08:00
Bret Curtis
387b3e9e87
Merge pull request #1909 from akortunov/warnfix
...
Fix all MSVC warnings left
2018-09-04 21:11:14 +02:00
Andrei Kortunov
6529883527
Fix MSVC warning C4389
2018-09-04 18:14:51 +04:00
Bret Curtis
86809af2cd
Merge pull request #1908 from akortunov/warnfix
...
Fix some warnings
2018-09-04 16:00:37 +02:00
Andrei Kortunov
aed7c1b2bb
Fix a couple of Clang warnings
2018-09-04 12:37:43 +04:00
Capostrophic
d758b573e2
Fix erroneous assumption that ranged weaponry has speed
...
Restrict speed mult to melee weaponry
2018-09-01 12:13:18 +03:00
Capostrophic
ceb6121b33
Better checks for enemy incapacitation
2018-09-01 12:13:18 +03:00
Capostrophic
2965373ed6
Avoid potential zero division
2018-09-01 12:13:18 +03:00
Capostrophic
e66be02e2e
Account for enemy armor rating in weapon rating
2018-09-01 12:13:18 +03:00
Capostrophic
fa3e45fa7d
Slight cleanup
2018-09-01 12:13:18 +03:00
Capostrophic
533b72eff6
Cache weapon type strings
2018-09-01 12:13:18 +03:00
Capostrophic
00c847db19
Make AI Blind, Sound and Silence effect rating more logical
2018-09-01 12:13:18 +03:00
Capostrophic
374e98d665
Make rateWeapon more sensible and account for weapon speed
2018-09-01 12:13:18 +03:00
Marc Zinnschlag
78a84042ad
Merged pull request #1901
2018-09-01 11:08:24 +02:00
Marc Zinnschlag
3b01355f27
Merged pull request #1895
2018-09-01 11:06:38 +02:00
Marc Zinnschlag
f2981a81c9
Merged pull request #1900
2018-09-01 11:06:10 +02:00
Marc Zinnschlag
ef72024e2c
Merged pull request #1902
2018-09-01 11:01:05 +02:00
Capostrophic
b673cdf70e
Grant Enchant experience even if recharging fails (bug #4622 )
2018-08-30 23:52:33 +03:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Andrei Kortunov
5d54214acb
Optimize combat action iteration
2018-08-29 17:20:34 +04:00
Andrei Kortunov
2cac8b59b1
Use square distance to target
2018-08-29 17:20:32 +04:00
Andrei Kortunov
4c0ef4ddb6
Do not initialize magic schools map every time we access it
2018-08-29 17:20:32 +04:00
Capostrophic
23834b5ed8
Don't apply falling damage twice (bug #4608 )
2018-08-29 15:09:03 +03:00
Capostrophic
b8ba9092cb
Purge effects from all permanent spells with the same ID
2018-08-29 14:09:43 +03:00
Capostrophic
ed1f8f7be7
Remove effects from all active spells with the same ID
2018-08-29 13:52:03 +03:00
Capostrophic
6c47f95677
Make RemoveSpellEffects affect permanent spells (bug #3920 )
...
Also make it remove the effects but not the spells themselves
2018-08-29 13:52:03 +03:00
Marc Zinnschlag
c280a71b33
Merged pull request #1897
2018-08-29 12:15:05 +02:00
Marc Zinnschlag
57922a272c
Merged pull request #1899
2018-08-29 12:13:28 +02:00
Marc Zinnschlag
6fc6fef72e
Merged pull request #1892
2018-08-29 12:08:13 +02:00
Marc Zinnschlag
f05e494f6f
Merged pull request #1894
2018-08-29 12:06:42 +02:00
Marc Zinnschlag
21d414187f
Merged pull request #1896
2018-08-29 12:05:50 +02:00
Marc Zinnschlag
e4e18d6642
Merged pull request #1869
2018-08-29 12:02:56 +02:00
Capostrophic
7f459f0610
Knockdown and godmode fixes
...
Make sure an incapacitated player is not able to jump
Cleanup of redundant player and godmode checks in creature class
Make sure the player is not knocked down while in godmode
2018-08-28 16:42:15 +03:00
Capostrophic
079b60c1ea
Don't allow actors to use sneaking while flying (bug #4618 )
2018-08-28 14:32:03 +03:00
David Cernat
3bd8aa82fe
[General] Reduce inventory-sending hooks to just 2 in ContainerStore
...
Whenever an item is added to or removed from the player's ContainerStore, that player sends a PlayerInventory packet with just that addition or removal.
This eliminates all the unnecessary packet spam related to oversized PlayerInventory packets that had existed in one form or another since the initial implementation of inventory sync in 1b259e2d33
Additionally, move booleans from BasePlayer to LocalPlayer when they are only needed on the client, and make the usage of the isReceivingQuickKeys boolean consistent with the new isReceivingInventory boolean by having them both in the processors of their associated packets.
2018-08-28 05:01:52 +03:00
Capostrophic
2564fcc37e
Apply sneaking offset to camera while the character is in air (bug #4617 )
2018-08-28 03:35:42 +03:00
Andrei Kortunov
8fa6c6f726
Update pinned windows in-game (bug #4560 )
2018-08-27 09:44:04 +04:00
Andrei Kortunov
d448b802ef
Add a small threshold for player turning animations
2018-08-26 22:58:26 +04:00
Andrei Kortunov
60698e6f8a
Optimize new magic effects update system
2018-08-26 21:02:14 +04:00
Sophie Kirschner
a1e076a37e
Merge branch 'master' into pineapple/fix-video-incomplete-type-2
...
Resolve merge issues related to CHANGELOG.md
* master:
Optimize skinning (task #4605 )
Update changelog
Update some comments
Set the OpenAL source offset after setting the buffer
Make Move and MoveWorld console commands move actors standing on moving object (bug #2274 )
Adding Changelog entry
Allow messageboxes arguments to have newline characters (bug #3836 )
Check for impact immediately when launch a projectile (bug #3059 )
Fix gold count calculation in pickupObject (bug #4604 )
Correct special case soundgen comparisons
Move "land" check earlier
Fixes #3681
Play landing sound manually and ignore land soundgen textkeys (bug #2256 )
Make some more optimizations to actor processing loops
Fix freeze in getActorsSidingWith
Addiong missing "to" word
Adding common problems that were previous on the site FAQ
Treat <> and << operators as < and >< and >> as > in scripts
stage1: priorities for event music and other minor improvements to the music system
# Conflicts:
# CHANGELOG.md
2018-08-26 12:05:02 +03:00
Andrei Kortunov
c6dcfd1fce
Do not apply scale twice for animated collision nodes (bug #4607 )
2018-08-25 17:26:17 +04:00
Sophie Kirschner
dd01c4d224
Fix: 'sizeof' to an incomplete type 'Video::VideoPlayer'
...
Alternate solution to same problem reported in https://github.com/OpenMW/openmw/pull/1888
2018-08-25 11:53:43 +03:00
Chris Robinson
c2b3ca9638
Update some comments
...
It wasn't actually a bug in OSX like the comment said, but intended behavior.
2018-08-25 01:24:35 -07:00
Chris Robinson
4e3ae85c11
Set the OpenAL source offset after setting the buffer
...
This is to work around a bug in the Rapture3D driver.
2018-08-25 01:24:35 -07:00
Marc Zinnschlag
c2c595407c
Merged pull request #1883
2018-08-25 10:07:56 +02:00
Marc Zinnschlag
f25a9a6fb3
Merged pull request #1885
2018-08-25 10:00:22 +02:00
Marc Zinnschlag
e203159d70
Merged pull request #1889
2018-08-25 09:50:00 +02:00
Marc Zinnschlag
9816643bef
Merged merge request !39
2018-08-25 09:37:21 +02:00
Andrei Kortunov
de08c1cb1b
Make Move and MoveWorld console commands move actors standing on moving object (bug #2274 )
2018-08-25 10:34:33 +04:00
Andrei Kortunov
3d4f5536d2
Check for impact immediately when launch a projectile (bug #3059 )
2018-08-24 15:03:54 +04:00
Bret Curtis
78d9787212
Merge pull request #1880 from Capostrophic/landing
...
Play landing sound manually and ignore land soundgen textkeys (bug #2256 )
2018-08-23 08:40:55 +02:00
David Cernat
9e58cc82bd
[Server] Set minimum updateRate when communicating with master server
2018-08-23 00:10:49 +03:00
Capostrophic
3f76f1d3ed
Fix gold count calculation in pickupObject (bug #4604 )
2018-08-22 22:35:22 +03:00
Capostrophic
f74ebb64af
Correct special case soundgen comparisons
2018-08-22 16:36:15 +03:00
Capostrophic
ae0a6a22b3
Move "land" check earlier
2018-08-22 14:47:06 +03:00
David Cernat
d1fa57ac14
[General] Switch to new official master server port when using old one
2018-08-22 13:49:17 +03:00
Thunderforge
5a2e9868c1
Fixes #3681
...
This changes the way that the popup works to use [`QtColorDialog::getColor()`](http://doc.qt.io/archives/qt-4.8/qcolordialog.html#getColor ) instead of the problematic open() function. Also makes the button change to create the modal dialog when pushed, rather than being a checkbox of sorts
2018-08-21 22:13:05 -05:00
Capostrophic
2b45fd84ea
Play landing sound manually and ignore land soundgen textkeys (bug #2256 )
2018-08-21 19:03:03 +03:00
Capostrophic
910065f38f
Make some more optimizations to actor processing loops
2018-08-21 17:02:56 +03:00
Capostrophic
b77d733c3e
Fix freeze in getActorsSidingWith
2018-08-21 16:47:29 +03:00
AnyOldName3
25e92481f4
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-21 14:00:58 +01:00
David Cernat
03832f933b
[Client] Send only individual items in PlayerInventory packets
...
For a long time, whenever a PlayerInventory packet was sent, it contained all the items in the player's inventory, because that's how Koncord originally implemented it and I always had too many other priorities to go back and rework it.
From now on, clients only send PlayerInventory packet with the one item added or removed, with the single exception being trading with merchants, where the entire inventory is still sent for the time being.
2018-08-21 10:10:06 +03:00
David Cernat
75a64a69c7
[Server] Add GetInventoryChangesAction() script function
...
Additionally, fix a typo in the description of GetSpellBookChangesAction()
2018-08-21 10:06:40 +03:00
David Cernat
45b011452e
[Client] Combine methods for sending spell packets into a single one
2018-08-21 01:20:30 +03:00
Capostrophic
74229490e4
Use the correct skill for creature AI weapon hit chance rating
2018-08-20 21:38:57 +03:00
David Cernat
140e0ed52c
[Client] Also clear aiActors when clearing ActorList
2018-08-20 20:54:34 +03:00
David Cernat
aed4ca2fd2
[Client] Allow use of baseId for more record types
...
Additionally, don't allow new enchantment records to be created if they have no effects, to avoid a crash.
2018-08-20 15:24:20 +03:00
David Cernat
a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
2018-08-20 14:08:44 +03:00
David Cernat
7efee0e968
[Client] Fix GCC build
2018-08-20 10:15:30 +03:00
Bret Curtis
3c827da702
Merge branch 'master' into combat_anims
2018-08-19 10:03:39 +02:00
Bret Curtis
3b2781bf89
Merge pull request #1720 from akortunov/playvfx
...
Rework spell VFX management
2018-08-19 10:00:38 +02:00
Marc Zinnschlag
20c53594de
Merged merge request !36
2018-08-18 12:06:35 +02:00
James Carty
4489838ea3
Fix incorrect function call
2018-08-17 22:35:04 +01:00
James Carty
513e99148e
Fix function with no return value
2018-08-17 20:18:20 +01:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
Andrei Kortunov
d7ca087f59
AiCast: fix aiming
2018-08-17 12:41:13 +04:00
Andrei Kortunov
31f8bea1dd
Rework spell effects management
2018-08-17 12:41:13 +04:00
Andrei Kortunov
8516aee6e0
Implement getHalfExtents() for non-actor objects
2018-08-17 12:40:01 +04:00
Marc Zinnschlag
088463ebe6
Merged pull request #1868
2018-08-17 09:37:49 +02:00
Marc Zinnschlag
ebdb991225
Merged pull request #1875
2018-08-17 09:37:12 +02:00
Marc Zinnschlag
3489951410
Merged pull request #1866
2018-08-17 09:36:44 +02:00
Capostrophic
ce78a34010
Use container ID in Equip command warning
2018-08-17 03:32:33 +03:00
Capostrophic
372697489b
Fix Equip command infinite loop (bug #3072 )
2018-08-17 02:52:18 +03:00
James Carty
43f1c9163c
Fix issue in which murder wouldn't be reported after paying fine
2018-08-16 18:58:51 +01:00
Andrei Kortunov
16edac8c47
Fix incorrect 'preparing' word spelling
2018-08-16 17:47:06 +04:00
Andrei Kortunov
a73d42e711
Do not stop idle animation in spellcasting stance
2018-08-16 16:56:42 +04:00
Andrei Kortunov
b7a448cf42
Update idle animations after reset of mIdleState (bug #4531 )
2018-08-16 16:56:42 +04:00
Andrei Kortunov
3a6c480d41
Do not reset idle animations when turning
2018-08-16 16:56:42 +04:00
Andrei Kortunov
15fa47827b
AiCombat: Avoid jittering when aiming in melee
2018-08-16 16:56:42 +04:00
Andrei Kortunov
e444b9581c
Do not play min attack -> max attack animation when attack strength is 0 (bug #4591 )
2018-08-16 16:56:39 +04:00
Andrei Kortunov
8a48258b1b
Fix attack after shoot
2018-08-16 15:51:11 +04:00
Bret Curtis
dcd381049c
Merge pull request #1872 from akortunov/extended_logging
...
Use new logging system
2018-08-16 11:38:29 +02:00
David Cernat
5bd2244898
[Client] Uninitialize DedicatedActors instantly in some situations
...
When LocalActors briefly become DedicatedActors as the result of a server script, the DedicatedActors are immediately uninitialized to avoid bugs like them jumping in place or rotating slightly.
Additionally, the playing of animations and sounds received in packets for DedicatedActors is no longer done during their next update, but is instead done instantly when the packets are received.
2018-08-16 03:50:41 +03:00
James Carty
4b0a6074e7
Add comment
2018-08-16 00:29:14 +01:00
James Carty
6889432030
Move code to seperate functions for reusability
2018-08-16 00:26:02 +01:00
Capostrophic
37f9d45182
Remove an outdated checkbox from the advanced page
2018-08-15 16:04:29 +03:00
Andrei Kortunov
5a4d0cec3a
Use new logging system for game itself
2018-08-14 23:05:43 +04:00
Yohaulticetl
640b32da56
Fixed merge conflicts
2018-08-14 19:57:48 +02:00
Yohaulticetl
7e9ce99062
Made the werewolf check optional
2018-08-14 19:56:40 +02:00
Yohaulticetl
18e51e0e98
Added check for werewolves
2018-08-14 19:44:03 +02:00
Yohaulticetl
d19cbdb652
Factored strength into hand-to-hand combat
2018-08-14 19:44:03 +02:00
Andrei Kortunov
c7a5548475
Use new logging system for editor
2018-08-14 20:01:09 +04:00
Capostrophic
22162dcbda
Replace std::find with std::set::find where applicable
2018-08-14 18:14:43 +03:00
Capostrophic
53599290c3
Make search for followers in getEnemiesNearby recursive
2018-08-14 16:14:48 +03:00
Capostrophic
75bd6e1d28
Make search for allies in actorAttacked recursive
2018-08-14 15:41:34 +03:00
Capostrophic
7029ed0e8d
Refactor follower and enemy actor processing
...
Make another exception for wander packages when finding allies (bug #4304 )
2018-08-14 15:36:52 +03:00
Bret Curtis
d25147a930
Merge pull request #1863 from Capostrophic/aiming
...
Use the correct spell projectile speed GMST in AI aiming (bug #3948 )
2018-08-14 10:29:22 +02:00
Bret Curtis
6a32a4aed0
Merge pull request #1810 from akortunov/weaponfix
...
Use fallbacks for missing weapon animations
2018-08-14 10:29:01 +02:00
Bret Curtis
f7715db25f
Merge pull request #1871 from akortunov/extended_logging
...
[Regression] Move cerr initialization out of 'try' block
2018-08-14 10:26:12 +02:00
Andrei Kortunov
9a5b016293
Move crashcatcher initialization to components
2018-08-14 11:17:05 +04:00
David Cernat
5fd4113978
[General] Implement sending of ActorSpeech packets from server scripts
2018-08-13 20:39:03 +03:00
Allofich
fd89fa415a
Do modifiers for dynamic stats before attributes
...
(Fixes #4231 )
2018-08-13 21:59:27 +09:00
Allofich
2cc1b52baf
Drain and fortify fixes for dynamicStats
...
(Fixes #3049 )
2018-08-13 21:59:26 +09:00
Bret Curtis
61b34124e2
Merge pull request #1847 from akortunov/extended_logging
...
Improve console logging
2018-08-13 10:19:25 +02:00
Bret Curtis
f7bc862476
Merge pull request #1867 from akortunov/spelldetection
...
Add zero-duration spells effects to effect list (bug #3533 )
2018-08-13 09:38:22 +02:00
Andrei Kortunov
4003fa1296
Keep jailing state for one frame after leaving jail (bug #3788 )
2018-08-13 11:10:01 +04:00
Andrei Kortunov
9dfd775bf2
Implement GetPCTraveling console command
2018-08-13 08:30:50 +04:00
Andrei Kortunov
8de3383612
Add zero-duration spells effects to effect list (bug #3533 )
2018-08-12 17:25:35 +04:00
Andrei Kortunov
307e0103dc
Use fallbacks for missing weapon animations (bug #4470 )
2018-08-12 16:14:24 +04:00
Andrei Kortunov
7d6e3673e0
Implement advanced logging system (feature #4581 )
2018-08-12 13:38:15 +04:00
Bret Curtis
52d4e25314
Merge pull request #1851 from akortunov/launcherfix
...
Init SDL2 before Qt4 to avoid crash on Linux
2018-08-11 18:55:41 +02:00
David Cernat
338efdb705
[General] Fix issues with MechanicsHelper::getItemPtrFromStore()
2018-08-11 19:00:02 +03:00
David Cernat
aec0c5bd49
[Server] Make capitalization consistent for AI-related script functions
2018-08-11 18:57:36 +03:00
elsid
f2a63bcf35
Add unit tests for BulletNifLoader
2018-08-11 18:00:52 +03:00
elsid
6afc1dc3a0
Support build with coverage for components and test suite
2018-08-11 17:24:40 +03:00
elsid
ef631a0961
Add dependency for GMock
2018-08-11 16:52:53 +03:00
David Cernat
9598212aad
[Client] Don't add bound items to inventory as a result of item packets
...
Additionally, don't include bound items when sending PlayerInventory packets.
2018-08-11 16:05:37 +03:00
David Cernat
a3b9274365
[Client] Make it possible to check if an item ID belongs to a bound item
2018-08-11 16:02:09 +03:00
David Cernat
a1933e7bc2
[Client] Don't declare variable twice in LocalPlayer's setEquipment()
...
The variable equipmentItem is identical to currentItem, so it should not have been added in commit 58a6a8c3bc
Addditionally, use a more descriptive variable name than "a" for item Ptrs.
2018-08-11 15:28:03 +03:00
Capostrophic
3527f3800e
Use the correct spell projectile speed GMST in AI aiming
2018-08-10 21:21:21 +03:00
Marc Zinnschlag
1cfc1f9bdb
Merged pull request #1666
2018-08-10 12:23:17 +02:00
Marc Zinnschlag
0aedb3aada
Merged puil request #1808
2018-08-10 12:22:13 +02:00
Marc Zinnschlag
24212d58e8
Merged pull request #1861
2018-08-10 12:21:05 +02:00
Andrei Kortunov
cde95979d0
Fix combat engagement for creatures
2018-08-10 09:29:01 +04:00
David Cernat
5d66a9bb66
[Client] Fix path to MechanicsHelper in ProcessorPlayerItemUse
2018-08-09 22:33:22 +03:00
David Cernat
8df08c7d10
[General] Implement PlayerItemUse packet
...
Players can no longer unilaterally use items on themselves in their inventory. When they try to use an item, they send a PlayerItemUse packet to the server with the item's details. A serverside script can then check the item and either send the packet back to make the item use go through or drop it.
2018-08-09 18:25:20 +03:00
Andrei Kortunov
780648b584
Do not reset idle animations if we do not have ammo
2018-08-09 16:39:46 +04:00
Andrei Kortunov
df577babe9
Increase priority of 1st-person weapon animations to avoid issues with animation blending
2018-08-09 16:39:20 +04:00
Andrei Kortunov
71bcc11ba5
Apply only crossbow reload animation to upper body
2018-08-09 16:37:08 +04:00
Andrei Kortunov
a0d0e5d2db
Give jumping animations higher priority than movement ones
2018-08-09 16:19:03 +04:00
Andrei Kortunov
6a03aa6fdb
Reduce jittering during turning animations for player
2018-08-09 16:19:00 +04:00
Andrei Kortunov
cd92014533
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-09 16:19:00 +04:00
Marc Zinnschlag
fe19d8ff35
Merged pull request #1857
2018-08-09 13:52:51 +02:00
Marc Zinnschlag
a2a57cf694
Merged pull request #1858
2018-08-09 13:51:31 +02:00
Marc Zinnschlag
0f510011b3
Merged pull request #1852
2018-08-09 13:49:50 +02:00
Andrei Kortunov
126b2fdd42
Use the isPlayer variable to do not check if the current actor is player every time
2018-08-09 11:16:19 +04:00
AnyOldName3
1e48114492
Use JDGBOLT's indoor 'sun' direction.
2018-08-08 23:30:33 +01:00
AnyOldName3
a2b54714d4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-08-08 23:28:06 +01:00
AnyOldName3
586ac2d12d
Revert "Prevent accidental culling of first person meshes"
...
This reverts commit c38bf6757a
.
2018-08-08 22:53:56 +01:00
Andrei Kortunov
51af729305
Do not use headtracking in the 1st-person view (bug #4573 )
2018-08-08 23:29:03 +04:00
Andrei Kortunov
6202b4eca9
Do not touch GUI modes when taking screenshots (bug #4528 )
2018-08-08 22:10:53 +04:00
Capostrophic
e9e9c0dd6b
Fix guild guide fast travelling to exteriors time
2018-08-08 12:46:36 +03:00
Andrei Kortunov
b7859b3fa9
Cap underwater view distance (bug #4565 )
2018-08-08 13:22:40 +04:00
Capostrophic
bcd9cc4baa
Check the actor cell instead of the destination cell in fast travel price logic
2018-08-08 02:07:48 +03:00
Andrei Kortunov
2b90504558
Init SDL2 before Qt4 to avoid crash on Linux (bug #4529 )
2018-08-07 22:57:16 +04:00
Marc Zinnschlag
b75b5d139a
Merged pull request #1845
2018-08-05 12:28:38 +02:00
Marc Zinnschlag
7a93d118d2
Merged pull request #1846
2018-08-05 12:26:56 +02:00
Capostrophic
7087bad580
Use special behavior for all topics with reserved names (bug #4557 )
2018-08-05 12:39:53 +03:00
Andrei Kortunov
1f4dd3b393
Make partial binary search case insensitive, as it supposed to be (bug #4558 )
2018-08-05 13:26:12 +04:00
David Cernat
888e1dfff8
[General] Allow setting of AI fight & dynamic stats in record packets
...
Additionally, allow the setting of the Autocalc flag for an NPC record based on an existing record.
2018-08-05 11:00:25 +03:00
Andrei Kortunov
b0f2e00e7f
Make forcegreeting a non-op for non-actor objects (bug #4553 )
2018-08-05 09:31:45 +04:00
Koncord
d03722b3f4
[Browser] Rework browser for improved stability & clarity
...
(cherry picked from commits 5c79e7106f
, 57353cdfff
, 15723adb9a
, 01a5196a92
, ed75563a94
, 3839a2dcfd
, 1fd16ba69c
, 66283943c5
, ba8613a179
, 5b8f4f3e92
, 35b771b19e
, 043eb224e2
, 05fac2f67d
)
2018-08-05 07:20:12 +03:00
Marc Zinnschlag
452a706047
Merged pull request #1837
2018-08-04 10:26:44 +02:00
Marc Zinnschlag
b6a919a2d1
Merged pull request #1838
2018-08-04 10:26:18 +02:00
Marc Zinnschlag
99c03d55f0
Merged pull request #1841
2018-08-04 10:25:52 +02:00
Marc Zinnschlag
2a621fedd1
Merged pull request #1842
2018-08-04 10:08:11 +02:00
Capostrophic
d15dcaff68
Don't adjust weapon rating according to weapon condition twice
2018-08-03 19:22:58 +03:00
David Cernat
6498bcb22b
[Server] Add script functions for getting player draw & sneak states
2018-08-03 18:26:44 +03:00
Andrei Kortunov
e2519226aa
Move boost include
2018-08-03 17:04:07 +04:00
Andrei Kortunov
eeffe2e557
Check if item model exists inside drag and drop functions
2018-08-03 16:42:43 +04:00
Andrei Kortunov
c2a175c2e0
Move crash catcher wrapper to separate file
2018-08-03 15:51:17 +04:00
Capostrophic
725a9323c4
Merge branch 'master' into sound
2018-08-03 14:16:51 +03:00
Capostrophic
4c7f3cf626
Merge branch 'master' into weaponpriority
2018-08-03 14:07:11 +03:00
Marc Zinnschlag
4d280add81
Merged pull request #1843
2018-08-03 12:56:17 +02:00
Marc Zinnschlag
d7718aae9b
Merged pull request #1840
2018-08-03 12:54:56 +02:00
Marc Zinnschlag
eb5f558f6f
Merged pull request #1839
2018-08-03 12:53:55 +02:00
Andrei Kortunov
712c9995db
Rename mIsScripted variable because its name is ambiguous
2018-08-03 12:01:31 +04:00
Andrei Kortunov
c454f1bdad
Use log file for editor (feature #4012 )
2018-08-03 09:05:08 +04:00
AnyOldName3
8f4125134f
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-02 15:51:06 +01:00
AnyOldName3
c38bf6757a
Prevent accidental culling of first person meshes
2018-08-02 15:50:43 +01:00
Capostrophic
9d85b7c2d3
Use the actual damage for deducting weapon rating
2018-08-02 15:20:07 +03:00
Capostrophic
73d5496711
Revert addition change
2018-08-02 13:01:23 +03:00
Capostrophic
16af1a6c1c
Replace 0 sound range values separately
2018-08-02 12:40:53 +03:00
Capostrophic
3ac030d75a
Handle explicit calls before handling quotes
2018-08-02 09:49:53 +03:00
Capostrophic
80f3bd9f86
Don't apply iWereWolfFleeMod to creatures
2018-08-02 08:36:15 +03:00
Capostrophic
fa6c205e5d
Make tab autocompletion work with explicit reference calls
2018-08-02 03:24:31 +03:00
Capostrophic
bec47dfb7c
Make ranged weapon bonus a distance-dependent multiplier
2018-08-01 19:57:05 +03:00
Capostrophic
382b68a081
Combat AI: take the actual hit chance in account when rating weapon
2018-08-01 19:27:19 +03:00
Andrei Kortunov
12144de8ed
Initialize missing variables
2018-08-01 20:18:37 +04:00
Andrei Kortunov
c0bed0fde2
Handle case when index < 0
2018-08-01 20:17:59 +04:00
Andrei Kortunov
770d86f9bd
Initialize cubeSize variable for 360 degrees screenshots correctly
2018-08-01 19:36:55 +04:00
Andrei Kortunov
a08048da4e
Avoid dereference after null check
2018-08-01 19:30:30 +04:00
Capostrophic
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
2018-08-01 17:31:35 +03:00
Marc Zinnschlag
1c13256456
Merged pull request #1829
2018-08-01 16:17:37 +02:00
Marc Zinnschlag
0e75e3816a
Merged pull request #1830
2018-08-01 16:16:30 +02:00
Marc Zinnschlag
0c507b74bc
Merge pull request #1832
2018-08-01 16:13:59 +02:00
Marc Zinnschlag
7c7af1da61
Merged pull request #1834
2018-08-01 15:47:09 +02:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
Capostrophic
4d48ede6f1
Add two missing gameplay settings to Advanced tab
2018-08-01 13:36:31 +03:00
Capostrophic
be2e7e9e09
Make casting caster-linked on-self effects no-op (bug #4378 )
2018-08-01 02:41:57 +03:00
Andrei Kortunov
5b92910829
Limit difficulty scaling, as mentioned in docs
2018-07-31 21:14:16 +04:00
Marc Zinnschlag
aac580da6b
Merged pull request #1828
2018-07-31 11:10:48 +02:00
Marc Zinnschlag
20d4e27f82
Merged pull request #1821
2018-07-31 10:51:32 +02:00
Andrei Kortunov
c07cc0dc40
Reset animation state after weapon unequipping
2018-07-30 22:24:25 +04:00
Andrei Kortunov
0f2c3ecb17
Rescale player avatar (bug #4539 )
2018-07-30 17:41:43 +04:00
David Cernat
b57807407a
[General] Implement RecordDynamic packet, part 1
...
Spell, potion, enchantment, creature, NPC, armor, book, clothing, miscellaneous and weapon record data can now be sent in a RecordDynamic packet. Additionally, the packets include data related to associated magical effects (for spells, potions and enchantments), data related to default inventory contents (for creatures and NPCs) and data related to body parts affected (for armor and clothing).
The server now has associated script functions for setting most of the details of the above, with the main exception being individual creature and NPC stats.
Records can either be created entirely from scratch or can use an existing record (set via the baseId variable) as a starting point for their values. In the latter case, only the values that are specifically set override the starting values. Creature and NPC records also have an inventoryBaseId that can be used on top of the baseId to base their inventories on another existing record.
The client's RecordHelper class has been heavily expanded to allow for the above mentioned functionality.
When players create spells, potions and enchantments as part of regular gameplay, they send RecordDynamic packets that provide the server with the complete details of the records that should be created. When they create enchantments, they also provide the server with armor, book, clothing and weapon records corresponding to the items they've enchanted.
This functionality added by this packet was originally supposed to be exclusive to the rewrite, but I've gone ahead and tried to provide it for the pre-rewrite in a way that can mostly be reused for the rewrite.
2018-07-30 10:56:26 +03:00
Capostrophic
c79f96d0d2
Implement ranged crits (feature #3703 )
2018-07-29 19:42:44 +03:00
Andrei Kortunov
1d463d129d
Finish AiTarget package, if destination is blocked by other actor
2018-07-29 19:41:31 +04:00
Andrei Kortunov
75835c8326
Prevent NPC from chosing farther pathgrid node
2018-07-29 18:18:05 +04:00
Marc Zinnschlag
9e6cba09a6
Merged pull request #1827
2018-07-29 12:52:51 +02:00
Marc Zinnschlag
84de55fb46
Merged puil request #1824
2018-07-29 12:52:01 +02:00
Marc Zinnschlag
78121c1774
Merged pull request #1823
2018-07-29 12:49:50 +02:00
Marc Zinnschlag
3ba9229f47
Merged pull request #1815
2018-07-29 12:48:20 +02:00
Capostrophic
9c8e284ead
Fix quick key activation delay code (regression #4536 )
2018-07-29 12:52:29 +03:00
Capostrophic
84a871cac7
Actually enable is_pod test
2018-07-28 23:56:42 +03:00
Andrei Kortunov
6d5d0039ec
Make sure we apply OT_Murder only once
2018-07-28 20:45:33 +04:00
Andrei Kortunov
bc82dbbd1b
Do not try to find missing animated collision shape again and again
2018-07-28 16:49:00 +04:00
Andrei Kortunov
2d4ec86b8d
Provide launcher icons
2018-07-28 13:18:38 +04:00
David Cernat
2332423527
[Client] Fix extra qualification error in CellRef when compiling w/ GCC
2018-07-27 21:56:45 +03:00
David Cernat
7136329a94
[Client] Add World::updatePtrsWithRefId() method
...
This makes it possible to "reload" the Ptrs in active cells when changes happen to the ESM record that they are based on. In practice, the old Ptrs are deleted, their RefNums and MpNums are blanked out, and new Ptrs are created that use the same RefNum and MpNum as before.
The above has required me to also add a method called setRefNum() to CellRef to allow setting a RefNum on the fly.
There may be a more elegant implementation available for updatePtrsWithRefIds(), but it requires additional research.
2018-07-27 21:42:08 +03:00
Andrei Kortunov
28a02ac93b
Use file selection dialogue result (bug #4524 )
2018-07-27 21:25:21 +04:00
Marc Zinnschlag
b7c159e5b6
Merged pull request #1816
2018-07-27 12:09:10 +02:00
Marc Zinnschlag
c508938674
Merged pull request #1817
2018-07-27 12:06:51 +02:00
Marc Zinnschlag
bbb22643e8
Merge remote-tracking branch 'capostrophic/warning'
2018-07-27 12:05:26 +02:00
David Cernat
9497c7f6f2
[Client] Add back mistakenly removed setting of mpNums for spawns
2018-07-27 00:36:05 +03:00
David Cernat
25fcd09780
[Client] Add doesNpcExist() method to RecordHelper
2018-07-26 23:57:42 +03:00
David Cernat
7995466e3c
[Client] Check validity of refIds in ObjectSpawn packets
...
This reverts c7bcf70c32
because it provides a better solution to the problem solved there, while solving another related problem as well.
2018-07-26 23:57:22 +03:00
David Cernat
8d286657d4
[Client] Update messages when unilaterally creating custom objects
2018-07-26 23:32:31 +03:00
Capostrophic
f7887ab05f
Fix MSVC C4456 warning: declaration of 'stats' hides previous local declaration
2018-07-26 23:24:26 +03:00
David Cernat
c7bcf70c32
[Client] Ignore ObjectSpawn packets trying to spawn non-actors
2018-07-26 22:41:04 +03:00
David Cernat
d93b67ef21
[General] Sync soul refIds for items and add related script functions
2018-07-26 22:37:04 +03:00
David Cernat
f52364e05c
[Client] Always create new references for new creature disguises
...
Previously, attempts to reuse the same reference for multiple creature disguises led to movement animation issues, as well as a dynamic_cast error in Creature::getInventoryStore() that made a DedicatedPlayer vanish completely when they first lost their creature disguise, then disguised themselves as a creature that could not hold weapons and then disguised themselves as a creature that could hold weapons.
2018-07-26 21:08:12 +03:00
David Cernat
60bc7447d9
[Client] Rework RecordHelper and add methods for other record types
...
The usage of const_cast has been replaced with usage of MWWorld::getModifiableStore() and ESMStore::overrideRecord()
Methods whose names started with "update" now start with "override", for consistency with ESMStore's overrideRecord()
New methods have been added for "overriding" enchantment, potion and spell records, which actually leads to them being created with their already set refIds if they haven't been created yet, as per the description of ESMStore::overrideRecord(): "Insert a record with set ID, and allow it to override a pre-existing static record."
Usage of RecordHelper methods has been updated in DedicatedPlayer.
2018-07-26 21:01:59 +03:00
Capostrophic
51d369d4da
Add resumeGame method
2018-07-26 20:35:34 +03:00
David Cernat
4e78642273
[Client] Add getModifiableStore() to MWWorld
2018-07-26 20:05:36 +03:00
David Cernat
d778bc3b8a
[Server] Turn readWorldstate and writeWorldstate into static variables
2018-07-26 20:03:42 +03:00
David Cernat
b4802e4201
[General] Use Time struct for time in BaseWorldstate
2018-07-26 19:01:27 +03:00
Andrei Kortunov
23d917df9c
Do not use magic numbers in capacity calculations
2018-07-26 18:06:36 +04:00
David Cernat
a4b588d1b5
[General] Add optional timestamps to journal entries in PlayerJournal
2018-07-26 04:36:12 +03:00
Capostrophic
cac2bc768e
Fix NPC "can't teach more" message (bug #4494 )
2018-07-25 12:34:33 +03:00
David Cernat
b79221efcc
[Server] Rename variable i into index in ActorFunctions
2018-07-24 21:29:40 +03:00
David Cernat
8fbed1f808
[General] Remove custom data from PlayerSpellbook packet
...
It has never made sense to have custom spell data in PlayerSpellbook packets, so it has been removed.
2018-07-24 20:58:55 +03:00
David Cernat
2e0b6e4e3e
[Server] Rename variable i into index in script function arguments
...
Additionally, rename i into index in LangLua.
2018-07-24 20:14:51 +03:00
David Cernat
65de028e0d
Merge pull request #462 from OpenMW/master
...
Add OpenMW commits up to 23 Jul 2018
2018-07-23 23:19:17 +03:00
David Cernat
74fa1d0f01
[Client] Fix manual setting of inertial force
...
Actors who are on the ground have their inertial force ignored, so they are now made to not be regarded as being on the ground in World::setInertialForce()
2018-07-23 23:04:41 +03:00
David Cernat
b69e6b96e6
[Client] Use verbose logging level for LocalActor debug
2018-07-23 22:11:59 +03:00
David Cernat
36ac2d9de4
[Client] Set packetOrigin for all ObjectList packets sent
2018-07-23 01:39:43 +03:00
David Cernat
692ee01340
[Client] Add ScriptController w/ contextType-to-packetOrigin method
2018-07-23 00:48:23 +03:00
David Cernat
63a86f145d
[Client] Record type of each InterpreterContext for later checking
2018-07-23 00:46:07 +03:00
David Cernat
d4a84ac34a
[Server] Update script function descriptions for ObjectList origin
2018-07-22 23:08:32 +03:00
David Cernat
3dc2d1b214
[General] Add packetOrigin and originClientScript to ObjectList packets
...
Additionally, add script functions for getting the packetOrigin and originClientScript of received ObjectList packets.
2018-07-22 18:38:05 +03:00
David Cernat
b891acd46e
[Client] Send Container packets when items are added/removed via scripts
...
Additionally, disable unilateral addition and removal of items on clients, and expect the server to reply back with an approved addition or removal.
2018-07-22 17:04:17 +03:00
David Cernat
2189ea1a63
[Client] Clean up sending of Container packets
2018-07-22 16:43:27 +03:00
David Cernat
8c0b75d9f4
[Client] Limit PlayerEquipment packets sent by recharging enchantments
2018-07-22 15:30:40 +03:00
David Cernat
18f8725d33
[Client] Remove tab character that somehow made its way into a comment
2018-07-22 10:29:14 +03:00
David Cernat
038757b91a
[General] Temporarily revert to original rotation animation sync
...
I originally added rotation animation sync as part of commit 068a45be87
. Unfortunately, it meant the PlayerPosition packets were now twice as large as they had been before, which was less than ideal for such a frequently sent packet, which is why Koncord switched to a more optimized approach in commits 5f30dfd5db
and d67db1a9bd
.
Recently, there have since been some rotation animation problems in OpenMW, which have broken the way Koncord's approach looks. My original approach still looks somewhat okay, so I'm switching back to it until we can figure out how to reuse it under the current circumstances.
2018-07-21 19:27:36 +03:00
Marc Zinnschlag
ddd5cbd17c
Initialise lock state of newly opened subviews (fixes issue #4520 )
2018-07-21 17:38:11 +02:00
David Cernat
3944c8aec6
[Client] Ignore WorldRegionAuthority packets that have an empty region
2018-07-21 18:28:31 +03:00
David Cernat
99e64bdcd7
[Client] Remove unused localWeather variable from Worldstate
2018-07-21 16:25:49 +03:00
David Cernat
cd1fc590a7
[Client] Differentiate itemPtr from actor Ptr in DedicatedPlayer method
...
This fixes a mistake from 8f7da49152
2018-07-21 16:14:07 +03:00
David Cernat
5466092582
[Client] Reduce log level for actor cell changes
2018-07-21 14:41:48 +03:00
David Cernat
20e0100706
[General] Rework Attack packets and add synchronization for item magic
2018-07-21 14:41:27 +03:00
David Cernat
0f0e8b7c08
[Client] Adjust log levels used for weather and global map
2018-07-21 12:08:31 +03:00
David Cernat
f1315ef30d
[Cllient] Differentiate itemPtr from actor Ptr in DedicatedActor methods
...
2427a4f877
mistakenly used the variable name "ptr" for both the actor and the items in that actor's inventory.
2018-07-21 10:16:51 +03:00
David Cernat
b6324e3532
[Client] Clean up debug for spell usage
2018-07-21 09:41:36 +03:00
David Cernat
826e64b40e
[Server] Rename isPlayerExists() into doesPlayerExist()
2018-07-21 07:34:45 +03:00
David Cernat
21d5bb4d4e
Merge pull request #460 from OpenMW/master
...
Add 0.7.0 commits up to 20 Jul 2018
2018-07-21 05:59:57 +03:00
David Cernat
6c50d4199b
Merge branch '0.7.0' of https://github.com/TES3MP/openmw-tes3mp into 0.7.0
2018-07-21 05:21:44 +03:00
David Cernat
421d0e7a99
[Client] Make forceWeather false by default for client-sent weather
2018-07-21 05:21:26 +03:00
David Cernat
892d71ce71
[General] Reimplement weather synchronization to allow soft transitions
...
Although weather sync was added by Koncord to the rewrite in fd721143e2
in a way that used surprisingly few lines of code, it relied on the server requesting weather states every second from authority players and sending them to non-authority players, while also allowing only very sudden weather transitions across regions, i.e. if there was one player in the Ascadian Isles who had stormy weather, and another player with clear weather in the Bitter Coast Region walked across to the Ascadian Isles, that player was instantly made to have stormy weather with no kind of transition at all.
My approach solves both of those problems. It solves the packet spam by only sending weather updates to the server when weather changes happen or when there are new arrivals to a weather authority's region, and it allows for both sudden weather transitions when players teleport to a region and for soft, gradual transitions when players walk across to a region. It is inspired by my previous actor sync, and uses a WorldRegionAuthority packet to set players as region authorities in a similar way to how ActorAuthority sets players as cell AI authorities. Weather changes are created only by the region authority for a given region, and weather packets are also only sent by that authority.
However, it should be noted that gradual weather transitions are used by default in this implementation. To use sudden weather transitions, the serverside Lua scripts need to forward WorldWeather packets with the forceWeather boolean set to true. That is, however, already handled by our default Lua scripts in situations where it makes sense.
2018-07-21 05:20:26 +03:00
Andrei Kortunov
8281fd903f
Set movement speed to 0 when unconscious (bug #4519 )
2018-07-19 20:17:32 +04:00
David Cernat
b6db570d9c
[Client] Display uniqueIndexes in a less confusing way in console
2018-07-19 11:57:06 +03:00
Andrei Kortunov
5c16ce1d36
Sort icons in the DataDisplayDelegate
2018-07-17 22:49:51 +04:00
Marc Zinnschlag
78a2725169
Merged pull request #1806
2018-07-17 12:42:41 +02:00
Marc Zinnschlag
326a3e61f4
Merged pull request #1807
2018-07-17 12:42:12 +02:00
Andrei Kortunov
38fa4e0a8a
Do not play un-equipping animation when we switch to hand-to-hand
2018-07-17 14:10:04 +04:00
David Cernat
9823a77bf2
[General] Turn PlayerRegionAuthority into WorldRegionAuthority
...
WorldRegionAuthority is a Worldstate packet.
2018-07-17 09:21:13 +03:00
Koncord
2e227c7af5
[Server] Do not allow to connect with an empty plugin list
2018-07-17 01:08:23 +08:00
Koncord
b5c957c473
[Server] Move PreInit code to preInit method
2018-07-17 00:58:37 +08:00
Koncord
1a9bf253f6
[Server] Simplify getPlayer methods, add isPlayerExists method
2018-07-17 00:29:45 +08:00
Andrei Kortunov
edd5769022
Show magic items count in spells window (feature #4509 )
2018-07-16 14:11:03 +04:00
Andrei Kortunov
30716344f2
Fix possible division by zero in the fatigue calculation (bug #4510 )
2018-07-16 13:24:12 +04:00
David Cernat
d5d3c0937f
[Client] Adjust log level for actor transfers in CellStore
2018-07-16 03:53:09 +03:00
David Cernat
35fdb833df
[Client] Verify integrity of credits file
2018-07-16 03:25:01 +03:00
David Cernat
72d286473b
[General] Move credits integrity error message to new ErrorMessages file
...
Additionally, use correct log level for credit integrity message on server.
2018-07-16 03:21:14 +03:00
David Cernat
0b5cb15f71
[General] Turn GameWeather into WorldWeather, now a WorldstatePacket
2018-07-16 02:20:43 +03:00
David Cernat
646111d998
[General] Use correct credits checksum and move it to Version.hpp
2018-07-16 01:05:56 +03:00
David Cernat
0f36c3ea24
[Server] Verify integrity of credits file
2018-07-15 22:50:16 +03:00
Andrei Kortunov
6ddf6eb885
Use editor markers for lights and creatures levelled lists
2018-07-15 17:25:18 +04:00
David Cernat
4ac371d292
[Server] Delete duplicate WorldKillCount processor with old filename
2018-07-15 05:49:19 +03:00