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

24728 commits

Author SHA1 Message Date
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
Alexei Dobrohotov
2e05e0e829
Merge pull request #2514 from akortunov/guifixes
Generate sCrimeMessageReport only once per frame
2019-09-06 16:20:42 +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
Alexei Dobrohotov
9ce556832e Merge branch 'CancelDoorShutSoundWhenDoorBlocked' into 'master'
Bug #4270: Cancel door sound if collision is detected and the sound is playing

See merge request OpenMW/openmw!147
2019-09-05 07:49:53 +00: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
Andrei Kortunov
0caf192212 Merge branch 'ShowSpellMagickaCostInSpellBuyingWindow' into 'master'
Adds requested feature #5147: Show spell magicka cost in spell buying window

See merge request OpenMW/openmw!144
2019-09-02 17:18:56 +00: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
Andrei Kortunov
08614f6a87 Merge branch 'AlchemyQuestionMarkNotCentered' into 'master'
Fixes the offset question mark in the alchemy tooltip when the effect is not known

See merge request OpenMW/openmw!143
2019-09-02 17:13: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
Andrei Kortunov
626e943c43 Merge branch 'FocusLostESCSaveConfirmationDialog' into 'master'
Fixes bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog

See merge request OpenMW/openmw!145
2019-09-02 17:11:24 +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
Capostrophic
cf0c71c651 Water shader cleanup 2019-08-30 22:32:48 +03:00
Alexei Dobrohotov
a8f5fe3eff
Merge pull request #2508 from akortunov/counter
Handle death event manually if needed before disposing a corpse
2019-08-28 13:51:38 +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
David Cernat
9b1fbcc6f9 [General] Use correct packet ID in PacketActorCast 2019-08-28 06:35:19 +03:00
Roman Siromakha
3b47e9039c
Merge pull request #2509 from OpenMW/revert-2494-ai_open_door
Revert "[WIP] Open door when it is on the way to a next path point (bug #5073)"
2019-08-27 20:55:33 +02:00
Roman Siromakha
41ad23ebdc
Revert "[WIP] Open door when it is on the way to a next path point (bug #5073)" 2019-08-27 20:55:03 +02:00
Roman Siromakha
ea04fcbd09
Merge pull request #2494 from elsid/ai_open_door
[WIP] Open door when it is on the way to a next path point (fix bug #5073)
2019-08-27 20:54:58 +02:00
elsid
b4ec444057
Open door when it is on the way to a next path point 2019-08-27 20:49:35 +02:00
elsid
97cd9d434a
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-08-27 20:49:35 +02:00
elsid
389f5dfb9b
Check for AiPackage type before find nearby door 2019-08-27 20:49:35 +02:00
elsid
cb0a609d59
Merge branch 'master' into HEAD 2019-08-27 20:49:12 +02:00
elsid
69b4fe8545
Revert "Open door when it is on the way to a next path point"
This reverts commit c32872fb16.
2019-08-27 20:49:07 +02: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
63f55ce762 [GUI] Fix chat window layout after 1ce370e7fa made it stop working 2019-08-27 10:53:26 +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
Alexei Dobrohotov
ceff1defb4
Merge pull request #2504 from elsid/door_state_enum
Add enum type for door state
2019-08-27 02:05:17 +03:00
Alexei Dobrohotov
06c792e434
Merge pull request #2505 from Capostrophic/crashfix
Avoid using getPtr() on empty geometry data
2019-08-26 23:07:18 +03:00
Capostrophic
c0438a0c6b Avoid using getPtr on empty geometry data 2019-08-26 23:01:58 +03: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