1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 23:19:56 +00:00
Commit graph

18345 commits

Author SHA1 Message Date
David Cernat
0e0ac7a60f [Server] Add OnConsoleCommand event and associated script function 2019-12-07 10:13:10 +02:00
David Cernat
eeb77f80d2 [Client] Send ConsoleCommand packets when console is used 2019-12-07 10:11:45 +02:00
David Cernat
4b27f8986b [Client] Synchronize positions for actors during death animations
This needs some improvements, because:

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

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

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

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

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

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

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

Clean launcher main.cpp (appTranslator.load)

Remove french translation

Remove string translation file

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

Additionally, the logged messages in MechanicsHelper's handling of attacking and casting have been moved around slightly.
2019-11-28 10:34:34 +02:00
David Cernat
7815c8bdaf [Client] Queue sending of Cast packet from CastSpell::cast() 2019-11-28 09:40:22 +02:00
Andrei Kortunov
407a737fe4
Merge pull request #2611 from Capostrophic/effect
[Regression] Make sure instant FX abilities get detected when they're supposed to
2019-11-28 08:20:39 +04:00
David Cernat
b74e3a7e2e [Client] Include spellIds in Cast packets again, fixing problem from 190c404b38 2019-11-28 00:11:51 +02:00
Bret Curtis
62b9f1a2f7
Merge pull request #2610 from akortunov/warnfix2
Fix some build warnings
2019-11-27 21:24:44 +01:00
Capostrophic
77f076ff11 Make sure instant FX abilities get detected when supposed 2019-11-27 17:15:48 +03:00
David Cernat
bbf9f20053 [Client] Stop sending WorldKillCount packets or incrementing local kills
This means the server scripts are now required to send a WorldKillCount packet as a reply to ActorDeath packets sent by clients. This gives the server full control over which kills are counted, while also solving the previous problem of kills being counted only for actors that had finished their death animations.
2019-11-27 11:21:29 +02:00
Capostrophic
0adc2df65f Make SameFaction work (bug #5213) 2019-11-23 14:47:50 +03:00
David Cernat
8da6a7fd9b [Server] Fix mixed-up bindings for Chat functions 2019-11-20 21:01:18 +02:00
Capostrophic
eed92c824e Make sure hand-to-hand shortcut is not saved 2019-11-20 19:57:21 +03:00
bzzt
f09125fc93 perf regression fix 2019-11-20 13:37:00 +00:00
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
2019-11-19 17:16:48 +02:00
Andrei Kortunov
d0643d266a Do not use fallthrough in switches 2019-11-19 16:10:18 +04:00
Andrei Kortunov
73f43ba750 Do not use screen fading during game loading if there is no current cell (bug #5211) 2019-11-18 22:24:19 +04:00
Andrei Kortunov
4118b20608 Allow ActionOpen and ActionTalk only for player (bug #5210 2019-11-18 12:41:11 +04:00
Alexei Dobrohotov
4208f10e81
Merge pull request #2600 from akortunov/master
Take in account caster's race height when launch magic bolt
2019-11-17 21:04:55 +03:00
elsid
f156c9522e
Avoid virtual call in SoundManager dtor 2019-11-17 18:50:11 +01:00
elsid
8083df4567
Avoid virtual call in Animation dtor 2019-11-17 18:50:11 +01:00
elsid
b4794e8ca5
Avoid virtual call in OpenAL_Output dtor
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: warning: Call to virtual function during destruction [clang-analyzer-optin.cplusplus.VirtualCall]
    deinit();
    ^
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: note: This destructor of an object of type '~OpenAL_Output' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwsound/openal_output.cpp:1492:5: note: Call to virtual function during destruction
2019-11-17 18:50:11 +01:00
elsid
b55f5ab648
Avoid virtual call in WindowManager ctor
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        loadUserFonts();
        ^
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: This constructor of an object of type 'WindowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: Call to virtual function during construction
2019-11-17 18:50:11 +01:00
elsid
cf01df31be
Remove unused variable initialization
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: warning: Value stored to 'material' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
            osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
                           ^
/home/elsid/dev/openmw/apps/openmw/mwrender/animation.cpp:518:28: note: Value stored to 'material' during its initialization is never read
2019-11-17 18:50:11 +01:00
Andrei Kortunov
6861d9d5e5
Merge pull request #2510 from elsid/ai_open_door
Open door when it is on the way to a next path point (bug #5073)
2019-11-17 21:21:22 +04:00
Andrei Kortunov
d1e0fa575e Take in account caster's race height when launch magic bolt (bug #5209) 2019-11-17 16:37:38 +04:00
Andrei Kortunov
6554130f6f
Merge pull request #2594 from Capostrophic/summonsummon
Minor summoned creature cleanup fixes
2019-11-17 10:47:07 +04:00
Andrei Kortunov
8dbbe42f21 Add missing isNpc() check (bug #5206) 2019-11-17 09:17:03 +04:00
Bret Curtis
454b9f1964
Merge pull request #2597 from akortunov/coverity
CoverityScan fixes, part 2
2019-11-14 21:08:03 +01:00
Alexei Dobrohotov
f332df8839
Fix terrain shadows checkbox loading 2019-11-14 19:50:59 +03:00
Andrei Kortunov
b21dc17538 Attempt to shut up CoverityScan warnings about tainted values 2019-11-14 18:28:38 +04:00
Alexei Dobrohotov
b5992b380e
Merge pull request #2586 from unelsson/allowselectionalledges
Allow selecting cell edges everywhere
2019-11-14 17:25:48 +03:00
Andrei Kortunov
b210e99abc Avoid divizion by zero 2019-11-14 17:43:21 +04:00
Nelsson Huotari
120583f443 optimize isInCellSelection calls 2019-11-14 11:28:49 +02:00
Andrei Kortunov
3970baeb84 Fix possible usage of destroyed variable 2019-11-13 15:46:49 +04:00
Andrei Kortunov
34873b6065 Fix dead code 2019-11-13 15:29:18 +04:00
Andrei Kortunov
5561eb5415 Do not discard division reminder 2019-11-13 15:18:18 +04:00
Andrei Kortunov
238dcdbbd4 Fix copy-paste error 2019-11-13 15:14:30 +04:00
Andrei Kortunov
5c6ca82c45 Clamp fallback value from config 2019-11-13 15:10:19 +04:00
Andrei Kortunov
079c77ff22 Avoid zero division 2019-11-13 14:57:22 +04:00
Andrei Kortunov
ca2a524a5f Avoid null pointer dereference 2019-11-13 14:50:42 +04:00
Andrei Kortunov
af41e9acc1 Initialize variables to avoid undefined values 2019-11-13 14:47:29 +04:00
Capostrophic
120b7dcd2f Clean up summoned creatures when corpses are disposed 2019-11-12 21:44:46 +03:00
David Cernat
1d8668305c [Client] Send PlayerSpellbook packet when contracting or curing disease 2019-11-12 17:44:38 +02:00
Capostrophic
1097c2cfc4 Minor summoned creature cleanup fixes 2019-11-12 17:50:06 +03:00
Capostrophic
9c78e8cc56 Make sure movement not controlled by animation has valid velocity
Fixes erroneously always normalized movement speed in first person
2019-11-12 17:33:44 +03:00
Alexei Dobrohotov
a1ed0144e1
Merge pull request #2590 from akortunov/guifixes
UI textures scaling corrections
2019-11-10 13:53:27 +03:00
David Cernat
8f7a267129 [General] Add scale and bloodType to creature records in RecordDynamic 2019-11-10 09:20:45 +02:00
David Cernat
afb9bd7eb5 [General] Implement script records for RecordDynamic packets 2019-11-09 21:34:09 +02:00
Andrei Kortunov
1835a39c57 Do not show shields in the 1st-person view when shield sheathing is enabled 2019-11-09 17:48:05 +04:00
Andrei Kortunov
6a625b1dac Scale magic items frames in the quick keys menu 2019-11-09 15:00:50 +04:00
David Cernat
383d6ecea6 [Server] Update log message related to server password 2019-11-09 08:46:56 +02:00
David Cernat
20d1e7654c [General] Create SystemPacket category and move Handshake packet to it 2019-11-09 05:12:00 +02:00
David Cernat
5762a36fc2 Add OpenMW commits up to 7 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
2019-11-08 06:20:41 +02:00
Andrei Kortunov
f335044026
Merge pull request #2587 from Capostrophic/sheathing
Minor sheathing-related changes
2019-11-07 20:04:03 +04:00
Capostrophic
5a5bc0bef8 Uncheck sheathing checkboxes automatically when appropriate
Fix their order and bogus saveSettingBool calls
2019-11-07 17:24:43 +03:00
Andrei Kortunov
6eb8e0cf4d Display magic effects according to research page 2019-11-07 11:05:18 +04:00
Capostrophic
5eab913a9c Make additional anim sources dependency more obvious 2019-11-05 21:41:56 +03:00
Capostrophic
7885b8c75e Sheathing-related changes
Add weapon and shield sheathing and use additional anim sources checkboxes into the Advanced tab of the launcher
Remove outdated information from the documentation
2019-11-04 20:34:06 +03:00
Nelsson Huotari
45d43045eb Remove unused std::string 2019-11-04 12:29:37 +02:00
Nelsson Huotari
aeb0ccff90 Allow selecting cell edges everywhere 2019-11-04 12:16:08 +02:00
Nelsson Huotari
8f6dc78217 Get vertex height from data, if not available in visible cells. 2019-11-04 00:09:23 +02:00
Nelsson Huotari
9677203215 Don't allow vertex selection outside visible cells 2019-11-04 00:09:23 +02:00
Nelsson Huotari
d186bcb46f Update selection during transient edit, clear to a single function. 2019-11-03 13:27:27 +02:00
Andrei Kortunov
678d2e6e7d
Merge pull request #2584 from Capostrophic/shadows
Resolving 0.46.0 release shadow-related blockers
2019-11-03 08:35:30 +04:00
Alexei Dobrohotov
5ae91465ee
Fix gamepad zoom value calculation 2019-11-02 19:47:05 +03:00
Capostrophic
208608cbd0 Fix a typo and a mistake 2019-11-02 18:06:39 +03:00
Capostrophic
0e2380d471 Add the most basic shadow settings into the launcher 2019-11-02 18:06:39 +03:00
Alexei Dobrohotov
b700c98e8f
Merge pull request #2581 from akortunov/deceleration
Implement actors movement deceleration (feature #4544)
2019-10-31 15:59:18 +03:00
Bret Curtis
ec9a593fc3
Merge pull request #2578 from akortunov/mouse
Implement mouse wheel bindings (bug #2679)
2019-10-31 13:14:29 +01:00
Andrei Kortunov
61ab7f3c1e Implement actors movement deceleration (feature #4544) 2019-10-31 14:41:12 +04:00
Michael Stopa
e4bec88a68 Implement mouse wheel bindings (bug #2679) 2019-10-30 20:45:51 +04:00
Alexei Dobrohotov
7328db4d6b
Fix small typo in body part record verifier 2019-10-30 17:51:36 +03:00
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images" 2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression
Store raw data about fog of war instead of RGBA images
2019-10-30 13:45:55 +01:00
Andrei Kortunov
45ab6e1430 Implement UTF-8 support for script parser (bug #4598) 2019-10-30 14:59:47 +04:00
David Cernat
54301f5f89 Add OpenMW commits up to 29 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
2019-10-29 23:49:31 +02:00
David Cernat
bde9f7b817 Add OpenMW commits up to 20 Oct 2019
# Conflicts:
#	apps/openmw/mwgui/recharge.cpp
#	apps/openmw/mwrender/globalmap.cpp
#	apps/openmw/mwrender/globalmap.hpp
#	apps/openmw/mwworld/inventorystore.cpp
2019-10-29 22:26:35 +02:00
David Cernat
05b5a7b32d [Client] Trigger crimes when using take all on containers 2019-10-29 21:17:01 +02:00
Alexei Dobrohotov
7488f402d5
Merge pull request #2576 from akortunov/warnfix
Fix warnings about variable re-declaration
2019-10-29 15:03:54 +03:00
Andrei Kortunov
d278e5d4af Fix warnings about variable re-declaration 2019-10-29 13:48:08 +04:00
Capostrophic
c6e431d862 Avoid copying strings in SearchVisitor and readReferenceCollection 2019-10-28 19:28:14 +03:00
Capostrophic
ee4fa93bd4 Rework prevent merchant equipping setting again 2019-10-28 01:58:23 +03:00
Andrei Kortunov
15cd305253 Reset idle animation only when play movement animation (bug #5196) 2019-10-27 12:33:28 +04:00
David Cernat
adcac2675a [Client] Fix warnings related to destructors for processors 2019-10-26 16:43:08 +03:00
David Cernat
b97322b4b1 [General] Modernize packet style for PlayerInventory 2019-10-26 14:01:08 +03:00
Alexei Dobrohotov
1f616c5613
Merge pull request #2569 from akortunov/holstered_shield
Ignore shields sheathing for creatures without sheathing bone
2019-10-26 12:00:07 +03:00
Andrei Kortunov
b27089f7be
Merge pull request #2560 from Capostrophic/geteffect
Fix GetEffect result when running on dead actors
2019-10-26 12:47:58 +04:00
David Cernat
cbe58b1c24 [General] Modernize packet style for PlayerFaction 2019-10-26 11:42:40 +03:00
Andrei Kortunov
7cd4fa4706 Ignore shields sheathing for creatures without sheathing bone 2019-10-26 12:41:16 +04:00
David Cernat
c9f3ee1819 [Client] Make PlayerResurrect use new resurrection handling from 6450d84473 2019-10-26 09:12:06 +03:00
Bret Curtis
9f039fac87
Merge pull request #2520 from unelsson/transientlandshapeedit
[Review phase] Editor: Transient land shape editing
2019-10-25 00:26:43 +02:00
Koncord
a74bf1baec [Client] Mark derived processor classes as final
(cherry picked from commit 7748e582a8)
2019-10-24 22:16:17 +03:00
David Cernat
0e94eb8b74 [General] Use regular ints for weather states for consistency w/ OpenMW 2019-10-24 20:08:08 +03:00
David Cernat
904f804ea2 [General] Modernize packet style for PlayerSpellbook 2019-10-24 19:27:37 +03:00
Bret Curtis
2040ca5637
Merge pull request #2555 from akortunov/encoding
Encode ID's in all places to UTF-8
2019-10-24 00:48:12 +02:00
David Cernat
4f9e6b0e3e [General] Modernize packet style for PlayerCellState 2019-10-23 17:46:21 +03:00
Bret Curtis
afb218fe29
Merge pull request #2564 from Capostrophic/enchant
Remove on-strike enchantment support for ranged weapon types (bug #5190)
2019-10-23 15:11:36 +02:00
David Cernat
96a71c1ced [General] Modernize packet style for PlayerBook 2019-10-23 02:02:27 +03:00
Bret Curtis
39fd12c065
Merge pull request #2568 from elsid/settings_parser_tests
Settings parser tests
2019-10-23 00:30:16 +02:00
David Cernat
d66bca8605 [General] Modernize packet style for PlayerTopic 2019-10-23 01:24:13 +03:00
Nelsson Huotari
c957f0544c Remove unneeded brackets 2019-10-23 00:34:54 +03:00
Nelsson Huotari
fdc73b87ba Remove includes that aren't needed any more 2019-10-23 00:07:41 +03:00
Nelsson Huotari
9e5db10288 const ref float -> float 2019-10-23 00:02:24 +03:00
Nelsson Huotari
ac5b356e8d Always initialize landShapeNew 2019-10-23 00:01:23 +03:00
Nelsson Huotari
6f9f59dd58 declare cellId and cellCoords in smallest possible scope 2019-10-22 21:26:55 +03:00
Nelsson Huotari
fdcc7fa1d7 0 to nullptr 2019-10-22 21:26:55 +03:00
Nelsson Huotari
a13edbdb42 Bump shape calculation to function 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8d3e7f2815 fix normals at cell edges, better coding standards 2019-10-22 21:26:55 +03:00
Nelsson Huotari
0f6ddfe8e6 change include, cleanup 2019-10-22 21:26:55 +03:00
Nelsson Huotari
12349f4e48 cleanup 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c556885d71 remove unused Qt signal 2019-10-22 21:26:55 +03:00
Nelsson Huotari
deb122ffdb Add optional post-processing (smooth/rough), add/fix tooltips. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
2d34b63b0b Fix logic of land loading when no cell, land or landdata. Fix also draw. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
71eff60d22 Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize 2019-10-22 21:26:55 +03:00
Nelsson Huotari
a1348d94f9 add missing final specifiers 2019-10-22 21:26:55 +03:00
Nelsson Huotari
16ba32ffd5 assignments to member initialization list 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c2de645c8c override, virtual -> final, remove unused variables, public to private. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a3070e680 Fix shape brush setting description 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8a9ca0b3ec Generate new WNAM record based on new land heights, add comments 2019-10-22 21:26:55 +03:00
Nelsson Huotari
96be82a047 Remove terrain vertex selection and brush button when exiting editMode 2019-10-22 21:26:55 +03:00
Nelsson Huotari
8acfa2600f Terrain shape editing related fixes 2019-10-22 21:26:55 +03:00
Nelsson Huotari
5b9debc554 use enum for mbrushshape initialization 2019-10-22 21:26:55 +03:00
Nelsson Huotari
4f9ec24e41 use enum for brushshape at scenetoolshapebrush 2019-10-22 21:26:55 +03:00
Nelsson Huotari
bae8636ec0 Fix brusshape enum values 2019-10-22 21:26:55 +03:00
Nelsson Huotari
c031543420 use enum for brush shapes 2019-10-22 21:26:55 +03:00
Nelsson Huotari
388edfd8cc change manual memory management to std::unique_ptr 2019-10-22 21:26:55 +03:00
Nelsson Huotari
da4abcd7c1 std::set to std::unique and erase. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
6a44cae572 white iterator loop to C++11 range-based for loop. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
bccf36fdbc Convert normals calculations mostly to osg::Vec3f 2019-10-22 21:26:55 +03:00
Nelsson Huotari
45b0f034c3 Split complex if-logic into multiple reasonably named functions 2019-10-22 21:26:55 +03:00
Nelsson Huotari
0ce971c1bb Revert back to less aggressive component-level changes. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
69083369f8 use std::fill instead of for 2019-10-22 21:26:55 +03:00
Nelsson Huotari
3599e804e1 Fix the default value of mBrushSize 2019-10-22 21:26:55 +03:00
Nelsson Huotari
dc7dc93320 Remove unused functions, improve formatting, handle terrain edit click 2019-10-22 21:26:55 +03:00
Nelsson Huotari
1046d57190 Remove unneeded forward declarations. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
55b3fd4418 Use float calculations for circle brush, keep tool options in memory. 2019-10-22 21:26:55 +03:00
Nelsson Huotari
23e7c71a5a Tighter corner checking, clean-up, landSize to ESM::Land::LAND_SIZE. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
8f3c22ccc3 Remove TerrainShapeMode::fixEdges 2019-10-22 21:25:10 +03:00
Nelsson Huotari
1a3fc435b9 Fix alterHeight bugs, don't let broken land edit pass. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
ff18595a86 Reduce code duplification, add bool value to limiting 2019-10-22 21:25:10 +03:00
Nelsson Huotari
60c0a25004 Fix smooth tool and flatten tool. Default tool strength to 8. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
54e13954e8 Improve land steepness limiting code 2019-10-22 21:25:10 +03:00
Nelsson Huotari
4a2d8aaf97 Handle mBrushSize 1. 2019-10-22 21:25:10 +03:00
Nelsson Huotari
16138fc896 Transient land shape editing 2019-10-22 21:25:10 +03:00
Bret Curtis
262d87846c
Merge pull request #2047 from akortunov/holstered_shield
Shields holstering support
2019-10-22 16:46:12 +02:00
Andrei Kortunov
d3a3b2f1f6 Shields holstering support (feature #5193) 2019-10-22 09:02:59 +04:00
elsid
862f50346c
Add tests for settings parser 2019-10-21 22:47:24 +02:00
Bret Curtis
36119ec2c4
Merge pull request #2562 from Capostrophic/weather
Weather-related fixes (incl. bug #4783)
2019-10-21 21:56:02 +02:00
David Cernat
0206d1813c [General] Modernize packet style for PlayerQuickKeys 2019-10-21 16:55:21 +03:00
David Cernat
4f98d67ed4 [General] Modernize packet style for PlayerJournal 2019-10-21 07:01:36 +03:00
Alexei Dobrohotov
678970b01d
Merge pull request #2565 from elsid/update_recastnavigation
Update recastnavigation
2019-10-21 02:51:28 +03:00
elsid
045ceeac11
Replace foreach macro by for-loop 2019-10-20 20:08:16 +02:00
elsid
07660b5605
Fix detournavigator tests 2019-10-20 18:59:14 +02:00
Alexei Dobrohotov
5d5ec1cf63
Merge pull request #2550 from elsid/fix_path_rebuild
Fix rebuild path for walking actors (Bug #5181)
2019-10-20 16:05:29 +03:00
Capostrophic
fc7b4d73a8 Remove on-strike enchantment support for ranged weapon types (bug #5190) 2019-10-20 13:34:42 +03:00
Alexei Dobrohotov
85a5355e5c
Merge pull request #2563 from akortunov/ammofix
Fix OnStrike bows charges
2019-10-20 11:25:12 +03:00
Andrei Kortunov
dd781b3da2 Fix OnStrike bows charges (regression #5191) 2019-10-20 10:21:47 +04:00
elsid
e4d0af6a6d
Use z coordinate for path distance when diff by z is greater then actor height 2019-10-19 22:01:32 +02:00
Capostrophic
43b1b9dfa2 Weather-related fixes (incl. bug #4783)
Simplify some calculations
Fix Blizzard weather direction
Fix sky direction during storm
2019-10-19 22:47:21 +03:00
elsid
81832f8e17
Reuse distance functions 2019-10-19 12:51:37 +02:00
bzzt
1316816148 fix #5176 2019-10-18 13:37:00 +00:00
Alexei Dobrohotov
dec64a7fba
Fix typos in invalid spell effect warnings, clarify them 2019-10-17 23:45:27 +03:00
David Cernat
1ab5916078 [Client] Reorder RecordHelper's overrideRecord() methods alphabetically 2019-10-17 06:58:56 +03:00
David Cernat
520cedb553 [Client] Use overrideRecord name for related functions in RecordHelper 2019-10-16 18:05:52 +03:00
David Cernat
2fc50d7280 [Client] Fix includes for RecordHelper 2019-10-16 15:34:25 +03:00
David Cernat
aa06056d00 [Client] Add createRecord() function to RecordHelper 2019-10-16 13:14:32 +03:00
David Cernat
13deaa88f2 [Client] Fix typo in code used for setting creature base inventories 2019-10-15 08:49:32 +03:00
David Cernat
835ae816a1 [Client] Use a template to combine RecordHelper's existence checks 2019-10-15 08:47:54 +03:00
David Cernat
17020fc13a [Client] Use a template to combine RecordHelper override functions 2019-10-15 07:21:48 +03:00
Andrei Kortunov
6e6d6d7bda Use forward declaration 2019-10-14 15:40:35 +04:00
Andrei Kortunov
606b73ee96 Use rain settings from openmw.cfg (bug #4262) 2019-10-13 22:32:23 +04:00
David Cernat
d113f81237 [Client] Set correct worldspace for cell overrides in RecordHelper 2019-10-13 13:42:03 +03:00
Capostrophic
bc5d54a161 Fix GetEffect result when running on dead actors 2019-10-12 19:06:10 +03:00
Andrei Kortunov
31e78ed41f Rework 'prevent merchant equipping' feature 2019-10-12 14:17:03 +04:00
David Cernat
02bca3f52d [Client] Fix if check in ObjectList::setMemberShorts() 2019-10-11 21:53:53 +03:00
David Cernat
19418f4953 [Client] Don't ignore entire Actor packet if one actor can't be found 2019-10-11 21:29:21 +03:00
Capostrophic
ce943b4f9e Make enchantments affect all actors with an inventory (bug #5186) 2019-10-11 19:29:12 +03:00
Andrei Kortunov
19e9ece291
Merge pull request #2551 from Capostrophic/onpcequip
Set OnPCEquip properly when a race can't equip an item (bug #5182)
2019-10-11 20:07:35 +04:00
Andrei Kortunov
67bef9a3a1
Merge pull request #2554 from Capostrophic/summon
Make sure summoned creatures are removed upon caster death (#5183)
2019-10-11 20:06:16 +04:00
Alexei Dobrohotov
ccb557edf0
Merge pull request #2552 from akortunov/greeting
Split greetings from AiWander
2019-10-11 02:11:46 +03:00
Alexei Dobrohotov
cdbe58c33a
Merge branch 'master' into windspeed 2019-10-11 02:04:30 +03:00
Andrei Kortunov
2fc819cdae Encode ID's in all places to UTF-8 (bug #3977) 2019-10-10 20:52:32 +04:00
Capostrophic
e9009f8d10 Make sure summoned creatures are removed upon caster death 2019-10-10 17:57:45 +03:00
Nelsson Huotari
78f2a5181d Default brush size to 1 2019-10-10 14:27:22 +03:00
Nelsson Huotari
fbb9800e89 Better terrain texture ID handling 2019-10-10 14:27:22 +03:00
Nelsson Huotari
301c05662b assignment to memb. init. list, publics to private, virtual -> final 2019-10-10 14:27:22 +03:00
Andrei Kortunov
69aceb5c1e Split greetings from AiWander (bug #4594) 2019-10-10 09:28:40 +04:00
Alexei Dobrohotov
b7a1e6561b
Merge pull request #2080 from akortunov/recharge
Recharge items outside of player inventory
2019-10-09 23:37:10 +03:00
David Cernat
d163f1b6da [General] Turn WorldKillCount into a Worldstate packet
Rename the old WorldKillCount that was a Player packet into PlayerPlaceholder. Rename the unused CellCreate that was a Worldstate packet into WorldKillCount. On the server, move kill count-related script functions from QuestFunctions to WorldstateFunctions.
2019-10-08 11:09:08 +03:00
Capostrophic
c718f89325 Set OnPCEquip properly when a race can't equip an item (bug #5182) 2019-10-07 23:38:22 +03:00
Andrei Kortunov
c51aba0b13 Recharge items outside of player's inventory (bug #4077) 2019-10-07 22:59:43 +04:00
elsid
d1d6ba3ed0
Fix rebuild path for walking actors
Ignore z coordinate for not swimming nor flying actors to calculate
distance from actor destination to last path point. If walking actor
destination point is floating above the ground then a point on navmesh
may be too far away when z coordinate is included. In this case path
will be rebuild on each AI_REACTION_TIME.
2019-10-07 20:25:07 +02:00
Andrei Kortunov
f75f9cb337 Use localized faction name when using TFH 2019-10-07 12:14:22 +04:00
David Cernat
4a34666c59 Add OpenMW commits up to 7 Oct 2019
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
2019-10-07 08:19:21 +03:00
Andrei Kortunov
f0b73e0a27 Do not store owners for items in container stores (bug #1933) 2019-10-05 17:29:00 +04:00
Andrei Kortunov
2b2f63c919
Merge pull request #2538 from Capostrophic/animation
Use random attack strength if there's no wind up animation (bug #5059)
2019-10-02 08:23:13 +04:00
Alexei Dobrohotov
6f99747fff
Merge pull request #2507 from elsid/door_stuck
Fix actors stuck in closing door (bug #5138)
2019-10-01 22:39:58 +03:00
elsid
7fbc696d44
Change angle direction by rolling dice to avoid rotating door 2019-09-29 13:44:06 +02:00
elsid
6253d2a7ac
Undo door rotation once 2019-09-29 13:42:51 +02:00
Andrei Kortunov
ca46da8b04 Do not stack initially added scripted items (bug #5136) 2019-09-29 13:08:52 +04:00
David Cernat
031acffcbe [General] Implement cell records for RecordDynamic packets, part 1
New interior cells can be now be created that are either blank or based on existing interior cells.
2019-09-28 13:12:48 +03:00
David Cernat
18a7ac5940 [Client] Make it possible to override Cell records in ESMStore 2019-09-28 13:10:43 +03:00
David Cernat
0b85829e38 [Client] Make it possible to unload Cells & clear CellStores from World 2019-09-28 13:09:03 +03:00
Alexei Dobrohotov
e744090339
Merge pull request #2535 from akortunov/activate
Implement vanilla-style AiActivate
2019-09-26 00:42:43 +03:00
Capostrophic
4d381d0804 Use random attack strength if there's no wind up anim (bug #5059) 2019-09-24 22:42:04 +03:00
Andrei Kortunov
e5564df8cb Implement vanilla-style wind speed calculations (bug #4449) 2019-09-24 10:59:58 +04:00
Andrei Kortunov
48aba76ce9 Implement vanilla-style AiActivate (bug #4456) 2019-09-24 09:30:39 +04:00
Capostrophic
421a9d2e50 [Regression] Fix pickpocket crashes 2019-09-23 23:56:37 +03:00
David Cernat
339428872e [Client] Fix infinite loop in CellController
Previously, using CellController::getCellStore() to get an unloaded CellStore would make its references get loaded in the process, with the CellStore's loadRefs() then running updateMergedRefs(), which in turn – before getting as far as setting the CellStore's state to State_Loaded – would call CellController::hasLocalAuthority() on its accompanying ESM::Cell, which would then run CellController::isActiveWorldCell(), which would then run CellController::getCellStore() to get the CellStore again, which – still being marked as unloaded – would run the whole loop again... and again.
2019-09-23 21:18:38 +03:00
David Cernat
d4df2948dd [Client] Use clearer wording for comment in GUIController 2019-09-23 20:30:33 +03:00
David Cernat
219f0cb88e [Client] Fix typo in 56f084c9c0 by using correct function 2019-09-23 07:55:16 +03:00
Andrei Kortunov
b360deaec3 Store raw data about fog of war instead of RGBA images (bug #5108) 2019-09-22 19:59:12 +04:00
Alexei Dobrohotov
ac5491b5c2
Merge pull request #2534 from akortunov/toggleview
Improve resurrection handling
2019-09-22 02:02:03 +03:00
Andrei Kortunov
eb1245664f
Merge pull request #2533 from Capostrophic/levelledlist
Fix chance none logic for nested levelled lists (bug #5169)
2019-09-21 20:58:13 +04:00
Andrei Kortunov
6450d84473 Improve resurrection handling 2019-09-21 20:22:45 +04:00
Andrei Kortunov
0ff8e83a39
Merge pull request #2532 from Assumeru/undefined
Fix undefined behaviour
2019-09-21 18:35:08 +04:00
Evil Eye
3d3ffdfcd8 override eraseStatic for dialogue 2019-09-21 16:24:05 +02:00
Capostrophic
7c9a9d7de0 Fix chance none logic for nested levelled lists (bug #5169) 2019-09-21 14:30:38 +03:00
David Cernat
6828d83a42 [Client] Always hash input for password dialogs
Additionally, clean up repetitive code in GUIController.
2019-09-21 14:26:02 +03:00
David Cernat
3903ac6526 [Server] Add script functions for getting SHA256 hashes & random strings 2019-09-21 14:22:19 +03:00
Alexei Dobrohotov
acc4811d12
Merge branch 'master' into guifixes 2019-09-20 20:03:02 +03:00
okdshin
c15b3377da [General] Add PicoSHA2 hash generator to extern 2019-09-20 10:25:34 +03:00
Andrei Kortunov
7cb6a9c1e9 Do not allow to use quick keys during chargen 2019-09-20 07:27:34 +04:00
Andrei Kortunov
1bddbbcfa0 Check if related menus are allowed when using cycle hotkeys (bug #5167) 2019-09-20 07:27:27 +04:00
Andrei Kortunov
a4d196f33f Force view change when using Force1stPerson and Force3rdPerson commands (bug #5168) 2019-09-19 21:48:43 +04:00
David Cernat
7caa6cd8fe [Client] Prevent ActorAI spam from actors starting combat in scripts 2019-09-19 13:58:01 +03:00
David Cernat
ca21bc35c2 [Server] Add script functions that read & send ScriptGlobalShort packets 2019-09-19 08:46:54 +03:00
David Cernat
cc25612b8d Add OpenMW commits up to 18 Sep 2019
# Conflicts:
#	apps/openmw/mwclass/container.cpp
#	apps/openmw/mwclass/door.cpp
#	apps/openmw/mwmechanics/security.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/miscextensions.cpp
2019-09-18 23:46:08 +03:00
Alexei Dobrohotov
fb87778493
Merge branch 'master' into organic-locks 2019-09-18 20:36:40 +03:00
Andrei Kortunov
94a281370f Continue scripts execution after player's death (bug #5166) 2019-09-17 22:40:51 +04:00
Evil Eye
32de86d114 merge master 2019-09-17 20:31:53 +02:00
Evil Eye
7c8b82f45c move locking behaviour to cellref 2019-09-17 20:30:37 +02:00
Andrei Kortunov
85bb4a76f6 Improve faction items handling (bug #5164) 2019-09-17 19:09:08 +04:00
Andrei Kortunov
4a6d2cbaff Do not allow player to take items from evidence chests (bug #3609) 2019-09-17 19:08:33 +04:00
Andrei Kortunov
649a14dfae
Merge branch 'master' into activation 2019-09-16 10:52:16 +04:00
Andrei Kortunov
a7cfe5853c
Merge pull request #2522 from Capostrophic/extradata
Refactor NIF extra data and particle modifier handling
2019-09-16 10:19:49 +04:00
Capostrophic
480000da07 Use Open action as fallback for companion activation (bug #5161) 2019-09-15 23:17:36 +03:00
elsid
209e33f5ce
Open door when it is on the way to a next path point 2019-09-15 21:16:00 +02:00
elsid
653a391084
Do not open doors when actor has no path
When actor is not going anywhere it doesn't require to go through doors
so there is no need to open them.
2019-09-15 21:12:33 +02:00
elsid
d4b7b3e999
Check for AiPackage type before find nearby door 2019-09-15 21:12:29 +02:00
David Cernat
56f084c9c0 [Client] Fix packet spam for repetitive setting of the same global value 2019-09-15 16:10:09 +03:00
David Cernat
ceb16bb6f8 [Client] Reimplement temporary fix from c65d6c1328
The real reason for the crash remains to be fixed.
2019-09-14 19:41:34 +03:00
David Cernat
afa704ce95 [Server] Add OnScriptGlobalShort event 2019-09-14 13:09:01 +03:00
David Cernat
e424bd9bc3 [General] Implement ClientScriptSettings packet, part 2
The packet can now set which client globals get packets sent about them when their values change on clients.
2019-09-14 09:37:19 +03:00
Capostrophic
790531671a Fix tests 2019-09-13 21:29:49 +03:00
Capostrophic
8baddefdbd Refactor extra data and particle modifier handling
Objects no longer inherit from extra data class
"Controlled" harmful abstraction no longer exists
Introduced NiParticleModifier/NiParticleCollider abstractions
Extra data size reading moved into the base read() method
2019-09-13 20:26:22 +03:00
Evil Eye
85d52ec183 oops 2019-09-11 22:05:24 +02:00
Alexei Dobrohotov
6128279dbf
Merge pull request #2517 from unelsson/terraintextureselection
[Final tests] Editor: Terrain texture selection
2019-09-11 14:09:45 +03:00
Capostrophic
718dbd3f9a Use object ID as the substitution for their name (bug #5158) 2019-09-11 00:06:50 +03:00
Capostrophic
6b74630f6e Preparation work
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
2019-09-10 23:38:16 +03:00
Capostrophic
9788a776b9 Avoid Qt "opening user openmw.cfg twice" warning 2019-09-10 22:56:04 +03:00
Evil Eye
a86a8ecc0e Allow locking/picking just about everything 2019-09-10 21:53:26 +02:00
Nelsson Huotari
4ccb951126 move check to outermost scope 2019-09-10 12:15:19 +03:00
Nelsson Huotari
0880923189 Consistency for variable and header argument names. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
6dc3d8b44b More readable code 2019-09-10 12:15:19 +03:00
Nelsson Huotari
780055899d Don't add empty primitive sets to geometry. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
3becacf6d1 Remove globals, const int& -> int, values to const ref. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1dcee833a1 Less verbose syntax 2019-09-10 12:15:19 +03:00
Nelsson Huotari
5a143fe99d Remove extra include 2019-09-10 12:15:19 +03:00
Nelsson Huotari
39ab449431 Only allow selection of cells in view 2019-09-10 12:15:19 +03:00
Nelsson Huotari
dc8de6c6e6 Make less copies 2019-09-10 12:15:19 +03:00
Nelsson Huotari
001ca68cc7 Remove empty lines 2019-09-10 12:15:19 +03:00
Nelsson Huotari
46ee639892 pass by const ref and other fixes 2019-09-10 12:15:19 +03:00
Nelsson Huotari
20ab7df19f Fixes, cleanup. 2019-09-10 12:15:19 +03:00
Nelsson Huotari
1a08944a8b Remove unused code, clarifications, optimizations 2019-09-10 12:15:19 +03:00
Nelsson Huotari
d6722c7492 Terrain texture selection, support for vertex selection 2019-09-10 12:15:19 +03:00
Evil Eye
56b6a7ada4 Fix #5155 2019-09-09 22:29:59 +02:00
David Cernat
3acfbad55d [General] Implement ClientScriptSettings packet, part 1
For starters, the new packet can set which client scripts have all of their variables synchronized between players. The previous hardcoded list of IDs for synchronized scripts has been removed.
2019-09-09 10:28:35 +03:00
David Cernat
25e27ccb95 [General] Use placeholder packet ID for unused CellCreate packet 2019-09-09 10:22:20 +03:00
Andrei Kortunov
d58f93f388 Use sayDone() only for scripting backward compatibility 2019-09-06 09:19:41 +04:00
David Cernat
ca67587b89 Add OpenMW commits up to 5 Sep 2019
# Conflicts:
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-09-05 21:41:50 +03:00
Andrei Kortunov
c9deb1b325 Generate sCrimeMessageReport only once per frame (bug #5012) 2019-09-05 20:16:03 +04:00
Andrei Kortunov
58be8dc976
Merge pull request #2513 from Capostrophic/crime
Make sure failed pick/trap attempts are a crime (bug #5149)
2019-09-05 18:51:16 +04:00
Capostrophic
c89c14bb68 Rename objectOpened() to make its role more clear 2019-09-05 17:36:49 +03:00
Capostrophic
8317dc0709 Make sure failed pick/trap attempts are a crime (bug #5149) 2019-09-05 17:29:49 +03:00
James Stephens
bafbc0a055 Cancel door sound if collision is detected and the sound is playing 2019-09-05 07:49:53 +00:00
Alexei Dobrohotov
2daecc633e
Revert Vampirism behavior upon death to 0.45.0-like state
Until we figure out the better way to handle vampire stuff tangled together with post-death animation magic effect reset.
2019-09-04 16:42:34 +03:00
David Cernat
190c404b38 [Client] Calculate spell success in more appropriate place
Previously, creatures with fast spellcasting animations would cast their spells before their success had actually been calculated, causing them to fail.
2019-09-02 23:50:56 +03:00
James Stephens
7d3f6e1cd9 Altered process so that cost only appears on spell purchase window.
Added myself to authors
2019-09-02 17:18:56 +00:00
James Stephens
b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 2019-09-02 17:13:56 +00:00
James Stephens
1cd1bfca74 Fixes bug #4650 2019-09-02 16:49:29 +02:00
David Cernat
95967ea289 [General] Rename unused ObjectReset packet into ObjectHit 2019-09-01 08:30:03 +03:00
David Cernat
6dccdfe0c1 [Client] Load up TES3MP's settings in the same map as OpenMW's settings
This allows the "font size" property to be read when the chat window is created.
2019-08-28 06:37:33 +03:00