teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
20577 commits 34 branches 0 tags 66 MiB
Commit graph

11283 commits

Author SHA1 Message Date
David Cernat
4d4eb1bb9f Merge pull request #292 from OpenMW/master 
Add OpenMW commits up to 18 Sep 2017
 2017-09-19 09:40:45 +03:00
Andrei Kortunov
2806a35a61 Fixed padding of MessageBox buttons 2017-09-18 23:09:38 +04:00
Andrei Kortunov
65d8e2ff5d Allow to use GetDetected without a reference (bug #3110) 2017-09-18 21:46:57 +04:00
Chris Robinson
917a3b5dff Avoid creating temp strings when looking for an animation stop key 2017-09-18 01:41:05 -07:00
Chris Robinson
b770c1493f Don't spam about missing animations 2017-09-18 01:28:40 -07:00
Chris Robinson
074be7d7c6 Remove a function from the sound manager interface 2017-09-18 01:28:39 -07:00
scrawl
d294d7e284 Fix possible fall damage when switching from falling to flying 2017-09-17 23:16:49 +00:00
scrawl
00034192dc Fix player Ptr in RenderingManager not being updated on cell changes 
Noticed that 'setpos' wasn't working in the console with the player selected.
 2017-09-17 23:07:17 +00:00
scrawl
fcb815f2c7 Move fall height reset into PhysicsSystem (Fixes #4049) 
To avoid using onGround before it's actually set.
 2017-09-17 23:06:51 +00:00
scrawl
a560841705 Merge pull request #1460 from AnyOldName3/invalid-death-count-cleaning 
Check death counts are for valid actors before loading them
 2017-09-17 14:42:56 +00:00
scrawl
242d085da0 Merge pull request #1455 from kcat/master 
Print sound init info and preload sound buffer info
 2017-09-17 13:24:15 +00:00
scrawl
c39c29722b Merge pull request #1459 from akortunov/cyclingfix 
Cycle only through weapons which player can equip
 2017-09-17 13:17:41 +00:00
AnyOldName3
0be7e2a5a5 Fix really obvious flaw with ignored records not being skipped that I missed 2017-09-17 14:16:17 +01:00
Andrei Kortunov
10a0136b4a Cycle only through weapons which can be equipped by player (bug #4104) 2017-09-17 17:14:50 +04:00
AnyOldName3
5a5cb1a160 Check death counts are for valid actors before loading them 2017-09-17 14:09:29 +01:00
Andrei Kortunov
3fb3c4c20f Add scrollbar to a birth effect lists (bug #4105) 2017-09-17 14:06:01 +04:00
David Cernat
960b91a53c Merge pull request #290 from OpenMW/master 
Add OpenMW commits up to 17 Sep 2017
 2017-09-17 10:53:33 +03:00
Chris Robinson
41bb35655b Avoid an extra call to get the buffer size 2017-09-16 16:25:32 -07:00
Chris Robinson
5c53ee42a1 Prepare all Sound_Buffers when retrieving the first one 2017-09-16 16:25:32 -07:00
Chris Robinson
4b448c74d2 Use range-for loops instead of for_each 2017-09-16 16:25:32 -07:00
Chris Robinson
1e729e8da9 Avoid more explicit loops 2017-09-16 16:25:32 -07:00
Chris Robinson
9dbb713b7c Print a bit more information for sound initialization 2017-09-16 16:25:32 -07:00
Chris Robinson
acd6d9cd72 Try opening the default device fallback in OpenAL_Output 2017-09-16 16:25:32 -07:00
scrawl
f594eda574 Reset attackStrength when starting a new attack (Fixes #3935) 2017-09-16 23:04:54 +00:00
scrawl
5dd2e871c8 Merge pull request #1450 from kcat/master 
Sound improvements
 2017-09-16 15:59:13 +00:00
scrawl
a8c287b692 Merge pull request #1447 from akortunov/stancechangefixes 
Clear player fields upon reload (bug #2639)
 2017-09-15 20:48:28 +00:00
Andrei Kortunov
44738e1141 Clear player fields upon reload (bug #2639) 2017-09-15 22:39:56 +04:00
Chris Robinson
d68e1581ee Use an std::array for the OpenAL stream buffers 2017-09-15 05:40:20 -07:00
Chris Robinson
780e82480d Make the PlayMode and PlayType enums scoped 
Also shorten them by putting them in the MWSound namespace
 2017-09-15 02:36:59 -07:00
Chris Robinson
0c1ad7c74e Replace a few more explicit loops 2017-09-15 02:36:46 -07:00
David Cernat
c98e6dc833 Merge pull request #288 from OpenMW/master 
Add OpenMW commits up to 14 Sep 2017
 2017-09-15 03:30:20 +03:00
Chris Robinson
1e123a22e1 Avoid some explicit loops 2017-09-14 16:56:46 -07:00
Chris Robinson
3757571d46 Set HRTF when initializing the device 2017-09-14 16:00:43 -07:00
Chris Robinson
c17edfd547 Don't be so throw-happy in the sound manager 2017-09-14 16:00:43 -07:00
Chris Robinson
abe80f5868 Move the soundlist when updating a Ptr instead of copying 2017-09-14 16:00:43 -07:00
Chris Robinson
605c937572 Ensure 3D sources are spatialized 
Standard OpenAL does not spatialize non-mono sounds, although the game has some
stereo sounds meant to play in 3D. The desired behavior can be achieved with
the AL_SOFT_source_spatialize extension.
 2017-09-14 16:00:43 -07:00
Chris Robinson
6f57233ba1 Avoid copying the same Ptr with each iteration 2017-09-14 16:00:42 -07:00
Chris Robinson
edfba68eb5 Apply reverb and a low-pass filter when underwater 
This replaces the pitch-shift effect when available.
 2017-09-14 16:00:42 -07:00
Chris Robinson
27eeaf90d0 Use unordered_map for the music playlist and sound buffer caches 2017-09-14 16:00:42 -07:00
Chris Robinson
033303b911 Properly update the near water sound volume 2017-09-14 16:00:42 -07:00
Chris Robinson
0b720cd90c Set the appropriate meter/unit scale for sound 2017-09-14 16:00:41 -07:00
Chris Robinson
c790fedd3f Load an effect and filter for underwater 2017-09-14 16:00:41 -07:00
Chris Robinson
3d37cb3cf6 Load EFX functions when available 2017-09-14 16:00:41 -07:00
Chris Robinson
c5a3fb7ccd Simplify checking for near water sfx change 
Rather than checking every frame you're near the water, only check when the
current cell changed (the sfx will only change when moving between interior and
exterior). It also doesn't need to look through all playing sounds, as it's a
local one not attached to a Ptr.
 2017-09-14 16:00:41 -07:00
Chris Robinson
617c05f557 Make Sound and Stream sibling types 
To avoid being able to accidentally cast a Stream* to a Sound*, or vice-versa.
 2017-09-14 16:00:40 -07:00
Chris Robinson
9e45f6d05f Make a note that stopTrack needs to be called for a stopping track 2017-09-14 16:00:40 -07:00
Chris Robinson
9e7a49f66e Include alext.h to get OpenAL extension definitions 2017-09-14 16:00:40 -07:00
Chris Robinson
1fe60dd8e2 Replace some shared_ptrs with pointers to deque entries 2017-09-14 16:00:30 -07:00
Bret Curtis
e517ad3f7b add ktx support for splashscreens 2017-09-14 10:06:36 +02:00
Bret Curtis
dff0a766a8 adding 3 more extensions 2017-09-13 15:30:22 +02:00
Bret Curtis
b26887ef9b add support for png and dds splashscreens to begin with. 2017-09-13 13:52:05 +02:00
David Cernat
bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2017-09-12 07:38:49 +03:00
scrawl
bd667c3847 Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir 
If CMake supports it, sets the debugger working directory for Visual …
 2017-09-11 10:30:50 +00:00
scrawl
00ae9a01a1 Merge pull request #1445 from akortunov/guifixes 
Allow to add levelup a description for levels > 20
 2017-09-11 10:28:09 +00:00
scrawl
407640322d Merge pull request #1439 from akortunov/resistfix 
Take in account elemental shields for GetResist and SetResist script commands
 2017-09-11 10:27:47 +00:00
Andrei Kortunov
7760e4514c Allow to add levelup a description for levels > 20 2017-09-10 22:47:34 +04:00
scrawl
7688696765 Merge pull request #1437 from Capostrophic/nodemapfix 
Use constant nodeMap during part updating in creature animation
 2017-09-10 18:15:20 +00:00
Andrei Kortunov
c6fd75bf42 Take in account elemental shields for GetResist and SetResist script commands (bug #4093) 2017-09-10 22:05:58 +04:00
scrawl
618ec6dcdd Merge pull request #1440 from akortunov/guardfix 
Allow guards to attack fighting creatures only in fAlarmRadius range
 2017-09-10 17:06:14 +00:00
Andrei Kortunov
661232222f Allow guards to attack fighting creatures only in fAlarmRadius range 2017-09-10 15:26:48 +04:00
Capostrophic
9503d61866 Use const nodeMap in creature animation 2017-09-09 23:22:16 +03:00
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
MiroslavR
1e585ac71a Log a warning in case of missing bookart instead of showing a pink rectangle (Fixes #3826) 2017-09-08 22:50:07 +02:00
AnyOldName3
3c0ec0d6d0 If CMake supports it, sets the debugger working directory for Visual Studio 2017-09-08 17:26:46 +01:00
Andrei Kortunov
ac2f20f983 Update a disposition bar when a dialogue widget is disabled, but visible 2017-09-08 19:42:06 +04:00
scrawl
8f1c8759e4 Merge pull request #1432 from akortunov/alchemyfix 
Update alchemy effects after every created potion (#4079)
 2017-09-07 20:51:42 +00:00
Andrei Kortunov
dc0313a36f Use base skill value when calculating rank requirements 2017-09-07 21:06:10 +04:00
Andrei Kortunov
7559d25317 Update alchemy effects after every created potion (#4079) 2017-09-06 15:11:47 +04:00
David Cernat
b94c0a9991 [Client] Don't send Attribute & Skill packets as werewolf, part 2 2017-09-04 20:21:06 +03:00
David Cernat
b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
 2017-09-04 18:05:24 +03:00
David Cernat
8c9d6a0160 [Client] Ensure that LocalPlayer's isWerewolf starts out false 2017-09-04 15:44:10 +03:00
David Cernat
ccb15cc09e [Client] When players die, make guards willing to arrest them again 2017-09-04 15:13:05 +03:00
scrawl
4c5992a0d5 Warn if removing a node fails 2017-09-01 21:42:35 +00:00
scrawl
132ac6001b Fix bug of Animation::mSkeleton not being assigned 
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
 2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713 Merge pull request #1428 from akortunov/stancechangefixes 
[Feedback needed] Stance switching changes, part II
 2017-09-01 21:42:08 +00:00
Andrei Kortunov
7f5f5458d4 Reset player attack animation when unequip weapon or tool 2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec Allow to interrupt an attack, if attack button is held 2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a Fixes a regression with bound weapons equipping (bug #4050) 2017-09-01 08:59:05 +04:00
scrawl
a8005c33d9 Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51 2017-08-31 21:58:12 +00:00
David Cernat
2e8718a0e0 Merge pull request #282 from OpenMW/master 
Add OpenMW commits up to 31 Aug 2017, part 2
 2017-08-31 18:42:54 +03:00
David Cernat
3fc1bdecb3 [Client] Shorten player names to 31 characters after they are inputted 2017-08-31 18:41:37 +03:00
David Cernat
ac3254d85f [General] Don't send PlayerAttribute and PlayerSkill packets as werewolf 
This will prevent the server from overwriting a player's human form stats with their werewolf form stats.

Additionally, share PlayerShapeshift packets last when exchanging data with another player.
 2017-08-31 18:21:38 +03:00
David Cernat
93d1aa2e4a [Client] Comment out the broken sending of custom spells until 0.7.0 2017-08-31 17:07:45 +03:00
David Cernat
98a7769b91 Merge branch 'master' into 0.6.0 2017-08-31 15:44:27 +03:00
Andrei Kortunov
1aaa8a76c5 Allow to play only one copy of given sound at time (bug #3647) 2017-08-31 16:14:48 +04:00
David Cernat
4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-08-31 15:14:13 +03:00
Koncord
54f5104345 [General] Escape format for strings 2017-08-31 20:09:05 +08:00
Andrei Kortunov
91dcd5bc6e Do not allow to unequip weapon from inventory during attack 2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5 Do not allow to switch weapon to probe or lockpick during attack 2017-08-31 12:36:54 +04:00
David Cernat
cca4991e74 [Utils] Use consistent names for utility functions added by tes3mp 2017-08-31 10:12:22 +03:00
David Cernat
cf4021a7b5 [Client] Only add valid quests to journal 2017-08-31 09:08:29 +03:00
David Cernat
134dd06d48 [Client] Only add valid inventory & equipment items to LocalPlayer 
Also add related debug information.
 2017-08-31 08:35:46 +03:00
David Cernat
c3d1eada89 [Client] Only add spells to players that are ensured to exist 2017-08-31 06:42:11 +03:00
David Cernat
f6d36d5d80 [Client] Ensure that objects searched for have a valid reference number 2017-08-31 03:40:36 +03:00
scrawl
8c6a8ca48d Respect the framelimit in all cases (Fixes #3531) 
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
 2017-08-30 21:26:30 +00:00
scrawl
dc53573de4 Merge pull request #1405 from akortunov/stancechangefixes 
Do not allow player to change weapon/spell during attack or spellcast
 2017-08-29 23:11:23 +00:00
scrawl
43fda6cf07 Merge pull request #1423 from akortunov/spellpriority 
Combat AI: use effective cast cost when rate enchanted weapon
 2017-08-29 22:38:36 +00:00
Andrei Kortunov
73d5efabee Display negative values on fatigue progress bar 2017-08-29 18:53:21 +04:00
Andrei Kortunov
8003dbee12 Combat AI: use effective cast cost when rate enchanted weapon 2017-08-29 16:40:55 +04:00
Andrei Kortunov
fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 2017-08-29 15:53:23 +04:00
scrawl
4fba157d3b Implement releaseGLObjects for cached resources 2017-08-26 19:29:12 +00:00
Harry
86ae2ae395 Improved shuffle (#1412) 2017-08-25 20:08:49 +00:00
AnyOldName3
1578fcbec7 Escape content file names before sending them to the GUI 2017-08-25 10:05:56 +00:00
David Cernat
2597f018d2 Merge pull request #272 from TES3MP/0.6.0 
Add hotfix commits for 0.6.0 up to 23 Aug 2017
 2017-08-23 07:22:29 +03:00
David Cernat
a883c8f8aa [Client] Prevent scripts from creating PlayerTopic packet spam 2017-08-23 07:14:45 +03:00
David Cernat
8f543fb34e [Client] Use less exploitable way of disabling console 
Previously, large framerate drops allowed players to open and use the console for short periods of time.
 2017-08-23 04:58:07 +03:00
David Cernat
056d54e9f7 [Client] Only send ObjectScale packets for objects located in cells 2017-08-23 02:45:38 +03:00
scrawl
30665b743d Merge pull request #1416 from akortunov/guifixes 
Display large  journal entries correctly
 2017-08-22 20:37:46 +00:00
Andrei Kortunov
0177fe6602 Display large entries in journal correctly 2017-08-22 23:26:06 +04:00
Andrei Kortunov
e799cbdb51 Combat AI: allow only one summoned creature at time 2017-08-22 09:18:49 +04:00
scrawl
f0dea8b8e6 Revert "Implement a Fisher-Yates shuffle on background music" 2017-08-20 20:20:27 +00:00
David Cernat
ac27ca663b [Client] Don't send ObjectState packets for items in containers 2017-08-20 06:58:39 +03:00
scrawl
dbb8a5c959 Merge pull request #1401 from h313/master 
Implement a Fisher-Yates shuffle on background music
 2017-08-19 22:48:24 +00:00
Harry
2a85c5f011 Implement a Fisher-Yates shuffle on background music 
This fixes sometimes getting repetitive background music
 2017-08-19 14:48:00 -04:00
Andrei Kortunov
65d05ee1cd Get only text from clipboard (bug #4025) 2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b Revert commit 67d59bead5 (a better 
implementation found)
 2017-08-19 15:24:06 +04:00
scrawl
2611377081 Merge pull request #1350 from akortunov/deathanimationfix 
Do not allow to loot fighting actors during death animation (bug #3528)
 2017-08-18 22:04:12 +00:00
scrawl
f277007b49 Merge pull request #1404 from akortunov/ownedcrosshair 
Owned crosshair feature improvements [discussion]
 2017-08-18 20:21:23 +00:00
Andrei Kortunov
7c80ddc9de Owned crosshair improvements (bug #2789) 2017-08-18 17:08:15 +04:00
Andrei Kortunov
641a6cd842 Added a delay before summoned creature corpse despawning 2017-08-18 11:58:28 +04:00
David Cernat
cffd985038 Merge pull request #266 from TES3MP/0.6.0 
Add hotfix commits for 0.6.0 up to 18 Aug 2017
 2017-08-18 07:45:36 +03:00
Capostrophic
6c8c883dc0 Making knownEffect aware that there can be more than 4 potion effects 2017-08-18 00:47:28 +03:00
scrawl
b73ed5ccac Merge pull request #1391 from akortunov/aifollow 
AiFollow: add a threshold when turning to target
 2017-08-17 20:17:11 +00:00
Andrei Kortunov
d8d47f081b AiFollow: add a threshold when turning to target 2017-08-17 22:52:34 +04:00
scrawl
c231d20413 Merge pull request #1362 from akortunov/spellpriority 
Combat AI: use WhenUsed enchantments [Feedback needed]
 2017-08-16 21:23:57 +00:00
scrawl
306b58349e Merge pull request #1387 from akortunov/movementfix 
Check actual movement for GetPCRunning and GetPCSneaking [Feedback needed]
 2017-08-16 20:50:49 +00:00
scrawl
d1161819bf Merge pull request #1396 from akortunov/dispelfix 
Dispel only effects from spells
 2017-08-16 20:49:40 +00:00
Andrei Kortunov
bc7353f100 Check animation state for GetPCRunning and GetPCSneaking 2017-08-16 20:30:47 +04:00
Andrei Kortunov
67d59bead5 Get only text from input fields (bug #4025) 2017-08-16 15:03:04 +04:00
Andrei Kortunov
1e983604db Dispel only effects from spells (bug #3995) 2017-08-15 09:35:29 +04:00
scrawl
8acf0ba633 Merge pull request #1394 from akortunov/followerattackfix 
Prevent followers from attacking player if crime was reported
 2017-08-14 22:19:46 +00:00
Andrei Kortunov
ec64034160 Confiscate stolen item/gem when enchanting 2017-08-14 19:29:34 +04:00
Andrei Kortunov
7a5645b35d Prevent followers from attacking player if crime was reported 2017-08-14 18:42:19 +04:00
Andrei Kortunov
f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 2017-08-14 11:31:17 +04:00
scrawl
1bdcecc32e Merge pull request #1390 from akortunov/referencecheck 
Do not make target reference unavailable on cell change
 2017-08-12 18:48:52 +00:00
Andrei Kortunov
3f159960b7 Restored pickpocket and werewolf check 2017-08-12 21:18:05 +04:00
scrawl
b6aaa2f2be Merge pull request #1389 from akortunov/autosave 
Create autosave when waiting
 2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f Do not make target reference unavailable on cell change (bug #3898) 2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875 Create autosave when waiting (bug #1452) 2017-08-12 09:06:31 +04:00
David Cernat
d51736d68f [Client] Fix crashes caused by inventory items with disabling scripts 2017-08-11 05:49:33 +03:00
scrawl
0f983144a4 Merge pull request #1383 from akortunov/guifixes 
Enable transparency for interactive messageboxes and tooltips in game mode
 2017-08-10 21:55:24 +00:00
Andrei Kortunov
56f5a5dee3 Added transparency to 'owned' tooltip 2017-08-08 22:57:39 +04:00
scrawl
af9db74010 Merge pull request #1377 from LennyPenny/master 
Fade out music before change occurs
 2017-08-08 17:34:50 +00:00
Andrei Kortunov
4cc8afd25d Add transparency for tooltips in game mode 2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248 Add transparency for interactive messageboxes in game mode 2017-08-08 20:36:50 +04:00
Lennart Bernhardt
546352dbe3 avoid starting sound updates more than necessary 2017-08-08 03:31:01 +02:00
Lennart Bernhardt
7b8278ae45 remove redundant mMusicFader variable 2017-08-08 03:17:40 +02:00
scrawl
cd4525cf25 Merge pull request #1372 from akortunov/guifixes 
Journalbook layout fixes
 2017-08-07 18:49:13 +00:00
Andrei Kortunov
ab391f17db Fixes regression in spell school detection (bug #4007) 2017-08-07 12:12:57 +04:00
Andrei Kortunov
dd919b9f2c Do not allow to loot fighting actors during death animation (bug #3528) 2017-08-07 09:55:50 +04:00
scrawl
ba72eb77f4 Merge pull request #1374 from akortunov/guardfix 
Disable AiPursue package for player's followers
 2017-08-06 21:11:08 +00:00
scrawl
7f5b615295 Merge pull request #1375 from MiroslavR/missing-import 
Add missing include for isatty function
 2017-08-06 21:10:11 +00:00
spycrab
632d39ca76 Allow starting at an (unnamed) exterior cell using --start (Feature #3941) 2017-08-06 22:31:07 +02:00
Lennart Bernhardt
60a7d3d6e0 Fade out music before change occurs 2017-08-06 20:10:56 +02:00
MiroslavR
393f4ab758 Add missing include for isatty function (Fixes #4002) 2017-08-06 13:02:22 +02:00
David Cernat
77ce05b7d6 [Client] Fix spell casting probability synchronization 2017-08-06 00:11:54 +03:00
Andrei Kortunov
72ce118d02 Disable AiPursue package for player's followers 2017-08-05 12:38:26 +04:00
Andrei Kortunov
cf7a6232d0 Combat AI: use WhenUsed enchantments 2017-08-05 12:18:38 +04:00
scrawl
fe8437ae10 Merge pull request #1371 from akortunov/journalfix 
Do not allow to use journal in a main menu
 2017-08-04 21:45:44 +00:00
David Cernat
721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
 2017-08-05 00:09:34 +03:00
Jake Westrip
63343b6241 Ensure jail does not decrease a skill past zero 2017-08-05 06:15:15 +10:00
David Cernat
0e2038f045 [General] Record and get player positions before their last cell change 2017-08-04 21:45:52 +03:00
David Cernat
fbec0d9443 [Client] Remove inertia from players who are teleported via a packet 2017-08-04 21:43:01 +03:00
Andrei Kortunov
23bda7613b Do not allow to use journal in a main menu (bug #3991) 2017-08-04 07:31:41 +04:00
scrawl
a78f254883 Merge pull request #1368 from akortunov/tradefix 
Trade window improvements
 2017-08-03 21:09:57 +00:00
scrawl
a63b9e33fd Merge pull request #1369 from akortunov/tauntfix 
Take in account a temporary disposition in isAggressive check (bug #3…
 2017-08-03 21:01:03 +00:00
Andrei Kortunov
56a30d7aec Journalbook layout fixes 2017-08-03 20:27:14 +04:00
Andrei Kortunov
d1489f5b42 Take in account a temporary disposition in isAggressive check (bug #3987) 2017-08-03 19:18:31 +04:00
Andrei Kortunov
35beede065 Restock items after trade deal instead of trade window opening 2017-08-03 18:41:13 +04:00
Andrei Kortunov
487e72fd23 Play Up sounds instead of Down ones in trade window (bug #3982) 2017-08-03 18:39:59 +04:00
elsid
748f5225a9 Copy PathFinder::mPath back value when pass to MWMechanics::AiPackage::pathTo as dest 
May become dangling reference because method may remove all elements from mPath.
 2017-08-02 11:35:53 +03:00
scrawl
0d58a77f86 Merge pull request #1291 from MiroslavR/respawn_crash 
Prevent respawned references from being added to the scene twice
 2017-08-01 14:38:46 +00:00
Andrei Kortunov
604f9ee323 Split weapons and spells rating code from combat actions 2017-08-01 09:05:35 +04:00
MiroslavR
d24286273b Prevent respawned references from being added to the scene twice in certain cases (Fixes #3864) 2017-08-01 00:11:14 +02:00
Andrei Kortunov
b7cfb1aaf4 Fixed DamageHealth and AbsorbHealth effects applying 2017-07-31 23:05:19 +04:00
scrawl
eac2e52841 Merge pull request #1329 from akortunov/priorityfix 
Combat AI: make default spell priority calculation formula close to vanilla
 2017-07-31 18:21:47 +00:00
scrawl
fde6e29628 Merge pull request #1326 from akortunov/spellpriority 
Combat AI improvements [feedback needed]
 2017-07-31 17:51:51 +00:00
scrawl
333648c975 Merge pull request #1324 from akortunov/doorfix 
Improved doors detection
 2017-07-31 17:42:53 +00:00
Andrei Kortunov
10eb6ec75f AI: Check angle between actor and door 2017-07-31 19:28:02 +04:00
scrawl
9ac409e61c Merge pull request #1287 from akortunov/spellsorting 
Spellbuying menu improvements
 2017-07-31 09:43:47 +00:00
scrawl
43279c49b5 Go back to index when selecting 'cancel' on topics list 2017-07-30 23:51:44 +02:00
scrawl
4b51fd23e0 Merge pull request #1356 from akortunov/guifixes 
Add missing journal sounds (bug #3974)
 2017-07-30 21:36:04 +00:00
Unknown
bfbfbeac43 Added networking and saving for custom spells 2017-07-31 03:45:47 +10:00
Andrei Kortunov
99b5f21a46 Add missing journal sounds (bug #3974) 2017-07-29 19:41:46 +04:00
Allofich
dae19412f2 Fix problem with animations not looping 
Fixes #3804
 2017-07-29 20:54:11 +09:00
scrawl
631d79f1c8 Merge pull request #1346 from akortunov/aibreathe 
AiBreathe AI package (feature #1374)
 2017-07-28 20:50:04 +00:00
scrawl
4c2487d55f Merge pull request #1353 from akortunov/restfix 
Update effects during rest (bug #3679)
 2017-07-28 20:46:14 +00:00
David Cernat
4db64e1721 [Client] Synchronize spellcasting for non-bipedal creatures 2017-07-28 20:49:26 +03:00
Andrei Kortunov
920021c61b Update effects during rest (bug #3679) 2017-07-28 16:50:52 +04:00
David Cernat
9d05063af4 [General] Add server script functions for banning & unbanning IPs 
Additionally, use a more informative message for the client when trying to connecting to a server that it is banned from.
 2017-07-27 19:29:17 +03:00
Andrei Kortunov
6ab36c0539 Spellbuying menu improvements 2017-07-27 13:20:18 +04:00
David Cernat
500bff9911 Merge pull request #250 from OpenMW/master 
Add OpenMW commits up to 27 Jul 2017
 2017-07-27 04:01:44 +03:00
scrawl
1792886f1e Merge pull request #1344 from julianko/dialogue_performance 
Fix dialogue window performance
 2017-07-26 22:05:45 +00:00
David Cernat
2f551aba02 [Client] Don't start dialogue via client scripts if already in dialogue 
This prevents infinite greeting spam in scripts such as hlormarScript.
 2017-07-26 22:37:57 +03:00
David Cernat
e6e5d406b8 Merge pull request #248 from OpenMW/master 
Add OpenMW commits up to 26 Jul 2017, part 2
 2017-07-26 20:31:39 +03:00
David Cernat
796118c266 [Client] Send StatsDynamic packets more often 2017-07-26 20:15:35 +03:00
Julian
d7aa2a882d improve dialogue window performance 2017-07-26 18:58:27 +02:00
scrawl
d3be4769ea Merge pull request #1347 from akortunov/encumberancefix 
Fixed encumberance check (bug #3963)
 2017-07-26 16:20:16 +00:00
David Cernat
84662ed3fe [Client] Add temporary warnings when creating custom spells and items 2017-07-26 05:36:12 +03:00
Andrei Kortunov
548814bfbc Added AiBreathe package (feature #1374) 2017-07-25 10:58:04 +04:00
Andrei Kortunov
325ea10594 Fixed encumberance check (bug #3963) 2017-07-25 10:28:33 +04:00
David Cernat
3d1458b5a2 Merge pull request #246 from OpenMW/master 
Add OpenMW commits up to 24 Jul 2017
 2017-07-24 20:21:04 +03:00
Andrei Kortunov
3ba0a336b7 Move spell magicka cost calculation to standalone function 2017-07-24 21:11:59 +04:00
David Cernat
2c1ece79fc Merge pull request #245 from OpenMW/master 
Add OpenMW commits up to 22 Jul 2017
 2017-07-23 22:02:16 +03:00
Andrei Kortunov
337f0f876d Fade screen in on a new game start 2017-07-23 11:04:58 +04:00
scrawl
9bc24ab629 Fix character preview zNear/zFar not being autocomputed as intended (Bug #3955) 2017-07-22 00:38:27 +02:00
scrawl
5c11266a46 Fix character preview item selection 2017-07-22 00:06:43 +02:00
scrawl
c9f8a220dc Update the tooltip when the focusObject is set 2017-07-20 20:59:36 +02:00
scrawl
0e2e23e9f8 Remove tooltip object as part of WindowManager::clear 2017-07-20 20:59:09 +02:00
David Cernat
7173a48f4b [Client] Prevent ObjectState packet spam 2017-07-20 17:01:04 +03:00
David Cernat
b8b3856c73 Merge pull request #244 from OpenMW/master 
Add OpenMW commits up to 19 Jul 2017
 2017-07-19 20:49:56 +03:00
scrawl
7f634514a8 Fix the viewport of the character preview being set a frame ahead due to a threading issue 2017-07-19 17:43:15 +02:00
scrawl
20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 2017-07-19 16:44:37 +02:00
scrawl
ac78d01b2b Terrain: use the main camera's viewpoint for intersection tests 
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
 2017-07-19 13:11:44 +02:00
scrawl
a629d48df6 Update the facedObject after the camera is updated 2017-07-19 13:05:51 +02:00
David Cernat
fd046e42ef Merge pull request #242 from OpenMW/master 
Add OpenMW commits up to 16 Jul 2017
 2017-07-17 21:34:44 +03:00
scrawl
2c7ce26fb7 Merge pull request #1336 from akortunov/evadefix 
Combat AI: avoid enemy hits when casting Self-ranged spells
 2017-07-16 20:05:21 +00:00
Andrei Kortunov
98f161c7fd Combat AI: avoid enemy hits when casting Self-ranged spells (fixes #3922) 2017-07-16 22:38:23 +04:00
scrawl
2c95f40640 Merge pull request #1333 from akortunov/guidistortionfix 
Disable sound distortion for GUI actions and PlaySound command [discussion]
 2017-07-16 18:28:03 +00:00
Andrei Kortunov
2b22d10ebc Spellview fixes 2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df Quick keys menu fixes 2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913 Fixed Close button handler in EditEffectDialog (fixes #3956) 2017-07-15 14:03:36 +04:00
David Cernat
aeb1ec3394 [Client] Delimit and clarify changes made by tes3mp to engine and main 2017-07-15 12:44:00 +03:00
Andrei Kortunov
dca8317083 Disable sound distortion for player actions in GUI mode 2017-07-15 10:59:08 +04:00
Andrei Kortunov
3b163ce6ce Disable sound distortion for PlaySound script command 2017-07-15 10:58:19 +04:00
David Cernat
e3929df38a Merge pull request #239 from OpenMW/master 
Add OpenMW commits up to 14 Jul 2017
 2017-07-15 09:13:04 +03:00
David Cernat
43a3daf0aa [General] Add & implement PlayerShapeshift packet for werewolf states 2017-07-15 09:02:19 +03:00
scrawl
ada85aa1ee Merge pull request #1331 from akortunov/guidistortionfix 
Prevent GUI sounds distortion
 2017-07-14 19:55:33 +02:00
David Cernat
ad9fa0631a [General] Rename jailText to jailEndText and add jailProgressText in PlayerJail 2017-07-13 20:13:28 +03:00
David Cernat
708d3723eb [Client] Fix client script messagebox buttons that had always broken in tes3mp 2017-07-13 18:58:48 +03:00
David Cernat
e36c0afc59 [General] Send faction reputation via PlayerFaction packets 2017-07-13 13:36:00 +03:00
David Cernat
be93ec8ef6 [General] Implement ObjectState packet 2017-07-13 09:46:30 +03:00
David Cernat
083b46394d [General] Add ignoreJailSkillIncreases to PlayerJail packets 2017-07-12 18:24:37 +03:00
David Cernat
5962570c48 [General] Add jailText to PlayerJail packets 2017-07-12 16:39:31 +03:00
David Cernat
5774023f8b [Client] Add missing processor initialization for ProcessorPlayerJail 2017-07-11 14:31:32 +03:00
David Cernat
3280f0c5ee [General] Implement PlayerJail packet 
Rework server's DeathFunctions into MechanicsFunctions

Remove connection between PlayerResurrect and jailing
 2017-07-11 13:34:09 +03:00
Andrei Kortunov
54b4d93f79 Added a special function for GUI sounds playing 2017-07-10 15:48:00 +04:00
David Cernat
3529f9b090 [General] Add placeholders for PlayerJail, ObjectState & ConsoleCommand 2017-07-10 12:33:53 +03:00
David Cernat
4e74910fdb [General] Disable automatic sync for PlayerJournal and PlayerFaction 
Simplify PlayerFaction packets by removing BOTH action
 2017-07-08 12:27:48 +03:00
David Cernat
1d504a665f [General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets 2017-07-05 07:06:33 +03:00
Andrei Kortunov
37952c9a79 Added door detection based by ray casting 2017-07-03 22:08:29 +04:00
Koncord
9bb586de77 [Client] Simplify setMapExplored() 2017-07-03 23:43:32 +08:00
Koncord
52349278e9 [Client] Fix warnings 2017-07-03 23:41:16 +08:00
Koncord
b2339f2f9a [Client] Fix building 2017-07-03 23:40:38 +08:00
David Cernat
60574ae667 [General] Implement jail time as a death penalty 2017-07-03 15:45:21 +03:00
David Cernat
71313c5aa6 [General] Implement PlayerMap packet, part 1 2017-07-03 09:28:27 +03:00
David Cernat
ad4b1d05bb [Client] Add comments for GUI additions made by tes3mp 2017-07-03 05:06:07 +03:00
David Cernat
c899525e30 [General] Use address keys with clearer meaning in tes3mp config files 2017-07-03 01:31:48 +03:00
David Cernat
99640da111 Merge pull request #234 from OpenMW/master 
Add OpenMW commits up to 30 Jun 2017
 2017-07-02 14:22:06 +03:00
David Cernat
1f682749d6 [General] Add optional notes to PasswordDialogs 2017-07-02 13:07:36 +03:00
Koncord
73cf134107 [General] Fix incoming password string 2017-07-02 11:11:33 +08:00
Koncord
0cf09adb44 [General] Move AddProcessor to BasePacketProcessor 2017-06-30 20:09:05 +08:00
scrawl
951c4e12e0 Fix crash introduced by commit 1d8a9ff622 (Fixes #3940) 2017-06-30 00:52:02 +02:00
David Cernat
0b68e59060 [Client] Send ObjectLock packets when using lock spells 2017-06-29 22:29:49 +03:00
Koncord
9519c467eb [Client] Simplify updateEquipment for LocalPlayer & LocalActor 2017-06-29 14:52:23 +08:00
Koncord
596f42e408 [Client] Fix "invalid iterator" error 2017-06-29 14:36:56 +08:00
Andrei Kortunov
143fdae6fe Make spell priority calculation close to vanilla (bug #3937). 2017-06-28 14:02:51 +04:00
David Cernat
685bf15d52 Merge pull request #231 from OpenMW/master 
Add OpenMW commits up to 27 Jun 2017
 2017-06-28 05:58:19 +03:00
Koncord
5b2cab4c6b [General] Change NULL to nullptr 2017-06-27 22:49:28 +08:00
Koncord
0ed0d2417b [Client] Make foreach style consistent with other 2017-06-27 22:27:02 +08:00
Koncord
2427a4f877 [Client] Update DedicatedActor to C++11 2017-06-27 22:25:39 +08:00
Koncord
8f7da49152 [Client] Update DedicatedPlayer to C++11 2017-06-27 22:25:29 +08:00
Koncord
08666cabdb [Client] Update PlayerList to C++11 2017-06-27 22:24:34 +08:00
Koncord
a110ec1767 [Client] Update GUIController to C++11 2017-06-27 21:59:05 +08:00
Koncord
aa1f5c3cd3 [Client] Change pointer type to reference 2017-06-27 21:58:36 +08:00
Koncord
7499777b3a [Client] Update CellController to C++11 2017-06-27 21:56:40 +08:00
Koncord
7d4dd2ad1c [Client] Update Cell to C++11 2017-06-27 21:56:24 +08:00
Koncord
7918e887dd [Client] Update ActorList to C++11 2017-06-27 21:56:14 +08:00
Koncord
aa12b35d03 [Client] Update LocalActor to C++11 2017-06-27 21:12:00 +08:00
Koncord
689050e1d0 [Client] Long expression to lambda 2017-06-27 21:01:13 +08:00
Koncord
58a6a8c3bc [Client] Update LocalPlayer to C++11 2017-06-27 20:43:39 +08:00
Andrei Kortunov
7fcb22b867 Do not show empty journal entries (fixes #3891) 2017-06-27 15:54:16 +04:00
Koncord
6222c20e82 [Client] Convert MechanicsHelper to namespace 2017-06-27 16:43:53 +08:00
Koncord
7d3e08f031 [Client] Simplify loops 2017-06-27 16:32:16 +08:00
Koncord
f7341c021f [Client] Modernize loops in WorldEvent to C++11 2017-06-27 15:58:41 +08:00
Koncord
61cc3ced5d [Client] Remove boost from processors 2017-06-27 15:25:30 +08:00
Koncord
fcccd7b665 [General] Remove creatureStats.mDead from packets 2017-06-27 15:03:41 +08:00
David Cernat
813a3c89c4 [General] Implement PlayerBook packet to track skill books read 2017-06-27 08:27:14 +03:00
David Cernat
b3b73c5cd2 [General] Implement resurrection at nearest shrine or temple 2017-06-27 01:01:45 +03:00
David Cernat
a358dc6af8 [Client] Revert 0020132 now that 534c819 provides a better fix 2017-06-26 07:36:57 +03:00
David Cernat
7d81b84dd8 [Client] Write list of loaded plugins to log 2017-06-26 06:49:58 +03:00
David Cernat
77758596a1 Merge pull request #230 from OpenMW/master 
Add OpenMW commits up to 25 Jun 2017
 2017-06-26 03:13:00 +03:00
scrawl
8d17565efd Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900) 2017-06-25 14:44:17 +02:00
scrawl
903e59f495 Don't reset idle time when there is no camera movement (Fixes #3902) 2017-06-25 13:08:55 +02:00
scrawl
44e2089098 Don't play 'menu click' sound for right clicks (Fixes #3919) 2017-06-25 12:52:59 +02:00
scrawl
534c81976c Add missing cell update for physics system (Fixes #3917) 2017-06-25 12:47:57 +02:00
David Cernat
9a519b5cc2 [Client] Avoid incrementing actor death count if we aren't its authority 2017-06-23 09:22:48 +03:00
David Cernat
78f29302ef [General] Fix PlayerJournal logic by sending only refIds for its actors 
Additionally, make the refIds for actors usable in script functions.
 2017-06-23 08:12:32 +03:00
David Cernat
48c63dbce9 [General] Fix ObjectLock packets by making hasCellData true for them 2017-06-22 05:49:44 +03:00
David Cernat
ebf7740969 [General] Repurpose GameConsole packet as GameSettings & add difficulty to it 2017-06-20 05:28:45 +03:00
David Cernat
df67ae4689 Merge pull request #229 from OpenMW/master 
Add OpenMW commits up to 20 Jun 2017
 2017-06-20 04:16:51 +03:00
scrawl
62f0ba6045 Merge pull request #1279 from Allofich/position 
Fix actors not returning to their wander locations
 2017-06-20 00:57:44 +02:00
David Cernat
c6aee3b780 [Client] Fix build by changing boost::shared_ptr into std::shared_ptr 2017-06-18 19:36:06 +03:00
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
 2017-06-18 18:16:10 +03:00
Andrei Kortunov
1a8f2bfc11 Combat AI: select target by priority 2017-06-16 16:11:12 +04:00
Andrei Kortunov
a2be73295b Combat AI: take in account enemy weapon resistance 2017-06-16 13:33:42 +04:00
Andrei Kortunov
62b24eb078 Combat AI: do not use range weapons under water 2017-06-16 12:20:31 +04:00
Jordan Ayers
b277bd782e Adjust restock calculations to ignore filled soul gems. 
Bug #3684
 2017-06-15 21:59:13 -05:00
Allofich
4f08084e79 Make stationary actors return to position on load 
Also makes wandering actors resume their previous destination when an interrupting combat or pursuit ends.

(Fixes #3656)
 2017-06-15 18:33:50 +09:00
Allofich
028762a7dc Make guards that are attacked try to arrest player 
(Fixes #3706)
 2017-06-15 01:47:10 +09:00
scrawl
53264f34b3 Merge pull request #1321 from akortunov/spellpriority 
Use mRange to check spell range instead of mArea.
 2017-06-13 17:06:47 +02:00
Allofich
42402976e3 Fixes for building in MSVC 2017-06-13 19:38:12 +09:00
Andrei Kortunov
87939bf3b1 Use mRange to check spell range instead of mArea. 2017-06-13 11:02:40 +04:00
scrawl
dd3f612e88 Merge pull request #1316 from akortunov/doorfix 
Doors usage improvements
 2017-06-12 23:34:40 +02:00
scrawl
80eb2ea35d Merge pull request #1313 from akortunov/spellpriority 
Make combat AI to do not cast target spells under water
 2017-06-12 23:32:35 +02:00
scrawl
6d90f5a9a5 Merge pull request #1312 from akortunov/guifixes 
Split greeting from topic response
 2017-06-12 23:19:45 +02:00
Koncord
3803535bd5 [General] Implement CleanChat() 2017-06-12 08:01:47 +08:00
Andrei Kortunov
e9d0bf7c12 Added missed return statement 2017-06-11 15:06:44 +04:00
Andrei Kortunov
9fdfb2a83f Spell priority: make AI do not cast target spells when enemy is under water 2017-06-11 10:13:00 +04:00
Andrei Kortunov
cab51d26cc Doors: small key search optimizations 2017-06-10 22:33:14 +04:00
Andrei Kortunov
188424d5d3 Allow AI to use keys to open doors 2017-06-10 22:31:17 +04:00
David Cernat
bea3afaec8 [Client] Ensure uninitialization of DedicatedActors for late packets 2017-06-10 15:49:00 +03:00
David Cernat
1ae5bd19e1 [Client] Don't set difficulty based on client settings 2017-06-10 15:29:09 +03:00
David Cernat
70d9374a6a [General] Implement PlayerKillCount packets 2017-06-10 14:04:19 +03:00
David Cernat
ee5c9b65c5 [General] When changing region, send new region name in PlayerCellChange 2017-06-10 11:43:40 +03:00
David Cernat
e5f5b047bc [Client] Don't send empty ObjectSpawn packets for cells with no leveled creatures 2017-06-10 11:04:17 +03:00
David Cernat
79351c737e [Client] Disable back button in chargen race window 2017-06-10 08:10:56 +03:00
David Cernat
002013294a [Client] Add temporary fix for OpenMW crash caused by using default head 2017-06-10 06:49:07 +03:00
David Cernat
312fc84a6f [Client] Use update timer in mwmp::Cell instead of LocalActor 2017-06-10 03:29:51 +03:00
Bret Curtis
dbf149f9b2 gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now 2017-06-10 00:51:19 +02:00
Andrei Kortunov
4600f24e27 Playing sound when AI is opening a door 2017-06-09 22:52:40 +04:00
Bret Curtis
c781d1f8ed purge unnecessary imports 
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
 2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0 replace and purge boost::math::gcd and other non-used headers 2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2 replace and purge boost::function 2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702 replace boost::bind 2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96 remove boost/tuple 2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b remove more unused imports, including boost headers 2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required 
put boost system back in, clean others up

revert Qt

add back boost fstream
 2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104 replace boost::shared_ptr in extern and components 2017-06-09 19:08:53 +02:00
Bret Curtis
c8b67221d7 use nullptr instead of NULL 2017-06-09 16:49:25 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
David Cernat
18bf79e08b [Client] Correctly set mpNum for placed gold 2017-06-09 13:31:19 +03:00
Andrei Kortunov
3190f28710 Spell priority: make AI do not cast target spells under water 2017-06-09 10:23:46 +04:00
David Cernat
6ac7ee8fcd [Client] Fix problems with NPC equipment sync 2017-06-09 04:58:56 +03:00
Andrei Kortunov
4bb9622c21 Handle greetings differently from responses 2017-06-08 22:40:31 +04:00
David Cernat
abaa26e32a Merge pull request #226 from OpenMW/master 
Add OpenMW commits up to 8 Jun 2017
 2017-06-08 05:25:47 +03:00
scrawl
59eb0aba7d Merge pull request #1310 from akortunov/guifixes 
Removed empty space before dialogue entry (bug #3892)
 2017-06-07 21:55:45 +02:00
Koncord
587b53bfed [Client] Reorder files 2017-06-07 00:06:10 +08:00
Koncord
b84f97ec2b [Client] Implement PasswordDialog 2017-06-06 23:33:59 +08:00
David Cernat
89f6c6df96 Merge pull request #225 from OpenMW/master 
Add OpenMW commits up to 4 Jun 2017
 2017-06-05 03:38:58 +03:00
Andrei Kortunov
c2962ced90 Removed empty space before dialogue entry (bug #3892) 2017-06-04 23:20:43 +04:00
scrawl
172cc65be9 Merge pull request #1308 from akortunov/spellpriority 
Spell priority: dispel usage improvements
 2017-06-04 12:49:53 +02:00
Andrei Kortunov
00402b7154 Removed unused variable 2017-06-04 14:09:23 +04:00
scrawl
70e02f4c28 Merge pull request #1306 from Nialsy/master 
Fixed quickload with menus open
 2017-06-04 11:18:49 +02:00
Andrei Kortunov
f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 2017-06-03 23:03:24 +04:00
David Cernat
315ec46ff6 Merge pull request #224 from OpenMW/master 
Add OpenMW commits up to 3 Jun 2017
 2017-06-03 17:19:34 +03:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
Andrei Kortunov
42f3c73c75 Spell priority: dispel usage improvements 2017-06-03 13:16:44 +04:00
Nicholas
f6f07f5497 clear mGoToJail flag on load 2017-06-02 13:33:47 -05:00
Koncord
ad873e16b8 [Client] Limiting updates to ~64 per second 2017-06-02 21:20:35 +08:00
Koncord
9742b0a801 [Client] Reset statTimer every timeout 2017-06-02 20:45:44 +08:00
Koncord
80631ae8bd [Client] Reset positionTimer on time expired 2017-06-02 20:45:19 +08:00
Koncord
a847d46984 [Client] Get rid Z axis in direction.pos 2017-06-02 18:33:51 +08:00
Koncord
d67db1a9bd [Client] Play rotation animation on dedicated players 2017-06-02 18:05:33 +08:00
Koncord
2ef1e26233 [Client] Fix ID_PLAYER_POSITION spam 2017-06-02 17:19:36 +08:00
Koncord
5f30dfd5db [Client] Get rid direction.rot 2017-06-02 15:44:39 +08:00
David Cernat
8c785fb22c [Client] Send ObjectDelete packets when summoned creatures despawn 2017-06-02 09:15:08 +03:00
David Cernat
0bed33e39e [Client] Reset player fatigue when being resurrected 
This way, players killed by strong hand-to-hand attacks will no longer be forced to lie on the ground when resurrected.
 2017-06-02 06:58:33 +03:00
David Cernat
75a60a4700 [Client] Update debug in CellStore 2017-06-02 05:26:07 +03:00
David Cernat
e042673779 [Client] Fix error when trying to delete player markers that don't exist 2017-06-01 22:42:57 +03:00
David Cernat
cf41956cad [Client] Prevent framerate drops caused by invalid rotation values 2017-06-01 21:45:36 +03:00
David Cernat
41de1876a3 Merge pull request #223 from OpenMW/master 
Add OpenMW commits up to 31 May 2017
 2017-06-01 08:11:46 +03:00
scrawl
9fd0d54a35 Merge pull request #1289 from akortunov/newrepair 
Improved repair and recharge widgets
 2017-05-31 22:47:38 +02:00
Andrei Kortunov
f6c3d4935e Spell priority: feather and burden 2017-05-31 19:23:44 +04:00
Andrei Kortunov
10d4cb15ad Improved repair widget 2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e Improved recharge widget 2017-05-31 19:11:49 +04:00
Andrei Kortunov
6c21e4ed31 Spell priority: ignore some effects useless in battle 2017-05-31 18:41:41 +04:00
scrawl
2638327593 Merge pull request #1303 from akortunov/guifixes 
Character generation layout fixes
 2017-05-31 15:25:41 +02:00
David Cernat
d8cd57a8be [Client] Make topic sync work with localized versions of the game 2017-05-31 14:11:16 +03:00
David Cernat
34a452d775 [Client] Fix logic for initialization and updating of player markers 
Additionally, disable the Ptrs of players who move to cells that don't exist for us instead of placing them in ToddTest.
 2017-05-31 10:54:19 +03:00
David Cernat
a353a21280 [General] Fix code style inconsistencies 2017-05-31 08:37:11 +03:00
David Cernat
97bf0252a4 [Client] Disable collision for actors loaded as dead from server 2017-05-31 07:52:45 +03:00
David Cernat
906b263a2d [Client] Update topics in current dialogue screen when receiving PlayerTopic packets 2017-05-31 06:51:50 +03:00
David Cernat
461ab790e2 [Client] Correctly disable auto-equipping for DedicatedPlayers & DedicatedActors 2017-05-31 05:11:39 +03:00
David Cernat
068a45be87 [General] Synchronize player & NPC rotation animations 2017-05-30 12:08:58 +03:00
David Cernat
f4cdedd8cb [General] Synchronize summoned creatures 2017-05-30 10:11:01 +03:00
David Cernat
1c6e359fe9 [Client] Set and clear hitAttemptActorId for DedicatedPlayers 
This allows a DedicatedPlayer's follower NPCs to target enemies attacking the DedicatedPlayer.
 2017-05-30 08:20:45 +03:00
David Cernat
4e5c8873e0 [General] Use ObjectSpawn instead of ObjectPlace for actors 2017-05-29 06:59:05 +03:00
David Cernat
0cce9908be Merge pull request #222 from OpenMW/master 
Add OpenMW commits up to 29 May 2017
 2017-05-29 04:53:23 +03:00
David Cernat
27148ce9eb [General] Add placeholders for 12 new packets, to be implemented soon 
Additionally, make it slightly clearer who created which previously existing packets.
 2017-05-29 04:43:52 +03:00
scrawl
a1661af864 Merge pull request #1301 from akortunov/tooltips 
Tooltips layout fixes
 2017-05-29 00:13:34 +02:00
Koncord
565889ccbc [Client] Add commit hash to password 2017-05-28 18:26:48 +08:00
David Cernat
b0c1aafc5a [Client] Use a 10 times higher maximum distance for linear interpolation 2017-05-28 03:30:23 +03:00
David Cernat
ea2a060c67 [Client] Sync actor movements from interiors to exteriors & vice versa 2017-05-28 01:11:32 +03:00
David Cernat
7f6c5e2f48 [Client] Only send PlayerJournal packets for new journal entries 2017-05-27 22:49:11 +03:00
David Cernat
6918ae7bc7 [Client] Don't crash when receiving certain packets from NULL players 2017-05-27 22:32:28 +03:00
David Cernat
2e45203bbb [Client] Clean up mapIndexes in CellController 2017-05-27 21:20:24 +03:00
David Cernat
619982b085 [Client] Only try to send actor data to other players when authorized 2017-05-27 18:55:14 +03:00
David Cernat
73b9683182 [General] Make most ActorPackets smaller by not including refIds in them 2017-05-27 16:59:23 +03:00
David Cernat
7177d56cfb [Client] Only require refNumIndex & mpNum for CellStore::searchExact() 2017-05-27 16:59:23 +03:00
David Cernat
7c87ac80ee [Client] Ensure correct drawState when receiving an ActorAttack packet 2017-05-27 04:19:28 +03:00
David Cernat
9d9581a1c2 [Client] Prevent DedicatedActors from automatically equipping torches 2017-05-27 02:52:26 +03:00
David Cernat
311ce4119d [General] Fix logic issues related to ActorEquipment 2017-05-26 22:53:28 +03:00
Andrei Kortunov
46c8842808 Fixed enchant points calculations formula 2017-05-26 23:42:11 +04:00
David Cernat
cdfc2db2d1 Merge pull request #220 from OpenMW/master 
Add OpenMW commits up to 26 May 2017
 2017-05-26 17:38:59 +03:00
David Cernat
4f273932af [General] Implement sending and reading of ActorEquipment packets 2017-05-26 04:37:49 +03:00
David Cernat
ec921eefc8 [Client] Prevent players from getting stuck in drag and drop when their opened containers are deleted 2017-05-26 02:13:31 +03:00
David Cernat
20a72ec807 [Client] Send ObjectTrap packets when disarming traps with keys & probes 2017-05-26 01:47:59 +03:00
David Cernat
32879adc5b [General] Allow ObjectTrap to trigger traps, not just disarm them 2017-05-26 01:28:43 +03:00
David Cernat
7ac115b359 [Client] Implement sending and reading of ObjectTrap packets 2017-05-26 00:21:24 +03:00
Koncord
24d4e1c222 [General] Remove useless PacketSendMyID 2017-05-26 02:40:49 +08:00
Koncord
056ec2d434 [General] Fix CMake errors 2017-05-25 23:56:22 +08:00
Andrei Kortunov
f17badb3cd Makes cells cache size configurable 2017-05-25 13:09:40 +04:00
David Cernat
97768be14b [Client] Send ObjectPlace packet for random creatures interrupting rest 2017-05-25 01:00:47 +03:00
David Cernat
11369f6513 [General] Implement sending and reading of PlayerTopic packets 2017-05-24 21:43:34 +03:00
David Cernat
08de349133 [General] Add placeholders for PlayerTopic & ObjectTrap packets 2017-05-24 19:01:28 +03:00
David Cernat
b1264cca92 [Client] Send ObjectLock whenever using spells or keys to unlock objects 2017-05-24 16:25:44 +03:00
David Cernat
870fd9a78b [General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead 2017-05-24 13:28:34 +03:00
David Cernat
48ee8fd536 [Client] Send PlayerFaction packets when getting expelled from factions 2017-05-24 12:19:11 +03:00
David Cernat
d0ec5c61e2 Merge pull request #219 from OpenMW/master 
Add OpenMW commits up to 21 May 2017, part 2
 2017-05-21 22:51:44 +03:00
scrawl
f9cdc2da94 Merge pull request #1293 from akortunov/spellpriority 
aicombataction.cpp: implement some spell priority TODO's
 2017-05-21 21:18:10 +02:00
MiroslavR
98daf4f043 Merge pull request #1296 from akortunov/jumpfatiguefix 
Fixed jump fatigue loss formula (bug #3843)
 2017-05-21 11:47:58 +02:00
David Cernat
d307876199 Merge pull request #218 from OpenMW/master 
Add OpenMW commits up to 21 May 2017
 2017-05-21 12:04:49 +03:00
scrawl
8cd8eab9dd Merge pull request #1294 from akortunov/constenchantfix 
Swap enchant type when purge selected soulgem (bug #3878)
 2017-05-20 23:44:14 +02:00
Andrei Kortunov
4f41c44cd6 Swap enchant type when clean selected soulgem widget (fixes #3878) 2017-05-20 18:30:11 +04:00
David Cernat
e6983993c2 [General] Implement sending and reading of PlayerFaction packets 2017-05-18 19:27:20 +03:00
David Cernat
04c9c5ed48 [General] Forward PlayerJournal packets to other players 2017-05-18 12:57:48 +03:00
David Cernat
0189dbf916 [General] Make JournalItem consistent with other packet structs 2017-05-18 10:32:23 +03:00
David Cernat
1d0167c3c9 [Client] Add missing include for PlayerFaction processor 2017-05-16 19:30:29 +03:00
David Cernat
ad388c7e12 [General] Add placeholders for ActorEquipment & PlayerFaction packets 
Also reorder packets and packet processors.
 2017-05-16 19:25:31 +03:00
David Cernat
f527fe9ebe [General] Add basic integrity check to reading of ActorList packets 
Additionally, add newlines to files missing them.
 2017-05-16 14:20:40 +03:00
David Cernat
05564bd123 [General] Add basic integrity check to reading of Container packets 2017-05-14 20:24:06 +03:00
David Cernat
46501909ff [Client] Comment out spammy debug about Container packets 2017-05-14 11:08:53 +03:00
David Cernat
8f5e6531db [Client] Avoid updating positions and anim flags when framerate is low 
Also rename DedicatedPlayer methods so they are consistent with those from DedicatedActor
 2017-05-14 10:52:44 +03:00
David Cernat
271594f0ee [Client] Don't play death animations for NPCs saved as dead on server 2017-05-14 10:27:43 +03:00
David Cernat
2eb5221472 Merge pull request #215 from OpenMW/master 
Add OpenMW commits up to 9 May 2017
 2017-05-09 14:31:26 +03:00
David Cernat
5a786e6c56 [Client] Make all LocalActors get initialized correctly again 2017-05-09 14:19:25 +03:00
David Cernat
d7d4dec200 [Client] Don't spam AnimFlags packets when a Player or Actor is flying 2017-05-09 12:27:59 +03:00
David Cernat
1f747d4375 [Client] Only apply interpolation when positions don't change too much 2017-05-09 04:41:26 +03:00
David Cernat
cc559cf8e2 [General] Don't send packets for dead LocalActors, to fix Position spam 2017-05-09 02:47:29 +03:00
Allofich
315ad54b29 Don't make NPCs or player speak while underwater 
(Fixes #3851)
 2017-05-08 19:55:54 +09:00
David Cernat
5bd95628ce [Client] Send an ObjectDelete packet when disposing of corpses 2017-05-08 08:44:43 +03:00
David Cernat
26087a182d Merge pull request #213 from OpenMW/master 
Add OpenMW commits up to 8 May 2017
 2017-05-08 01:03:19 +03:00
scrawl
109bc3cb59 Merge pull request #1281 from akortunov/purgefix 
Make InventoryStore::purgeEffect() purge all effects with argument ID instead only first
 2017-05-07 21:08:30 +02:00
Koncord
d82ed7d0ad [Client] Register ProcessorGameTime 2017-05-08 02:46:02 +08:00
Koncord
6c45b6dc5b [Client] Fix ProcessorGameTime ID 2017-05-08 02:45:44 +08:00
David Cernat
3fb0bbb58c [Client] Make it possible to turn off console again 2017-05-07 20:13:49 +03:00
David Cernat
34f0a5e076 [Client] Disable leveled creatures from their class instead of scene.cpp 2017-05-07 03:18:15 +03:00
David Cernat
aaaed8ab8b [Client] Fix potential object duplication in WorldEvent::placeObjects() 
Also clean up the debug messages in WorldEvent so they don't take up multiple lines.
 2017-05-07 03:17:19 +03:00
David Cernat
de49f5f175 [General] Add and use isActor bool for WorldObject 2017-05-07 03:07:09 +03:00
David Cernat
9d2c5c3502 [General] Simplify structure of BaseEvent 2017-05-06 21:57:29 +03:00
David Cernat
dcc61a095a [Client] Allow multiple WorldObjects to be added to a WorldEvent 2017-05-06 20:44:39 +03:00
David Cernat
bdc8b7f863 [Client] Send level creatures in ObjectPlace reply to ActorList request 2017-05-06 08:40:36 +03:00
David Cernat
9eef867928 [Client] Disable regular spawning of leveled creatures 2017-05-06 08:37:51 +03:00
David Cernat
3def111ca1 [Client] Fix graphical glitches related to DedicatedActor initialization 2017-05-06 04:49:49 +03:00
David Cernat
62aa6ed7ea [Client] Send PlayerPosition packets based on a timeout 2017-05-06 00:59:54 +03:00
David Cernat
ef12a37d59 [Client] Send ActorPosition packets based on a timeout 2017-05-06 00:33:48 +03:00
David Cernat
db3859565b [Client] Send ActorStatsDynamic packets only when stats change enough 2017-05-05 23:17:15 +03:00