Koncord
53346e2663
[Client] Return 0 if effect not found
2018-07-03 03:43:38 +08:00
Koncord
c5c1a160b2
[Client] Comment out an unused variable
2018-07-03 03:35:48 +08:00
Koncord
895634cd16
[General] Change type of MpNum to "unsigned int"
2018-07-03 03:25:54 +08:00
Koncord
d999cc0d55
[General] Add packetValid flag to packets
2018-07-03 02:06:52 +08:00
David Cernat
f9ebe400f7
[Server] Add script function for checking if object's summoner is player
2018-07-02 18:32:42 +03:00
Koncord
d162f6fd3a
[General] Explicitly use limitations of the master server
2018-07-02 23:29:07 +08:00
Koncord
62877f38b7
[General] Remove Terra support
...
Use LuaJIT instead.
2018-07-02 23:07:09 +08:00
Koncord
685a80887b
Remove Pawn support
2018-07-02 23:00:35 +08:00
Andrei Kortunov
f4330cf057
Editor: limit FPS in 3D preview windows (feature #3641 )
2018-07-02 12:20:34 +04:00
Thunderforge
7cbc4eeb49
Adding missing override keywords
...
Prevents compiler warnings such as this:
```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void onOpen();
^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
virtual void onOpen() {}
^
```
2018-07-01 19:17:50 -05:00
David Cernat
bef53749ed
[General] Replace BaseObject's hasMaster variable with isSummon
...
Additionally, add a GetObjectSummonState() script function to the server.
2018-07-02 02:25:06 +03:00
David Cernat
8ce225b1cc
[Client] Use the casters of damage-dealing spells as death reasons
2018-07-02 00:42:32 +03:00
Finbar Crago
5d9035c6b2
[ Fixes #4482 ] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480 )
...
because apparently i can't count to ten...
2018-07-01 13:46:23 +10:00
David Cernat
958b220835
[General] Send summon duration to server in ObjectSpawn packets
2018-07-01 00:43:29 +03:00
Marc Zinnschlag
2ea85d0bb6
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
2018-06-30 10:17:05 +02:00
Finbar Crago
09c9bd34c3
cleanup more unnecessary struct keywords...
2018-06-30 12:43:50 +10:00
Capostrophic
6e9c08083d
Add missing empty attacker checks
2018-06-29 20:35:45 +03:00
Capostrophic
bccba24c40
Make unarmed creature attacks not affect armor condition ( fixes #2455 )
2018-06-29 20:18:28 +03:00
Finbar Crago
69cd7031e7
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 23:46:36 +10:00
Finbar Crago
596be205c1
cleanup unnecessary struct keywords...
2018-06-29 23:43:51 +10:00
Finbar Crago
2722ca50fb
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
2018-06-29 23:32:05 +10:00
Finbar Crago
7ae388086b
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 12:34:53 +10:00
Thunderforge
72f6b1a693
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
2018-06-28 20:13:18 -05:00
Finbar Crago
ed71656ea6
fix updateActivatedQuickKey() crash
...
keyboard numbers don't start at zero...
2018-06-29 01:58:57 +10:00
Finbar Crago
24d5fb09da
fix crash on simultaneous key presses
2018-06-28 22:55:02 +10:00
Bret Curtis
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix
...
Fix some GCC warnings
2018-06-28 10:33:51 +02:00
Finbar Crago
d790a27060
Merge branch 'master' into fix_quickkey_segfalt
2018-06-28 18:16:00 +10:00
Andrei Kortunov
d9a1de0ec7
Do not use deprecated function
2018-06-28 11:13:32 +04:00
Andrei Kortunov
5455490ad2
Avoid fall-through in spell selection
2018-06-28 11:12:48 +04:00
Finbar Crago
80a3f0a0d4
switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers
2018-06-28 17:02:25 +10:00
Finbar Crago
335e2c5897
add keyData struct + general cleanup
2018-06-28 13:27:08 +10:00
David Cernat
9102df7fde
[General] Make WorldCollisionOverride also work with specific refIds
...
For now, this only makes it possible to enforce collision for specific refIds for placed objects.
2018-06-28 04:53:00 +03:00
David Cernat
84af9d9999
[Server] Reorder world map script functions
2018-06-28 03:48:16 +03:00
David Cernat
b81ca18316
[Client] Don't clear container Ptrs when disposing of corpses
...
The reason for this is that only the server should be determine whether a corpse can be disposed of or not.
2018-06-28 01:45:15 +03:00
Nikolay Kasyanov
5fcb091127
Replace FIXME with a detailed explanation of the issue
2018-06-27 22:40:09 +02:00
Nikolay Kasyanov
9c78364c45
Revert "Merge pull request #1771 from Xenkhan/master"
...
This reverts commit 9667dd051c
, reversing
changes made to f52e06fc19
.
2018-06-27 22:19:09 +02:00
David Cernat
7ffdb18bf9
[General] Implement ActorDeath packet, part 1
...
ActorDeath packets are sent for dead actors before their StatsDynamic packets. They contain the actor's deathReason in a manner similar to that of PlayerDeath packets.
A future commit will replace the deathReason with a variable named killer which will be an mwmp::Target.
2018-06-27 21:47:55 +03:00
Andrei Kortunov
ec73011617
Clean temporary storage if we assign new AI package (bug #4464 )
2018-06-27 12:52:43 +04:00
Andrei Kortunov
ee45f54b53
Refactor AiTemporaryStorage usage
2018-06-27 12:48:34 +04:00
Andrei Kortunov
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
2018-06-27 12:58:43 +10:00
David Cernat
15bfa30070
[Server] Make it possible to resend received worldstates
2018-06-27 02:00:16 +03:00
David Cernat
7060ff59c5
[Client] Enforce the default global map cell size in multiplayer
2018-06-27 01:23:48 +03:00
David Cernat
fec500c4b0
[Client] Reduce container debug spam by requiring VERBOSE logging for it
2018-06-26 23:40:19 +03:00
David Cernat
914b79fcc9
[General] Make it possible to check which placed objects have containers
2018-06-26 16:56:08 +03:00
Finbar Crago
43c9fd4cec
check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips
2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f
rm ContainerStore/refItem
2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e
Merged pull request #1777
2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309
Merged pull request #1778
2018-06-25 11:57:45 +02:00
Andrei Kortunov
97d8cc0efe
Check if the local was not found, just for sure
2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2
Check cell for null
2018-06-25 10:26:58 +04:00
Finbar Crago
46c6abcf54
add string vectors for name/id in QuickKeysMenu for item lookups
2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c
Validate map size
2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28
Initialize some missing fields in constructors
2018-06-25 09:35:42 +04:00
David Cernat
deda6ec071
[Client] Don't send WorldMap packets for already explored map tiles
2018-06-25 02:34:11 +03:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails
2018-06-24 14:39:48 +03:00
Capostrophic
35b0546737
Consider <p> tag when discarding post-EOL tag text (regression #4473 )
2018-06-23 14:27:40 +03:00
Finbar Crago
da4c55d5ad
prevent segfalt in QuickKeysMenu when item has been removed from player inventory
...
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().
(storing the RefId could be a better solution but would probably leave tooltips broken...)
2018-06-23 17:51:32 +10:00
David Cernat
5bb2ba1e9e
[General] Limit maximum imageData size in WorldMap packets
2018-06-23 02:33:34 +03:00
Bret Curtis
a55583a395
Merge branch 'master' into master
2018-06-21 22:22:01 +02:00
David Cernat
7e90d1f2a4
[Client] Fix interior-to-exterior and v.v. cell transitions for actors
...
Make sure only players who are cell authorities can get actors to teleport across cells for them, and display a message box for players who are not cell authorities.
2018-06-21 16:44:49 +03:00
Xenkhan
405a0caf29
Remove unneeded whitespace
2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<>
2018-06-20 13:33:59 -05:00
Marc Zinnschlag
22eb037c18
Merged pull request #1773
2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
...
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-20 17:19:48 +02:00
Marc Zinnschlag
6315848620
Merged merge request !2
2018-06-20 16:02:54 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim
...
Fast-forward death animation to end if death animation was finished earlier
2018-06-20 13:28:36 +02:00
Andrei Kortunov
c195144b17
Take transformation from first node with given name in file (bug #4469 )
2018-06-20 14:24:32 +04:00
Atahualpa
c0fc615cd6
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Improves previous commit:
1. Initialise mIgnoreBase boolean member with FALSE.
2. Remove isBaseOnly() function and replace with direct use of Record member.
2018-06-20 11:29:38 +02:00
Bret Curtis
664edc5a39
Merge pull request #1757 from akortunov/musicfix
...
Handle exception when try to load non-music file
2018-06-20 11:18:50 +02:00
Andrei Kortunov
c9756cee4c
Fast-forward death animation to end if death animation was finished earlier (regression #4468 )
2018-06-20 12:37:58 +04:00
David Cernat
fd05beef94
[Client] Don't delete disposed of corpses on client
...
Clients should instead await a server reply approving the deletion.
2018-06-20 02:01:19 +03:00
David Cernat
c3c7f2c8f9
[Server] Don't automatically synchronize ObjectDelete packets
2018-06-20 02:00:12 +03:00
Atahualpa
9d61d76e92
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Adds a boolean setting to the user preferences. This setting is locally saved to all OpenMW-CS check stages. When a verification is done, the setting is updated on setup for each check stage. If set to true, the boolean value is then used to skip the verification process for every base record - minus some special cases where, e.g., counters are to be set first.
Related issue:
- Fixes #4466 : Editor: Add option to ignore base records when running verifier (https://gitlab.com/OpenMW/openmw/issues/4466 )
Tests:
The changes were successfully tested in OpenMW-CS by creating faulty "Base" and "Modified" records for every record type (if possible) and, then, running the verifier with and without the option respectively.
2018-06-20 00:20:03 +02:00
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers
2018-06-19 15:03:30 -05:00
Capostrophic
6c23caadd7
Fix crash when a target in a different cell is (un)locked
2018-06-19 20:43:18 +03:00
Capostrophic
0c4fa55f16
Make Open spells casted by anything trigger player crime event ( fixes #4461 )
2018-06-19 17:04:38 +03:00
Marc Zinnschlag
7cfb7063c2
Merged pull request #1767
2018-06-19 13:30:10 +02:00
Marc Zinnschlag
7be069fcd2
Merged pull request #1743
2018-06-19 13:29:20 +02:00
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
2018-06-19 14:17:33 +04:00
Marc Zinnschlag
a8ad530db9
Merged pull request #1749
2018-06-19 11:33:08 +02:00
Marc Zinnschlag
2a52ade219
Merged pull request #1760
2018-06-19 11:26:41 +02:00
David Cernat
aa3639f2da
Merge pull request #450 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 19 Jun 2018
2018-06-19 05:26:38 +03:00
David Cernat
5b461b09ca
[Client] Display error when receiving ID_INCOMPATIBLE_PROTOCOL_VERSION
2018-06-19 05:24:26 +03:00
David Cernat
29be79e852
[General] Switch RakNet enums to CrabNet enums
...
CrabNet is TES3MP's fork of RakNet that has deviated too far from RakNet to still be compatible with it.
2018-06-19 00:37:52 +03:00
Capostrophic
8376c8c68e
Allow partial matches in NotCell condition ( fixes #4459 )
2018-06-18 03:27:31 +03:00
Bret Curtis
e93104a6b3
Merge pull request #1758 from Capostrophic/screenshot
...
Remove screenshot taken message again
2018-06-17 22:26:00 +02:00
Bret Curtis
70dec71c00
Merge pull request #1763 from akortunov/activatedoor
...
Forbid actors to use teleporting doors
2018-06-17 10:13:16 +02:00
Bret Curtis
3cc6da1db2
Update door.cpp
...
typo fix
2018-06-17 10:13:03 +02:00
Bret Curtis
3f2dbdc8a8
Merge branch 'master' into wanderfix
2018-06-17 10:00:38 +02:00
Bret Curtis
ecfc5fcd63
Merge pull request #1764 from akortunov/lightfix
...
Ignore lights without CanCarry flags when NPC selects torch
2018-06-17 08:40:50 +02:00
Andrei Kortunov
f3f7487664
Fix arguments parsing for AiWander console command (bug #4458 )
2018-06-16 22:11:10 +04:00
Andrei Kortunov
e08b0d3070
Ignore lights without CanCarry flags when NPC selects torch (bug #4457 )
2018-06-16 17:34:49 +04:00
Andrei Kortunov
2a65aaf5ab
Forbid actors to use teleporting doors (bug #2562 )
2018-06-16 14:21:28 +04:00
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
2018-06-16 12:12:32 +02:00
Bret Curtis
3f88aa46d0
Merge pull request #1759 from Thunderforge/refactor-launcher-sdl
...
Refactor SDL loading in Launcher to fix macOS errors
2018-06-15 12:58:44 +02:00
Andrei Kortunov
9c3da41130
Add murder bounty when a player follower commits murder (bug #2852 )
2018-06-15 14:31:09 +04:00
Thunderforge
506d615acc
Moving csignal import from main to graphicspage
2018-06-14 22:16:35 -05:00
Thunderforge
7615e78e52
Move SDL initialization from main.cpp to graphicspage.cpp
2018-06-14 19:39:24 -05:00
Capostrophic
1abf749f03
Remove screenshot taken message
2018-06-14 22:08:53 +03:00
Andrei Kortunov
2854f6ca83
Handle exception if we try to play non-music file (bug #4416 )
2018-06-14 21:32:40 +04:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Andrei Kortunov
49ba00a3ec
Add NPC validation to esmstore (bug #2772 )
2018-06-14 16:48:16 +04:00
Miloslav Číž
dd00e438fe
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e
Add FIXME comment
2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Marc Zinnschlag
2b35c5efd7
Merge remote-tracking branch 'upstream/master'
2018-06-13 18:13:15 +02:00
Marc Zinnschlag
aea481eacb
Merged pull request #1753
2018-06-13 18:12:38 +02:00
Marc Zinnschlag
f62df90960
Merged pull request #1572
2018-06-13 18:11:31 +02:00
Andrei Kortunov
61c968d550
Ignore broken items when search for replacement (bug #4453 )
2018-06-13 18:39:02 +04:00
Marc Zinnschlag
7ca56ccd29
set search status bar to 'no results' message when search yields no results
2018-06-13 15:48:24 +02:00
Andrei Kortunov
81b78a82e8
AI: try to open doors every AI_REACTION_TIME seconds (bug #4454 )
2018-06-13 17:47:32 +04:00
Marc Zinnschlag
7d2394273e
added statusbar to search window ( Fixes #3276 )
2018-06-13 14:55:03 +02:00
Miloslav Číž
dcfbd554bb
Remove try catch block
2018-06-13 11:12:46 +02:00
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue
2018-06-13 10:04:32 +02:00
Marc Zinnschlag
1ba0317905
Merged pull request #1670
2018-06-13 09:02:31 +02:00
Marc Zinnschlag
48711bbdde
Merged pull request #1592
2018-06-13 08:58:06 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Andrei Kortunov
9c45cc7e48
Use player reference instead of pointer
2018-06-12 22:05:00 +04:00
Marc Zinnschlag
a3911f52a0
Merged pull request #1750
2018-06-12 19:15:14 +02:00
Marc Zinnschlag
97773697a9
Merge remote-tracking branch 'florianjw/precise-rotations'
2018-06-12 19:05:52 +02:00
Capostrophic
1c8a20a54a
Set ok button focus in settings window by default ( fixes #4368 )
2018-06-12 19:45:43 +03:00
Andrei Kortunov
f299be8158
Play scripted animations even if SkipAnim is used
2018-06-12 16:07:36 +04:00
Andrei Kortunov
25bb7c1826
Make 'PlayGroup idle' to cancel scripted animations
2018-06-12 14:04:03 +04:00
Andrei Kortunov
0e441d48ac
Give scripted animations highest priority (bug #4286 )
2018-06-12 12:55:28 +04:00
Andrei Kortunov
0c92655250
Avoid code duplication in character manager
2018-06-12 11:51:54 +04:00
Andrei Kortunov
e3812f4075
Check creature stats only for actors
2018-06-12 11:27:18 +04:00
Andrei Kortunov
b0a140e714
Disable actor collision only after end of death animation
2018-06-12 10:00:38 +04:00
Andrei Kortunov
ebaa6fb5a2
Play death scream only once
2018-06-12 09:55:43 +04:00
Andrei Kortunov
427be928d0
Do not update animation state for dead actors
2018-06-11 23:17:54 +04:00
Andrei Kortunov
977a27ecb7
Do not clear corpses until end of death animation (bug #4307 )
2018-06-11 22:29:32 +04:00
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
...
Do not show any book text after last <BR> tag
2018-06-11 17:08:26 +02:00
Andrei Kortunov
a42c663fd7
Do not interrupt scripted animations by death animation (bug #4286 )
2018-06-11 18:53:25 +04:00
Andrei Kortunov
d0619cfb35
Play death animation for non-persisting actors with 0 health (bug #4291 )
2018-06-11 18:52:20 +04:00
Andrei Kortunov
6099735c60
Early out only when scripted animation is playing
2018-06-11 17:52:58 +04:00
Andrei Kortunov
e234dd2a36
Do not interrupt scripted animations
2018-06-11 17:18:51 +04:00
Andrei Kortunov
66a46ff03c
Do not show any book text after last <BR> tag.
2018-06-11 11:22:56 +04:00
Capostrophic
d43766d3c9
Make WakeUpPC interrupt waiting if it was supposed to be ( fixes #3629 )
2018-06-10 18:42:18 +03:00
Andrei Kortunov
acd3cba5fa
Store previous items in the savegame
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9fd2d57b86
Move previous items to player
2018-06-10 16:21:19 +04:00
Andrei Kortunov
f977c6876f
Bound items: store item ID instead of pointer
2018-06-10 16:21:19 +04:00
Andrei Kortunov
4de9d9fa77
Split adjustBoundItem()
2018-06-10 16:21:19 +04:00
Andrei Kortunov
d1b1cb748d
Reequip previous item only if the expired bound item was equipped
2018-06-10 16:21:19 +04:00
Andrei Kortunov
9b72a6ac69
Use the MWWorld::Ptr() instead of string ID
2018-06-10 16:21:19 +04:00
Andrei Kortunov
0375bedab2
Equip previous item after a bound item expires (bug #2326 )
2018-06-10 16:21:19 +04:00
Andrei Kortunov
ae87e0d3fc
Do not reset mUpperBodyState for weapon->weapon switch (regression #4446 )
2018-06-09 15:34:08 +04:00
Andrei Kortunov
4ba361fea6
Unhardcode sunset and sunrise settings (bug #1990 )
2018-06-09 13:09:17 +04:00
Marc Zinnschlag
7d9de93fd3
Merged pull request #1477
2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1
Merged pull request #1559
2018-06-09 10:51:02 +02:00
Marc Zinnschlag
efb4abbb7f
Merged pull request #1623
2018-06-09 10:49:04 +02:00
Marc Zinnschlag
76972bb2f6
Merged pull request #1709
2018-06-09 10:46:02 +02:00
Thunderforge
dfa9968565
Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged
2018-06-08 19:18:23 -05:00
Thunderforge
62c4eb8d6a
Explicitly flagging loaded cells changed as queued
2018-06-08 19:16:24 -05:00
Andrei Kortunov
6ed2773299
Do not stack return packages
2018-06-08 21:53:47 +04:00
Andrei Kortunov
74a2cbe696
AI: return back after pursuit
2018-06-08 21:53:47 +04:00
Andrei Kortunov
3d0631cfcc
Store last AI package in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
3a0ee78d2b
AiTravel: store mHidden flag in savegame
2018-06-08 21:53:47 +04:00
Andrei Kortunov
2f5beb8853
Remove unnecessary hack
2018-06-08 21:53:47 +04:00
Andrei Kortunov
57d686131e
Remove redundant condition
2018-06-08 21:53:47 +04:00
Andrei Kortunov
5105c67642
Add mHidden field to AiTravel
2018-06-08 21:53:47 +04:00
Andrei Kortunov
81f29d8dcd
AiWander: resume moving to destination after combat
2018-06-08 21:53:47 +04:00
Andrei Kortunov
18ff097e4a
Add the parameter to AiSequence::stack() to control ability to cancel other AI packages
2018-06-08 21:53:47 +04:00
Andrei Kortunov
9d27eb197f
AiWander: return to initial position only after combat
2018-06-08 21:53:47 +04:00
Bret Curtis
61c969e970
Merge branch 'master' into hitboxfix
2018-06-08 18:36:44 +02:00
Capostrophic
b274931165
Revert erroneous changes
2018-06-08 19:18:53 +03:00
Capostrophic
dd2a11b243
Merge branch 'master' into goodbye
2018-06-08 19:16:36 +03:00
Capostrophic
24c1ee7744
Use relative stat difference for haggling
2018-06-08 19:00:45 +03:00
Capostrophic
b7026df551
Improve the offered price formula ( Fixes #2222 )
2018-06-08 19:00:45 +03:00
Andrei Kortunov
fed10e87aa
Store integer actor ID in AI packages (bug #4036 )
2018-06-08 19:57:41 +04:00
Marc Zinnschlag
9d0ce25052
Merged pull request #1738
2018-06-08 17:28:08 +02:00
Marc Zinnschlag
7899f44173
Merged pull request #1619
2018-06-08 17:07:38 +02:00
Andrei Kortunov
fea34bd73f
Added support for per-group animation files
2018-06-08 17:04:15 +04:00
Capostrophic
11103211c5
Make Goodbye and Choice choices mutually exclusive
2018-06-08 15:03:19 +03:00
Marc Zinnschlag
21ea49fe83
Merge remote-tracking branch 'capostrophic/physics'
2018-06-08 11:43:10 +02:00
David Cernat
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-06-08 06:01:00 +03:00
Capostrophic
1a354f88ac
Make choices trigger goodbye if Goodbye is used ( fixes #3897 )
2018-06-07 22:09:55 +03:00
Andrei Kortunov
1b9edbe119
Add unequip animation during stance switching (bug #4327 )
2018-06-07 16:20:17 +04:00
Andrei Kortunov
bde1d07d4e
Use hitboxes and focused object for touch spells (bug #3374 )
2018-06-07 16:12:27 +04:00
Andrei Kortunov
4666a6a0ab
Use default hit formula as fallback
2018-06-07 16:12:27 +04:00
Andrei Kortunov
9e5d577a71
Aim from center of attacker to center of target
2018-06-07 16:12:27 +04:00
Andrei Kortunov
f5dc9f0162
Use hitbox cone only as fallback
2018-06-07 16:12:27 +04:00
Andrei Kortunov
ab433102a4
Increase hit distance for player by halfExtents
2018-06-07 16:12:27 +04:00
Marc Zinnschlag
7b4a69ff2f
Merged pull request #1728
2018-06-07 13:14:53 +02:00
Marc Zinnschlag
362aa23546
Merged pull request #1724
2018-06-07 13:13:48 +02:00
Marc Zinnschlag
2ab31b0c18
Merged pull request #1723
2018-06-07 13:05:20 +02:00
David Cernat
2942bf6455
Merge pull request #445 from OpenMW/master
...
Add OpenMW commits up to 6 Jun 2018
2018-06-07 13:41:04 +03:00
David Cernat
72862dc255
[General] Turn PlayerMap into WorldMap, now a Worldstate packet
2018-06-07 12:51:45 +03:00
David Cernat
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-06-05 20:57:50 +03:00
David Cernat
0d0c4ac235
[Client] Use REPLY_TO_REQUEST container sub-action for partial requests
2018-06-05 19:40:39 +03:00
David Cernat
04a2025340
Fix crash when adding items to certain disabled creatures (bug #4441 )
2018-06-05 18:09:10 +03:00
David Cernat
83014d6381
[Client] Set actors as the owners of their items when editing containers
2018-06-05 14:55:57 +03:00
David Cernat
bacecc93e3
[Server] Make it possible to resend a received ObjectList of any kind
...
Additionally, make existing related functions less confusing.
2018-06-05 14:19:06 +03:00
David Cernat
494edbe5cb
[General] Add REPLY_TO_REQUEST container sub-action
2018-06-05 14:16:27 +03:00
David Cernat
8ea9485e6b
[Client] Make container debug information more useful
2018-06-05 12:01:16 +03:00
David Cernat
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2018-06-04 19:34:26 +03:00
Marc Zinnschlag
cd7268e9af
Merge remote-tracking branch 'akortunov/effectResistFix' into openmw-44
2018-06-04 16:58:22 +02:00
Thunderforge
d46590934a
Importing mutex
2018-06-03 16:59:27 -05:00
Thunderforge
e282ece3d1
Fixing bug with autocomplete not loading correctly during startup
2018-06-03 16:58:18 -05:00
Thunderforge
103a7ac628
Using a mutex lock to prevent race conditions
2018-06-03 16:32:12 -05:00
Capostrophic
c14536a399
Update faction-owned items confiscation
2018-06-03 20:28:53 +03:00
Capostrophic
3810ade67a
Don't make unnecessary faction ID searches
2018-06-03 12:38:53 +03:00
Capostrophic
191cc76378
Consider faction ownerships in item stolen checks ( fixes #4293 )
2018-06-03 10:22:20 +03:00
Thunderforge
e26c675829
Changing join to detach so that the thread will not block the UI
2018-06-02 17:29:35 -05:00
elsid
dba79f4d4d
Fix warnings: catching polymorphic type by value
...
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
2018-06-02 14:28:46 +03:00
Andrei Kortunov
be394870e4
Fix regressions in spell resistance
2018-06-01 20:08:53 +04:00
Andrei Kortunov
84c8fb9df7
Add pursue package only when crime was reported (bug #4433 )
2018-06-01 12:41:31 +04:00
Andrei Kortunov
24863f620b
RotateWorld: rotate around world axis (bug #4426 )
2018-05-30 16:35:52 +04:00
Thunderforge
26dfef7970
Changing where we are loading cells to prevent Qt access issue
2018-05-27 17:15:36 -05:00
Thunderforge
78234e9468
Moving autocomplete code to thread
2018-05-27 16:47:09 -05:00
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
2018-05-27 16:10:16 +03:00
David Cernat
3efe05a88e
[General] Implement WorldCollisionOverride packet
2018-05-27 16:05:40 +03:00
David Cernat
5d30a884ba
[Client] Add Worldstate to CMakeLists
2018-05-27 16:00:14 +03:00
David Cernat
e8ec031a81
[Client] Create Worldstate class that inherits BaseWorldstate
2018-05-27 15:57:47 +03:00
Thunderforge
c2fff61ccd
Changing so that data changes happen only after the addon is checked
2018-05-26 20:35:28 -05:00
Capostrophic
7e38bb8513
Verifier: improve handling of class name and description
2018-05-26 22:37:02 +03:00
scrawl
cfdf99f601
Revert "Merged pull request #1573 "
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
2018-05-26 11:39:30 +00:00
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix"
...
This reverts commit da47fc79f5
, reversing
changes made to 7324bd368f
.
2018-05-26 11:35:48 +00:00
Marc Zinnschlag
b151a89528
Merged pull request #1568
2018-05-26 12:17:07 +02:00
Marc Zinnschlag
bbc337a0af
code cleanup
2018-05-26 12:16:02 +02:00
Marc Zinnschlag
e76df5f4d3
minor tooltip fixes
2018-05-26 11:53:08 +02:00
Marc Zinnschlag
e30ade81be
Merged pull request #1680
2018-05-26 11:21:34 +02:00
David Cernat
f7a084c824
[Client] Use faster check for whether actors are DedicatedPlayers
2018-05-26 08:13:26 +03:00
David Cernat
c8ec77875c
[Client] Update old comments for changes made by tes3mp
2018-05-26 05:11:41 +03:00
Marc Zinnschlag
832b4bb778
Merged pull request #1659
2018-05-25 11:32:08 +02:00
David Cernat
416ee77639
[General] Add placeholder for WorldCollisionOverride packet
2018-05-25 07:09:32 +03:00
David Cernat
2edb511a0b
[Client] Remove unnecessary condition from WorldTime processor
2018-05-25 07:08:51 +03:00
David Cernat
49ea76aa9d
[General] Add notes for InputDialogs in GUIBoxes packet
2018-05-25 05:28:22 +03:00
David Cernat
3b5fb9cd6b
[General] Make it possible to set year via WorldTime
2018-05-25 03:33:12 +03:00
David Cernat
4acf93b7db
[General] Make it possible to set days passed via WorldTime
2018-05-24 14:02:04 +03:00
David Cernat
74c2a0b311
Merge pull request #438 from OpenMW/master
...
Add OpenMW commits up to 24 May 2018
2018-05-24 12:16:11 +03:00
Andrei Kortunov
1abff5365b
Capitalize enchanted items names again in spells window
2018-05-24 13:03:47 +04:00
Andrei Kortunov
afae398b5c
Use utf8 lowercase function for journal index to avoid code duplication
2018-05-24 12:53:06 +04:00
Andrei Kortunov
b5374029e5
Implement case-insensitive search in spell window
2018-05-24 12:39:00 +04:00
Andrei Kortunov
9ac752ea70
Implement filtering in the spells window
2018-05-24 10:48:46 +04:00
David Cernat
46744ee90f
[General] Make WorldTime script functions more consistent with others
2018-05-24 09:38:06 +03:00
Bret Curtis
da47fc79f5
Merge pull request #1701 from akortunov/standfix
...
Do not apply queue movement for standing actors
2018-05-23 22:35:08 +02:00
Marc Zinnschlag
7324bd368f
Merged pull request #1573
2018-05-23 17:00:29 +02:00
Marc Zinnschlag
d92d754834
Merged pull request #1697
2018-05-23 16:01:11 +02:00
Marc Zinnschlag
1564a3f6aa
Merged pull request #1713
2018-05-23 13:51:32 +02:00
Marc Zinnschlag
2f958881b7
Merged pull request #4413
2018-05-23 13:45:35 +02:00
David Cernat
8d36d0d945
[General] Make it possible to change world's time scale via WorldTime
2018-05-23 08:31:25 +03:00
David Cernat
0be6de6607
[General] Turn RecordDynamic into a Worldstate packet
2018-05-23 07:48:28 +03:00
David Cernat
031a80ed5a
[Client] Don't advance time when waiting, traveling, training or jailed
2018-05-23 05:49:51 +03:00
David Cernat
02ba641bef
[Server] Use correct index changes for dynamic stat script functions
2018-05-23 05:48:28 +03:00
Thunderforge
d58cce9c72
Adding WIP code to dynamically change the autocomplete fields
2018-05-22 20:50:31 -05:00
David Cernat
da66face25
[General] Rename GameTime packet into WorldTime
2018-05-23 00:41:29 +03:00
David Cernat
296c69d788
Merge pull request #436 from OpenMW/master
...
Add OpenMW commits up to 22 May 2018
2018-05-23 00:40:51 +03:00
Nelsson Huotari
825c331764
Remove texture filtering, better ltex importing, reindexing duplicates
2018-05-22 14:55:09 +03:00
declan-millar
b8df4b7c5a
Tidy in-code comment
2018-05-21 22:14:23 +01:00
declan-millar
844aef85f3
Replace spelling: soulgem -> soul gem in code comment
2018-05-21 22:12:19 +01:00
declan-millar
9ed4f33048
Replace spelling: soulgem -> soul gem
2018-05-21 19:10:24 +01:00
declan-millar
028b528c0b
Get soul magnitude before checking the rebalance setting
2018-05-21 18:16:04 +01:00
declan-millar
9346a552fa
Use Rebalance soulgem values option to set soulgem value
2018-05-21 13:59:20 +01:00
declan-millar
78e79d5775
Add advanced option to Rebalance soulgem values to the launcher
2018-05-21 13:33:42 +01:00
David Cernat
5af1150ab2
[General] Turn GameTime into a Worldstate packet
2018-05-21 07:14:08 +03:00
David Cernat
e87e1dbb30
[General] Fix Worldstate packets by adding missing lines
2018-05-21 07:12:55 +03:00
David Cernat
e690ff0e29
Merge pull request #432 from OpenMW/master
...
Add OpenMW commits up to 18 May 2018
2018-05-20 23:48:53 +03:00
Nelsson Huotari
8ae46519cf
Fix missed worldspacehits, add linebreak to tooltip
2018-05-20 21:58:40 +03:00
Nelsson Huotari
21e8d08e69
Handle invalid texture id's
2018-05-20 21:20:40 +03:00
declan-millar
4b1247597e
Use soulgem value rebalance formula from morrowind code patch
2018-05-20 17:06:26 +01:00
Capostrophic
867a5938ca
Don't reset sneaking camera offset while in GUI ( fixes #4420 )
2018-05-20 10:24:20 +03:00
Marc Zinnschlag
ec900ef4ad
Merged pull request #1710 )
2018-05-18 12:34:16 +02:00
Nelsson Huotari
c2cddc91e4
Brush maximum size to a custom setting
2018-05-18 11:32:42 +03:00
David Cernat
43a944ddaf
[General] Add and implement new Worldstate packet type
2018-05-18 06:40:28 +03:00
David Cernat
e8b22a2e5e
[Server] Use correct source group for ObjectProcessors
2018-05-18 05:06:19 +03:00
tri4ng1e
f2613a74b1
Write settings before invoking openmw-iniimporter
2018-05-17 21:20:04 +03:00
tri4ng1e
7e03dd0f12
Read data paths from data-local
section too
2018-05-17 21:07:20 +03:00
tri4ng1e
3b86f73ae7
Replace MwIniImporter::numberToString with std::to_string
2018-05-17 21:04:40 +03:00
Capostrophic
4e485dbd44
Rename Original Creature column to Parent Creature ( fixes #2897 )
2018-05-17 13:00:48 +03:00
David Cernat
049d0d9ba7
[General] Fix remaining references to world packets/events
2018-05-17 00:08:37 +03:00
David Cernat
dc9a3bf73f
Merge pull request #429 from OpenMW/master
...
Add OpenMW commits up to 16 May 2018
2018-05-16 19:20:01 +03:00
Bret Curtis
67c381df4e
Merge pull request #1708 from akortunov/refidfix
...
fix GCC warnings
2018-05-16 15:59:31 +02:00
Andrei Kortunov
a68de93308
Initialize srate variable in openal_output
2018-05-16 16:34:58 +04:00
Andrei Kortunov
e5db5e2651
Fix 'maybe-uninitialized' warning in openal_output
2018-05-16 16:13:22 +04:00
Andrei Kortunov
df459199dd
Avoid left shift of negative value
2018-05-16 12:59:05 +04:00
Nelsson Huotari
17e01ca336
Setting "Scene Drops" rename "3D Scene Editing"
2018-05-16 11:41:37 +03:00
Nelsson Huotari
758ccac75a
Show texture id + filename
2018-05-16 11:34:58 +03:00
Bret Curtis
caf1760251
Merge pull request #1707 from akortunov/weaponreach
...
Display weapon reach on tooltips in feet
2018-05-16 10:27:53 +02:00
Andrei Kortunov
164e3d12fe
Display weapon reach on tooltips in feet.
2018-05-16 11:18:22 +04:00
Bret Curtis
e410c47660
Merge pull request #1706 from akortunov/refidfix
...
Fix compiler warning in getNestedData()
2018-05-16 09:00:25 +02:00
Andrei Kortunov
6a3ff5ed81
Fix compiler warning in getNestedData
2018-05-16 10:10:42 +04:00
David Cernat
2ac334664b
[Server] Add deprecated alternatives for ObjectList functions
...
This will avoid server crashes in older scripts.
2018-05-16 02:16:27 +03:00
David Cernat
51698bed48
[Client] Rename WorldProcessor into ObjectProcessor
2018-05-15 22:56:47 +03:00
David Cernat
02d8e08c58
[Server] Rename WorldProcessor into ObjectProcessor
2018-05-15 22:07:06 +03:00
David Cernat
1e749938fb
Merge pull request #426 from OpenMW/master
...
Add OpenMW commits up to 15 May 2018
2018-05-15 21:01:33 +03:00
David Cernat
bef36f77ca
[Server] Create WorldstateFunctions and move GameTime functions there
2018-05-15 20:58:09 +03:00
Bret Curtis
c75d774356
Merge pull request #1692 from akortunov/playsound
...
Prevent PlaySound overlapping
2018-05-15 19:03:01 +02:00
Andrei Kortunov
f8655d2425
Use actor's physics position as a ray origin in tracer
2018-05-14 20:38:53 +04:00
David Cernat
9b9dd4abaf
Merge pull request #425 from OpenMW/master
...
Add OpenMW commits up to 13 May 2018
2018-05-13 19:27:34 +03:00
Capostrophic
e32f38b939
Allow jumping when you're stuck on a slope ( fixes #4221 )
2018-05-13 17:19:33 +03:00
Capostrophic
409d466e42
Make 0/0 encumbrance 0% encumbrance
2018-05-13 17:18:45 +03:00
Capostrophic
ba077e7291
Fix movement fatigue loss encumbrance calculation ( fixes #4413 )
2018-05-13 17:18:45 +03:00
Capostrophic
1c9fba9a8c
Fix jumping encumbrance calculation
2018-05-13 17:18:45 +03:00
Marc Zinnschlag
0f22600a98
Merged pull request #1703
2018-05-13 09:08:40 +02:00
David Cernat
d4f7936a76
[Server] Rename WorldFunctions into ObjectFunctions
2018-05-13 04:11:05 +03:00
David Cernat
78234f9071
[General] Rename Event into ObjectList & WorldObject into BaseObject
2018-05-13 00:42:24 +03:00
David Cernat
6bf3a0be1e
[General] Rename WorldPackets into ObjectPackets for clarity
2018-05-12 19:40:00 +03:00
David Cernat
5458e09c8a
Merge pull request #420 from OpenMW/master
...
Add OpenMW commits up to 11 May 2018
2018-05-12 06:32:01 +03:00
David Cernat
77389538e8
[General] Implement ActorAI packet, part 1
...
The server can now make actors become followers of players or other actors.
2018-05-12 06:29:11 +03:00
tri4ng1e
9126e844bf
Use data paths from config (bug #4412 )
2018-05-11 17:24:36 +03:00
Marc Zinnschlag
b7cce1a665
Merged pull request #1702
2018-05-11 10:11:17 +02:00
David Cernat
57b791ea2a
[Client] Show selected object's refNum & mpNum in console window title
...
This allows for much easier debugging of all objects and actors.
2018-05-11 00:46:24 +03:00
Nelsson Huotari
49ae5bc75c
List initialization -> initialization in constructor
2018-05-10 22:57:48 +03:00
Nelsson Huotari
1c79d5311c
Brush history menu
2018-05-10 21:58:36 +03:00
Nelsson Huotari
d2cf764a46
Tooltips, fixes
2018-05-10 15:01:53 +03:00
Nelsson Huotari
62066f01bd
clean-up
2018-05-10 11:18:54 +03:00
Nelsson Huotari
d33c98c68d
Revert unintended changes
2018-05-10 11:18:54 +03:00
Nelsson Huotari
5656745445
Select dragged texture-assets, add brush settings widget-type, fixes.
2018-05-10 11:18:54 +03:00
Nelsson Huotari
baa707b5e3
User setting for selective cell editing or new land creation
2018-05-10 11:18:54 +03:00
Nelsson Huotari
24977fcc0f
improve hit calculation accuracy for texture editing
2018-05-10 11:18:54 +03:00
Nelsson Huotari
e8a9bff85c
Drop textures to landtextures from assets (try-method)
2018-05-10 11:18:54 +03:00
Nelsson Huotari
7139889566
Brush button window opens at modebutton, slider 1-50, doxygen comments
2018-05-10 11:18:54 +03:00
Nelsson Huotari
20d1d8ac89
Fixed brush calculations, implement undostack macro when clicked.
2018-05-10 11:18:54 +03:00
Nelsson Huotari
5f3c8b2b99
c_str -> fromStdString, remove TextureBrushButton class
2018-05-10 11:18:54 +03:00
Nelsson Huotari
cf7a0f715e
Command macro for complete drag-editing operations.
2018-05-10 11:18:54 +03:00
Nelsson Huotari
9f742d5b1f
Brush affects adjancent cells
2018-05-10 11:18:54 +03:00
Nelsson Huotari
1ca2710a2a
Formatting, fixes
2018-05-10 11:18:54 +03:00
Nelsson Huotari
1c113eca9c
15 to landTextureSize-1
2018-05-10 11:18:54 +03:00
Nelsson Huotari
3327d6f7c4
Drag terrain painting, code cleanup
2018-05-10 11:18:54 +03:00
Nelsson Huotari
a54a1b9940
Command system and undo
2018-05-10 11:18:54 +03:00
Nelsson Huotari
cc415526b0
fix texture index +1, better icons
2018-05-10 11:18:54 +03:00
Nelsson Huotari
316d05bdc4
{} to ()
2018-05-10 11:18:54 +03:00
Nelsson Huotari
4649d1258c
Direct data terrain editing
2018-05-10 11:18:54 +03:00
Nelsson Huotari
4ae75d1d20
Terrain texture brush frame
2018-05-10 11:18:54 +03:00
David Cernat
12727b66ea
[Server] Use consistent variable names in map tile script functions
2018-05-10 07:44:08 +03:00
David Cernat
7f00005f04
[Client] Fix GCC build
...
Based on 71040659ac
2018-05-10 07:16:33 +03:00
David Cernat
32d71de2f5
Update MapWindow every frame, not just when it's open (bug #4279 )
2018-05-09 07:33:45 +03:00
Alf Henrik Sauge
feeee50a88
Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
...
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
2018-05-09 00:25:07 +02:00
tri4ng1e
103a07b744
Less cryptic abbreviations
2018-05-08 18:32:06 +03:00
Marc Zinnschlag
3197ebd8e7
Merged pull request #1694
2018-05-08 12:19:14 +02:00
David Cernat
715012f087
[General] Implement sending of image data for map tiles in PlayerMap
2018-05-08 05:57:04 +03:00
Andrei Kortunov
2f89080b36
Load default markers definitions in editor
2018-05-07 22:32:04 +04:00
Andrei Kortunov
b15bed8e22
Avoid excessive loadSound calls
2018-05-07 20:40:53 +04:00
tri4ng1e
905cde10db
Smart-sorting in iniimporter (time + dependency)
2018-05-07 15:51:46 +03:00
Marc Zinnschlag
53b6ef6f8c
minor code cleanup
2018-05-07 09:54:42 +02:00
Marc Zinnschlag
e661e3cf74
Merged pull request #1677
2018-05-07 09:42:41 +02:00
Alf Henrik Sauge
9b971caddc
CSVTools::ReportTable should now have case insensitive sorting
2018-05-06 16:49:23 +02:00
Andrei Kortunov
17222eb821
Get rid of unnecessary find
2018-05-06 16:42:05 +04:00
Bret Curtis
c44f87afd1
Merge pull request #1699 from Capostrophic/editorwarnings
...
Editor verifier updates
2018-05-06 10:57:24 +02:00
Bret Curtis
0fc198be52
Merge pull request #1698 from Capostrophic/c++11
...
A bunch of C++11-related updates
2018-05-06 10:44:11 +02:00
Capostrophic
2502d53816
Object record verifier updates
...
Removed light 0 duration warning
Spelling fixes
2018-05-06 00:23:05 +03:00
Capostrophic
91b97a27ea
Remove empty class description warning
2018-05-06 00:14:14 +03:00
Capostrophic
e22409c266
Fix sound range warning message
2018-05-06 00:13:09 +03:00
Andrei Kortunov
3636cf2015
Do not apply queue movement for standing actors
2018-05-05 22:41:26 +04:00
Capostrophic
3d3bef94cd
Use range-based for loop
2018-05-05 16:29:01 +03:00
Andrei Kortunov
1dd36329a3
Load default markers definitions (bug #4410 )
2018-05-05 17:14:33 +04:00
Bret Curtis
c219c89603
Merge pull request #1696 from Capostrophic/feature-2694
...
Rename "Model" column to "Model/Animation" (feature #2694 )
2018-05-05 08:14:03 +02:00
Capostrophic
9ac9f94638
Rename "Model" column to "Model/Animation" (feature #2694 )
2018-05-04 20:00:58 +03:00
David Cernat
980ddcb114
[Server] Add DoesFileExist() script function
2018-05-04 03:09:54 +03:00
Capostrophic
8be93b4a12
Initialize mandatoryIds vector C++11-way
2018-05-03 19:56:01 +03:00
Capostrophic
85b7aa4f09
Uncomment is_pod test in fixed string tests
2018-05-03 19:47:39 +03:00
Nelsson Huotari
e4e225f4e7
Add topic, journal and related -info icons.
2018-05-03 14:32:15 +03:00
David Cernat
51fd937250
[Server] Remove hardcoded debug messages when using script callbacks
2018-05-01 20:39:43 +03:00
David Cernat
df0f9b0f5e
[Client] Require a certain Skill progress amount before sending packet
2018-05-01 19:34:21 +03:00
David Cernat
1b1e5e86d1
[Client] Avoid sending CellStates to server after initialization
...
Although b4e8560698
made players instantly able to see each other on minimalist servers that did not change their cells from the default, it created problems with the default CoreScripts where players need to be logged in before receipt of a CellStates packet from them is taken into account, with the result being that a player was recorded as having loaded their initial cells on the server's C++ side but not on the Lua side.
It may simply be best to expect servers to set player cells.
2018-05-01 18:19:52 +03:00
Andrei Kortunov
4872edc5ed
Prevent PlaySound overlapping
2018-05-01 16:24:32 +04:00
Andrei Kortunov
22fb1f3403
Play spellcasting effects from objects
2018-04-30 17:12:06 +04:00
David Cernat
099f85be0a
[General] Implement PlayerMomentum packet & associated script functions
2018-04-29 23:47:17 +03:00
David Cernat
273179fd5a
Merge pull request #414 from OpenMW/master
...
Add OpenMW commits up to 29 Apr 2018
2018-04-29 22:35:05 +03:00
David Cernat
4b501a39f4
[General] Implement DoorDestination packet & associated script functions
2018-04-29 22:32:22 +03:00
David Cernat
d47b06fe7a
[Server] Prevent SetGameMode() and SetHostname() from crashing server
...
Previously, turning off communication with the MasterServer from the server config and then attempting to use SetGameMode() or SetHostname() led to a server crash.
2018-04-29 19:50:39 +03:00
scrawl
b995584ad2
Merge pull request #1688
2018-04-29 14:27:55 +00:00
David Cernat
3b07dc4b42
[Client] Send equipment packets whenever an item charge or count changes
...
Since the beginnings of TES3MP, equipment packets have only been sent whenever an item has been replaced by an item with a different refId, with changes in an item's charge or count not sending a packet (but being included in the next packet sent as a result of a refId change). The reason for this was ostensibly the fact that every single equipment packet always included the details for all 19 equipment items (as per Koncord's original design decision), which would have led to massive packet spam if such a packet was sent every time you shot an arrow or lost a little bit of your armor's condition.
With minimalist equipment packets, it is now viable to send equipment packets whenever any item changes in some way, by having the equipment packet contain only that one item.
2018-04-29 05:40:42 +03:00
David Cernat
399e049d87
[Client] Fix logic for minimal size packets in LocalPlayer
...
Previously, the index changes were not cleared at the start of their corresponding update functions, which in turn meant that an Attribute/Skill/StatsDynamic/Equipment packet received by a player from the server made that player send back the same packet, as the index changes from it were retained.
Additionally, exchangeFullInfo was not set to false, thus sometimes leading to constant full exchanges of information.
2018-04-27 03:45:17 +03:00
David Cernat
66d5109509
[General] Fix information exchange for players sharing a cell
...
Previously, two players entering the same cell only sent and received their latest changes for dynamic stats, attributes, skills and equipment when they started sharing that cell.
2018-04-26 21:56:14 +03:00
David Cernat
7db74509e0
Merge pull request #412 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwscript/transformationextensions.cpp
2018-04-25 21:55:32 +03:00
Capostrophic
6b47f72959
Set character preview scene ambient to 0, 0, 0
2018-04-25 15:31:49 +03:00
scrawl
bdf1070852
Merge pull request #1688
2018-04-25 11:54:26 +00:00
scrawl
f0507e6b46
Merge pull request #1686
2018-04-25 10:27:38 +00:00
Capostrophic
bfcdf660f2
Utilize inventory character preview lighting rotation fallback settings
2018-04-23 22:48:15 +03:00
Capostrophic
9073e4d4ba
Initialize playlist file list in playPlaylist ( fixes #4134 )
2018-04-22 23:21:29 +03:00
Capostrophic
b69e812a52
Utilize inventory character preview lighting color fallback settings
2018-04-22 22:37:27 +03:00
scrawl
d8d26f1de8
Merge pull request #1685
2018-04-22 15:34:31 +00:00
scrawl
ec4e2f0064
Merge pull request #1684
2018-04-22 15:27:31 +00:00
David Cernat
608dcbafe6
[Client] Fix skill updates for LocalPlayer partially broken by 78441c769a
2018-04-22 11:22:36 +03:00
Evgeny Kurnevsky
c025b8f8f3
Remove useless comparison.
2018-04-21 17:10:49 +03:00
David Cernat
02eef933fd
Merge pull request #411 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2018
2018-04-21 17:00:55 +03:00
David Cernat
a541d7df3c
[General] Rework PlayerStatsDynamic packets so they are of minimal size
...
(cherry picked from commit fc5e883160
)
2018-04-21 00:43:49 +03:00
David Cernat
b9520c11da
[General] Rework PlayerEquipment packets so they are of minimal size
...
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
(cherry picked from commit d1ad0c91f8
)
2018-04-20 22:46:16 +03:00
Capostrophic
37dc3200d1
Inherit the calling object scale in PlaceAt ( fixes #4308 )
2018-04-20 00:15:26 +03:00
David Cernat
c5b08d6109
[General] Simplify storing of attribute and skill index changes
...
(cherry picked from commit bd9e8bd10f
)
2018-04-19 23:28:03 +03:00
David Cernat
2c77d5f498
[General] Set enforcedLogLevel to -1 when initializing BasePlayer
2018-04-19 20:42:27 +03:00
David Cernat
7b702bf8c2
[General] Add and use utility function for int value checks in vectors
...
(cherry picked from commit a796f81444
)
2018-04-19 18:16:10 +03:00
David Cernat
b6099024df
[General] Rework PlayerAttribute packets so they are of minimal size
...
Previously, whenever a single attribute value changed for a player, that player then sent a PlayerAttribute packet with all values for all 8 attributes.
This did not cause anywhere as much packet spam as PlayerSkill used to, but there was no good reason not to fix it as well.
(cherry picked from commit b0965f094a
)
2018-04-19 17:26:20 +03:00
David Cernat
78441c769a
[General] Rework PlayerSkill packets so they are of minimal size
...
Previously, whenever a single skill value changed for a player, that player then sent a PlayerSkill packet with all values for all 27 skills, plus the player's progress towards the next level and the bonuses to each attribute on the next level up as the result of sklll increases thus far.
This commit makes PlayerSkill contain only the values of specific skills, moves the player's progress towards the next level to PlayerLevel packets, and moves the bonuses to each attribute on the next level up to PlayerAttribute packets.
Players now also send a PlayerSkill packet whenever their progress towards a new point in a skill changes. This was previously avoided so as to not have massive packet spam.
(cherry picked from commit ef79a98544
)
2018-04-19 15:18:38 +03:00
scrawl
5d1b40c5ea
Merge pull request #1678
2018-04-19 12:18:24 +00:00
David Cernat
af4fcb7261
[Client] Don't force skill update on cell change
...
Previously, an attempt by the server to simultaneously change a player's cell and skills (as you'd expect when a player file is loaded) led to:
1) The server sending the cell packet first and the skill packet afterwards
2) The player receiving the cell packet and sending their own skill packet as part of the client's forced skill update
3) The player receiving the skill packet from the server
4) The server receiving the skill packet from the player
The result was that, if the player then left the server without sending another skill packet, the server's memory retained the skills the player had sent instead of the skills it had sent to the player.
This is the first step in a solution to that situation and similar ones.
(cherry picked from commit cac4684986
)
Note: In 0.6.x, this was only a problem if a player's cell was set by the server first and their skills were set next, i.e. this was not a problem in the default CoreScripts because the opposite order used there masked the problem. It was a more significant problem in 0.7 because all packets were queued for a player and sent in a specific hardcoded order.
2018-04-19 14:22:14 +03:00
David Cernat
57070b7f5c
[Client] Disable automatic transition to other chargen menus from OpenMW
...
Previously, after finishing the TES3MP chargen once, mCreationStage was set to 4 in OpenMW, which in turn made it impossible to go through only specific chargen menus again as the result of the relevant TES3MP script function (tes3mp.SetCharGenStage(pid, startStage, endStage) in 0.6.3, player:setCharGenStages(startStage, endStage) in 0.7). In other words, trying to allow a player to just choose their class again made it so the player started at that menu and went through all the other subsequent menus as well, i.e. the player went through the class, birthsign and review menus.
2018-04-19 13:47:42 +03:00
David Cernat
28f1c1b0d3
[General] Rework CharGen slightly for clarity purposes
...
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.
(cherry picked from commit 926106cf8c
)
2018-04-19 13:25:29 +03:00
David Cernat
9d46de88e0
[Client] Send cell states correctly after inputting name
...
Previously, initial cell states were sent in LocalPlayer::processCharGen() and were ignored by the server because the player was not yet regarded as loaded. The result was that existing players logging in could not see each other until they went through at least one cell change.
(cherry picked from commit b4e8560698
)
# Conflicts:
# apps/openmw/mwmp/LocalPlayer.cpp
2018-04-18 20:30:48 +03:00
David Cernat
306252ecdc
[Server] Fix confusing script function names
2018-04-18 19:10:58 +03:00
Capostrophic
8617d0603b
Display a message if a spell the player tries to use via a quick key is missing ( fixes #4391 )
2018-04-18 19:10:46 +03:00
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
2018-04-18 18:05:09 +03:00
tri4ng1e
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes
2018-04-18 12:36:10 +00:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
...
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.
PVS-Studio:
apps/opencs/model/filter/parser.cpp 582 warn V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp 67 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp 74 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp 32 err V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp 1376 err V547 Expression 'subColIndex < 3' is always true.
apps/openmw/mwgui/widgets.hpp 318 warn V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp 319 warn V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp 320 warn V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp 1425 warn V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp 2155 err V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp 1192 warn V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp 521 warn V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp 317 err V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp 409 warn V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp 28 warn V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp 561 warn V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp 18 warn V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp 463 warn V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp 409 err V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp 691 warn V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp 1125 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp 1137 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.
apps/wizard/unshield/unshieldworker.cpp 475 warn V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp 163 warn V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.
components/fontloader/fontloader.cpp 427 err V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp 282 warn V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp 119 err V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp 178 warn V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp 235 warn V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp 237 warn V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
David Cernat
311f770de7
[Server] Document script functions, part 4
...
Additionally, clean up some variable names.
2018-04-18 11:02:18 +03:00
David Cernat
76e7392a84
[Server] Create ShapeshiftFunctions and move relevant functions there
2018-04-18 10:45:39 +03:00
David Cernat
2bb7a4253e
[Server] Forcibly kick players after too many handshake attempts
2018-04-18 10:16:38 +03:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2018-04-17 23:03:56 +02:00