mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-22 15:23:56 +00:00
Code Issues Releases Wiki Activity
18061 commits 38 branches 54 tags 122 MiB
Commit graph

13592 commits

Author SHA1 Message Date
scrawl
530fb61ad0 Use OpenThreads instead of boost thread 
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.

With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.

So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread

This patch opts for 3.)

Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
 2016-10-10 18:23:06 +02:00
scrawl
ae2036fa85 Merge pull request #1097 from Allofich/persuasion 
Don't let intimidate bring disposition below 0 (Fixes #3584)
 2016-10-09 20:20:43 +02:00
Allofich
028db21c8a Don't let disposition at end of dialogue be below 0 (Fixes #3584) 2016-10-10 02:20:24 +09:00
David Cernat
14bac1e533 Make player markers appear on inventory map 2016-10-09 13:41:00 +03:00
David Cernat
07acd7a721 Make player markers work in interiors and make them easier to test 2016-10-09 10:29:30 +03:00
scrawl
1893617ec9 Improvements to ignored light list setting 
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.

Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
 2016-10-08 23:59:28 +02:00
MiroslavR
11565b5966 Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
scrawl
50bcb65ee0 Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms 2016-10-08 19:20:24 +02:00
scrawl
6615330430 Fix use of UnrefQueue in removeObject 2016-10-08 16:41:17 +02:00
scrawl
3019d70986 Use 'default icon' for items with no icon specified 2016-10-08 16:05:20 +02:00
Koncord
bd1b1fca64 Woops 2016-10-08 15:36:25 +08:00
Koncord
50d989d767 Fix server crash if player is not fully connected 2016-10-08 15:30:52 +08:00
Koncord
79532cf797 Detecting reason of death 2016-10-08 15:15:43 +08:00
Koncord
2e81034e53 Started work on the map markers 2016-10-07 13:17:44 +08:00
scrawl
37bfa88b2d Merge pull request #1094 from Allofich/alchemy 
Fix reversed use of alembics and retorts
 2016-10-06 19:02:24 +02:00
Allofich
498976775a Fix reversed use of alembics and retorts 2016-10-07 01:38:50 +09:00
scrawl
73b6c34a23 Merge pull request #1092 from Allofich/warnings 
Fix shadowing warnings
 2016-10-06 17:50:26 +02:00
Allofich
53e94b7c3f Fix shadowing warnings 2016-10-06 23:33:52 +09:00
David Cernat
6eae017561 Merge pull request #74 from OpenMW/master 
Add OpenMW commits up to 5 Oct
 2016-10-06 06:16:09 +03:00
Allofich
df03b32205 Coverity fixes 2016-10-05 23:32:26 +09:00
scrawl
721062a4bd Merge pull request #1089 from Allofich/bound 
Corrections for bound equipment
 2016-10-04 18:34:27 +02:00
Allofich
506d0e8e54 Correction to display of 0-weight tooltips 2016-10-04 23:02:45 +09:00
Allofich
160da0b149 Treat 0-weight armor as light armor in some respects 2016-10-04 23:02:25 +09:00
MiroslavR
a05649e1d5 Use loop fallback for movement animations (Fixes #3578) 2016-10-03 22:36:56 +02:00
sandstranger
5230bf6528 disable using shaders for gles1 and Android 2016-10-03 20:31:08 +04:00
scrawl
44dffe55ab Merge pull request #1083 from Allofich/onhit 
Make AI response to spell hits more like original MW
 2016-10-02 14:06:51 +02:00
scrawl
3d76ba5a7c Merge pull request #1086 from Allofich/warnings 
Fix shadowing warnings
 2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb Fix shadowing warnings 2016-10-02 17:48:54 +09:00
Allofich
e78f02aaf2 Consider reflected/absorbed hostile spells as assaults 2016-10-02 16:08:24 +09:00
MiroslavR
210c02d98e Fix interactive ID validity checks in TypesetBookImpl 2016-10-01 21:07:17 +02:00
Allofich
a81a04e6d0 Remove unused line 2016-10-02 01:11:01 +09:00
Allofich
fa17784722 Change breaks to continues 2016-10-02 00:54:01 +09:00
scrawl
140be70a90 Merge pull request #1082 from Gladdy/master 
Fix for segmentation fault on entering a cell
 2016-10-01 16:42:47 +02:00
scrawl
b170efb9fa Merge pull request #1084 from Allofich/water 
Don't let water-only creatures prevent resting
 2016-10-01 16:14:19 +02:00
Allofich
a2e174a40f Don't let water-only creatures prevent resting 2016-10-01 22:15:31 +09:00
Allofich
266ec1aadc Make AI response to spell hits more like original MW 2016-10-01 21:38:17 +09:00
Koncord
fa0a55c2a9 Fix use of freed memory 2016-10-01 10:54:42 +08:00
Koncord
94d5efdfd3 Call LOG_QUIT after Networking's dtor call 2016-09-30 18:16:09 +08:00
David Cernat
add1a5e5b2 Merge pull request #72 from OpenMW/master 
Add OpenMW commits up to 30 Sep
 2016-09-30 12:37:29 +03:00
David Cernat
e0361835b0 Allow script-induced setting of equipment 2016-09-30 12:36:20 +03:00
David Cernat
4b96080521 Make GetItemSlot work and add SendEquipment in server item functions 2016-09-30 12:30:05 +03:00
Marc Zinnschlag
e918474a94 Merge remote-tracking branch 'rcutmore/bug-3277' 2016-09-30 09:37:45 +02:00
David Cernat
728a09e423 Reorder functions in LocalPlayer and make their names more consistent 2016-09-30 08:59:58 +03:00
David Cernat
6650b74498 Add handling of skill increases 2016-09-30 07:15:59 +03:00
David Cernat
15a4602482 Add getSkillIncrease, setSkillIncrease functions to OpenMW's NpcStats 2016-09-30 07:15:03 +03:00
David Cernat
f4621d8529 Use setLevelProgress when setting LocalPlayer's skills 2016-09-30 06:27:26 +03:00
David Cernat
8fbc6f31f1 Add setLevelProgress function to OpenMW's NpcStats 2016-09-30 06:26:43 +03:00
David Cernat
977b277cdd Add missing entries for level progress functions 2016-09-30 05:08:11 +03:00
David Cernat
a0e9a672a5 Split updateClassStats in 3 and add handling of level progress 2016-09-30 04:52:21 +03:00
David Cernat
2ab619b0e3 Constantly update skill progress from LocalPlayer 2016-09-30 03:43:49 +03:00
Rob Cutmore
8f47ed17df Show nested tables only when they are editable 2016-09-29 20:42:44 -04:00
Martijn Bakker
45ffdbb284 fixed a segmentation fault when entering a cell which contains someone already attacking you 2016-09-30 00:40:13 +01:00
David Cernat
56a2c70911 Use double instead of int for skill progress functions 2016-09-29 18:13:36 +03:00
David Cernat
ae4950ce49 Add server stat functions for getting and setting skill progress 2016-09-29 17:57:26 +03:00
David Cernat
6ae4cc15e4 Clean up handling of stat packets on client, part 2 2016-09-29 17:48:33 +03:00
David Cernat
25026a9b95 Allow player-controlled NPCs to have attack animations again 2016-09-29 16:57:39 +03:00
David Cernat
5efa5aa912 Fix indentation 2016-09-29 13:17:46 +03:00
David Cernat
afbd3274cc Clean up handling of stat packets on client 2016-09-29 13:10:32 +03:00
David Cernat
bc0aa86bcf Make variable names more consistent and easier to understand 2016-09-29 12:05:44 +03:00
David Cernat
694ce537b6 Allow script-induced dynamic stat changes, part 2 2016-09-29 11:02:57 +03:00
David Cernat
18cd964d21 Allow script-induced dynamic stat changes 2016-09-29 10:19:39 +03:00
David Cernat
ae00f12c87 Merge pull request #68 from OpenMW/master 
Use a shader to render the simple water, ensuring that fog is applied…
 2016-09-29 03:12:57 +03:00
scrawl
85c7d014d3 Use a shader to render the simple water, ensuring that fog is applied per pixel (Fixes #2716) 2016-09-28 21:10:44 +02:00
David Cernat
7a1531c01b Fix script functions for setting dynamic stats, part 2 2016-09-28 19:41:54 +03:00
David Cernat
458bdf4dff Fix script functions for setting dynamic stats 2016-09-28 16:40:19 +03:00
David Cernat
433190d82e Rename OnPlayerUpdateEquiped into OnPlayerChangeEquipment 2016-09-28 15:20:23 +03:00
David Cernat
684caf7791 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-09-28 14:29:37 +03:00
David Cernat
16216b30f7 Fix formatting 2016-09-28 14:27:35 +03:00
Koncord
94f6ab30f2 Fix GetProtocolVersion 2016-09-28 19:20:22 +08:00
David Cernat
b6086ab015 Rename ID_GAME_DYNAMICSTATS_CURRENT into ID_GAME_DYNAMICSTATS 2016-09-28 14:13:24 +03:00
David Cernat
57f07813b0 Rename ID_GAME_UPDATE_POS into ID_GAME_POS 2016-09-28 11:45:14 +03:00
David Cernat
26487598a6 Rename ID_GAME_UPDATE_EQUIPED into ID_GAME_EQUIPMENT 2016-09-28 11:36:29 +03:00
David Cernat
0479eb38cc Update protocol version and make version mismatch error less confusing 2016-09-28 08:26:18 +03:00
David Cernat
9fd5ae981e Add missing backslash 2016-09-28 07:59:53 +03:00
David Cernat
ce4b326b02 Rename ID_GAME_UPDATE_BASESTATS into ID_GAME_DYNAMICSTATS_CURRENT 2016-09-28 07:50:16 +03:00
David Cernat
295f486a97 Using less confusing names for server stat functions, part 2 2016-09-28 02:19:39 +03:00
David Cernat
69030579c1 Using less confusing names for server stat functions 2016-09-27 17:04:04 +03:00
David Cernat
7ae9ea7465 Add server stat functions for getting attribute and skill counts 2016-09-27 15:51:10 +03:00
David Cernat
57703482b2 Fetch attribute and skill counts in server stat functions 2016-09-27 15:01:54 +03:00
David Cernat
4d7130b12f Improve logic for script-induced cell changes 2016-09-27 11:28:44 +03:00
David Cernat
01af4f3bbc Update position before sending cell packet 2016-09-26 17:00:09 +03:00
David Cernat
1ee2458f6e Add packet for player levels, part 2 2016-09-26 13:19:01 +03:00
David Cernat
046a1ea899 Add packet for player levels 2016-09-25 14:28:25 +03:00
Rob Cutmore
b59694c4f0 Set tooltip for read-only nested tables 2016-09-25 06:31:28 -04:00
David Cernat
7e4543ffcb Merge pull request #64 from OpenMW/master 
Add OpenMW commits up to 24 Sep
 2016-09-25 11:06:07 +03:00
Marc Zinnschlag
eaeaae3243 Merge remote-tracking branch 'aesylwinn/FixRefIdData' 2016-09-25 09:33:28 +02:00
scrawl
4791fadb9a Merge pull request #1078 from MiroslavR/hidden-items 
Do not show uncarriable lights in item views
 2016-09-24 23:27:23 +02:00
Aesylwinn
b899d43a33 Allow base plugins to overwrite referencables made in other base plugins. 2016-09-24 16:45:08 -04:00
scrawl
dc07885d25 Merge pull request #1069 from Allofich/combat 
Add unarmed attack selection to chooseBestAttack()
 2016-09-24 18:38:10 +02:00
MiroslavR
52e00f5fef Do not show uncarriable lights in item views 2016-09-24 18:01:31 +02:00
Rob Cutmore
829345257c Allow disabled nested tables to be scrollable 2016-09-24 10:36:00 -04:00
David Cernat
10d391a1fd Merge pull request #63 from OpenMW/master 
Add OpenMW commits up to 23 Sep
 2016-09-24 00:53:06 +03:00
Allofich
0582f2d918 Adjust touch spell/telekinesis interaction 2016-09-23 21:44:49 +09:00
Allofich
0c603e986d Don't play touch spell explosions on non-activatable statics 2016-09-23 03:25:24 +09:00
Allofich
eecf412b85 Recreate vanilla-like behavior for telekinesis and touch spells 2016-09-23 01:16:03 +09:00
Allofich
04c13ffab3 Add unarmed attack selection to chooseBestAttack() 2016-09-22 00:45:54 +09:00
scrawl
8379291f70 Merge pull request #1072 from Allofich/range 
Give "on touch" spells same range as vanilla MW
 2016-09-21 17:39:44 +02:00
Allofich
37cc4e9efe Don't play area vfx for 0-area touch spells that hit non-actors 2016-09-22 00:14:08 +09:00
Allofich
563ae479e8 Give "on touch" spells same range as vanilla MW 2016-09-21 23:34:32 +09:00
David Cernat
f515111845 Merge pull request #62 from OpenMW/master 
Add OpenMW commits up to 20 Sep
 2016-09-21 06:05:24 +03:00
scrawl
c6ef26ba4b Merge pull request #1070 from mrcheko/pathfinding 
fix using potion as weapon
 2016-09-20 22:58:54 +02:00
mrcheko
229cb4b386 remove dynamic_cast to ActionPotion 2016-09-20 23:00:00 +03:00
mrcheko
48765f2ff2 fix using potion as weapon 2016-09-19 23:43:26 +03:00
David Cernat
1534f835a6 Merge pull request #61 from OpenMW/master 
Add OpenMW commits up to 19 Sep
 2016-09-19 23:38:20 +03:00
scrawl
718178bfe9 Merge pull request #1066 from MiroslavR/setinvisible 
Don't use base invisibility magnitude for setting alpha
 2016-09-19 15:35:12 +02:00
Allofich
7e3cca6d37 Vfx after Divine/Almsivi intervention should be attached to player 2016-09-19 22:20:16 +09:00
Allofich
d1157b3e10 Use correct vfx for teleport spells 2016-09-19 18:12:30 +09:00
David Cernat
9690e007df Don't send unhandled skill and attribute requests to joining players 2016-09-19 11:06:04 +03:00
David Cernat
79c561057c Merge pull request #59 from OpenMW/master 
Add OpenMW commits up to 18 Sep
 2016-09-19 02:47:09 +03:00
MiroslavR
744667e163 Don't use base invisibility magnitude for setting alpha (Fixes #3555) 2016-09-19 00:05:50 +02:00
scrawl
cd4b182091 Merge pull request #1051 from Allofich/textures 
Use spell effect particle textures
 2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67 Cleanup 2016-09-19 05:20:04 +09:00
scrawl
30d5c7488d savegamedialog: don't reset the character selection scrollbar when a character is deleted 2016-09-18 19:26:41 +02:00
Koncord
24617589e4 Fix packet spam 2016-09-18 15:52:26 +08:00
Koncord
96e2d749c7 New auth protocol 2016-09-18 11:55:51 +08:00
Koncord
61c5456373 Log callbacks 2016-09-18 11:55:51 +08:00
Koncord
e661a35ac2 Fix checking strings in SetName & SetBirthsign 2016-09-18 11:55:51 +08:00
Koncord
1e48555617 Make sensitivity to protocol version 2016-09-18 11:55:51 +08:00
Koncord
fe10821528 Add loaded/isLoaded to server player 2016-09-18 11:55:51 +08:00
Koncord
df13e9c37a Fix verbose log level in server 2016-09-18 11:55:51 +08:00
David Cernat
68f974d999 Merge pull request #57 from OpenMW/master 
Add OpenMW commits up to 17 Sep
 2016-09-17 21:31:51 +03:00
scrawl
8520b97b37 Merge pull request #1062 from stil-t/master 
apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles
 2016-09-17 18:09:51 +02:00
scrawl
7bd445fb83 Don't crash if FontManager::getByName returns NULL (Fixes #3552) 2016-09-17 17:21:35 +02:00
David Cernat
cdada00a8a Merge pull request #56 from OpenMW/master 
Add OpenMW commits up to 15 Sep
 2016-09-15 22:19:02 +03:00
Mikhail Korolev
7e2fe77836 apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles 2016-09-15 19:03:07 +03:00
scrawl
7bbdeb5f85 Merge pull request #1061 from MiroslavR/nameless-actors 
Allow activating actors without a name
 2016-09-15 17:51:14 +02:00
MiroslavR
f323f231db Allow activating actors without a name (Fixes #3551) 2016-09-15 16:47:50 +02:00
Allofich
5aad1d81f4 Remove no longer used parameter 2016-09-15 23:41:20 +09:00
MiroslavR
55e670c5fe Fix animation state not saving 
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
 2016-09-15 16:11:54 +02:00
David Cernat
5b6caa7b2c Fix build by adding missing argument to onHit 2016-09-15 09:34:05 +03:00
David Cernat
3b7693c719 Resolve conflicts in pull request #55 
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2016-09-15 08:49:57 +03:00
Allofich
322a0ba8bb Initialize speed for magic projectiles 2016-09-14 21:39:44 +02:00
Allofich
7eb62b5d3a Initialize speed for magic projectiles 2016-09-15 01:44:53 +09:00
Allofich
dc8ff5e49b Play all sfx and use particle textures for permanent enchantments 2016-09-15 00:27:08 +09:00
Allofich
527bbd5243 Change size_t to int for consistency 2016-09-15 00:09:40 +09:00
Allofich
01774c656c Fix for blood effect texture overrides 2016-09-14 23:28:57 +09:00
Allofich
a033ba3bd2 Override spell textures by NiTexturingProperty 2016-09-14 23:03:04 +09:00
scrawl
1362264561 Fix warning 2016-09-13 02:49:19 +02:00
scrawl
65dc12cdd6 Remove unused parameter 2016-09-13 02:48:36 +02:00
scrawl
feaf3652a5 Merge pull request #1055 from mrcheko/pathfinding 
prevent running in circles around path points
 2016-09-13 02:47:49 +02:00
scrawl
3cd73d0fc3 Merge pull request #1058 from Allofich/onhit 
Don't play blood effects for completely resisted hits
 2016-09-13 02:47:43 +02:00
Allofich
34851349de Pass hitPosition by const reference 2016-09-13 00:59:56 +09:00
Allofich
bce0166931 Don't play blood effects for resisted hits 2016-09-12 22:46:32 +09:00
Allofich
3bbde312b9 Remove unneeded code 2016-09-12 19:54:06 +09:00
Allofich
3f6543860a Make creatures use fHandToHandReach 2016-09-11 00:01:20 +09:00
Allofich
c98d4e0473 Allow dodging for bipedal creatures 2016-09-10 23:56:31 +09:00
Allofich
7bc4535c0d Make NPCs dodge according to target's weapon reach 2016-09-10 23:30:46 +09:00
Koncord
0f7670dd07 Add some verbose messages for chat 2016-09-10 13:57:15 +08:00
Koncord
babc3230b7 Add new functions: GetServerVersion & GetProtocolVersion 2016-09-10 13:41:23 +08:00
Koncord
a34d46f57e Add chat messages to log in client 
Cleanup redundant code in GUIChat class
 2016-09-10 13:40:06 +08:00
mrcheko
72786fef9d prevent running in circles around path points 
addresses http://bugs.openmw.org/issues/2229
 2016-09-09 23:57:19 +03:00
Allofich
368828b217 Update TODO comments 2016-09-10 01:38:05 +09:00
Allofich
f31342894a Put simpler condition first 2016-09-09 00:03:38 +09:00
Allofich
bca477ca8a Apply particle textures like original engine does 2016-09-08 23:59:23 +09:00
Allofich
85349da26c Add comments 2016-09-08 23:58:00 +09:00
Allofich
502a758eff Use particle texture for "hit" effects 2016-09-08 23:58:00 +09:00
Allofich
fe3a033642 Use particle textures for spell projectiles 2016-09-08 23:56:54 +09:00
Allofich
02610828c1 Don't play area vfx for non-area spells on actors. 2016-09-08 02:07:01 +09:00
Allofich
88d992a020 Create area effect visual for non-area spells 2016-09-08 00:05:45 +09:00
Marc Zinnschlag
03a35c38df add missing item when executing the Equip instruction 2016-09-06 16:33:26 +02:00
Marc Zinnschlag
48c257b939 Merge remote-tracking branch 'aesylwinn/ContentNumberFix' 2016-09-06 15:48:05 +02:00
scrawl
05e4542d33 Merge pull request #1048 from mrcheko/pathfinding 
Pathfinding unification v2
 2016-09-06 13:19:18 +02:00
mrcheko
aa441f2648 AiPackage: fix path recalc on cell change 
AiTravel: remove unneeded code
 2016-09-06 01:11:10 +03:00
mrcheko
a22fc43947 aiwander: reset path on cell change 
remove redundant mIsWanderDestReady var
 2016-09-05 15:18:34 +03:00
Marc Zinnschlag
b8fa555260 Merge remote-tracking branch 'aesylwinn/RandomFixes' 2016-09-05 11:10:34 +02:00
scrawl
fbc9b90ebe Cleanup 2016-09-05 00:04:11 +02:00
scrawl
8677a6f803 Merge pull request #1044 from Allofich/magic 
Changes to multi-effect spells
 2016-09-05 00:03:10 +02:00
Allofich
c617e90755 Fix for loading projectile speed 2016-09-05 05:41:24 +09:00
Allofich
f8270f6bd5 Consolidations and cleanup for multi-effect spells 2016-09-05 05:30:51 +09:00
Allofich
dbd7c038b2 Add loading code for multi-effect projectiles 2016-09-05 03:45:13 +09:00
Allofich
c6cd1f813b Attach projectiles to nodes of multi-effect bolts 2016-09-05 02:59:33 +09:00
Allofich
5a0d3feb98 Use C++ int-to-string conversion 2016-09-05 02:52:44 +09:00
Allofich
a36f7babc1 Double scaling of spell explosions 2016-09-05 02:18:57 +09:00
Allofich
60384399ee Fix errors and warnings 2016-09-05 01:39:18 +09:00
Allofich
f49ebee56a Play sounds for multi-effect projectile 2016-09-04 23:57:06 +09:00
Allofich
37f07f7435 Combine into one multi-effect magic projectile 2016-09-04 22:35:29 +09:00
Koncord
64b5638d40 DIE TABS, DIE!!!!!!!1 2016-09-04 17:39:08 +08:00
Allofich
10842462c7 Send lists of models and sounds to launchMagicBolt 2016-09-04 17:42:27 +09:00
Allofich
96e1726e4d Fix warnings 2016-09-04 17:42:27 +09:00
Allofich
ecec7d8215 Fix spells having explosions for wrong range type 2016-09-04 17:42:27 +09:00
Allofich
c4d77b6a8b Casting animation comes from the first effect 2016-09-04 17:42:27 +09:00
Allofich
3300ef5db7 Don't apply projectile effects multiple times 2016-09-04 17:42:27 +09:00
Allofich
f36e5ef403 Use last effect of spell for hand effect color 2016-09-04 17:42:27 +09:00
Allofich
f6c3a62b3e Use average speed for multiple spell projectiles 2016-09-04 17:42:27 +09:00
Allofich
f1a18027f2 Shoot projectiles of spells with multiple effects 2016-09-04 17:42:27 +09:00
Allofich
446c0a4fa8 Play all of a spell's casting effects 2016-09-04 17:42:27 +09:00
Allofich
b4577fe751 Allow multiple spell hit sounds on single target 2016-09-04 17:42:27 +09:00
Koncord
ab6d6d1cc8 Fix log message in Networking::Connect() 2016-09-04 16:18:53 +08:00
Koncord
d110834ee7 Fix log message in Networking::Update() 2016-09-04 16:03:07 +08:00
scrawl
7859e378df Merge pull request #1045 from Allofich/attack 
Fix AI melee attack
 2016-09-04 00:22:59 +02:00
Aesylwinn
fab7549b42 Fix windows path issue in editor debug run. 
- The problem was caused by spaces in the data directory
 2016-09-03 17:49:49 -04:00
Aesylwinn
ee432690e6 Make it easier to place objects in the scene editor. 
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
 2016-09-03 17:37:13 -04:00
Allofich
5c2bc515fe Remove overridden code in aicombat 2016-09-04 02:13:09 +09:00
mrcheko
0775ed75ea fix zero div in getXAngleToDir 2016-09-03 17:50:06 +03:00
Allofich
0d63d75bb0 Remove no longer used parameter 2016-09-03 22:40:24 +09:00
Allofich
286e4bb98f Remove attacktype movement 2016-09-03 21:16:59 +09:00
David Cernat
81999a8179 Remove outdated ID_GAME_UPDATE_SKILLS packet, part 2 2016-09-02 07:58:20 +03:00
David Cernat
8abef0bebe Remove outdated ID_GAME_UPDATE_SKILLS packet 2016-09-02 07:36:39 +03:00
David Cernat
e36321f448 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-09-02 06:57:49 +03:00
David Cernat
dafc6c0843 Save and load birthsigns 2016-09-02 06:57:13 +03:00
David Cernat
9764dbb8d2 Merge pull request #52 from OpenMW/master 
Add OpenMW commits up to 2 Sep
 2016-09-02 06:29:34 +03:00
David Cernat
ff94b5f1ac Fix unsuitable variable name 2016-09-02 06:16:35 +03:00
David Cernat
941d76fce0 Fix setting of default classes and initialize classes safely on server 2016-09-02 04:31:35 +03:00
scrawl
bdf55927e1 Merge pull request #1041 from Allofich/waterwalking 
Don't allow casting Water Walking in deep water
 2016-09-02 02:57:22 +02:00
David Cernat
970e9aff2f Remove old class methods and don't include class in ID_GAME_BASE_INFO 2016-09-02 03:45:43 +03:00
Koncord
534ef527b9 Fix my stupid epic fail 2016-09-02 07:35:53 +08:00
Allofich
154dcc942c Let NPCs use attack type regardless of movement 2016-09-01 22:43:33 +09:00
Marc Zinnschlag
316cf40f12 Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation' 2016-09-01 11:51:34 +02:00
Allofich
b99c2c54d8 Allow Water Walking on non-submerged creatures 2016-09-01 03:53:53 +09:00
Aesylwinn
c0d53a2557 Fix CellRefs being teleported from interior to exterior cells. 2016-08-31 11:02:04 -04:00
Allofich
22b11c5947 Move Water Walking check into checkEffectTarget() 2016-08-31 23:56:31 +09:00
Allofich
f25c65260c Limit sMagicinvalidEffect to self-cast spells 2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b Use castByPlayer bool 2016-08-31 17:18:23 +09:00
David Cernat
e9dce26f38 Resolve conflicts in pull request #50 
# Conflicts:
#	CMakeLists.txt
 2016-08-31 07:28:32 +03:00
Aesylwinn
b2ddd3c259 Initialize with correct content file number instead of correcting at save stage. 2016-08-30 16:42:38 -04:00
Allofich
a6216d883f Don't allow casting Water Walking in deep water 2016-08-31 04:37:50 +09:00
David Cernat
263efa9988 Fix formatting, part 2 2016-08-30 12:37:36 +03:00
David Cernat
a20e7890a2 Fix formatting 2016-08-30 10:52:30 +03:00
David Cernat
f562215d9a Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-08-30 08:55:13 +03:00
David Cernat
1f8595bf3b Save server information in a folder named data instead of files 2016-08-30 08:54:26 +03:00
Koncord
cf1a0113a1 Time API 2016-08-30 13:24:42 +08:00
David Cernat
5e6a374687 Add comment about MesssageBox to prevent future confusion 2016-08-30 08:13:08 +03:00
David Cernat
857defadbc Revert one unnecessary renaming of MessageBox 2016-08-30 08:05:00 +03:00
David Cernat
32ce7e97a8 Fix build for Windows server 2016-08-30 08:01:34 +03:00
Koncord
1186d09ec0 ScriptFunctions.hpp size reduction 2016-08-30 12:20:39 +08:00
Koncord
11eae277a9 Characters Class API 
Added some new functions
 2016-08-30 11:18:19 +08:00
Aesylwinn
3ae2fc17c6 Fix some issues with content file numbers in the editor. 
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
 2016-08-29 18:06:56 -04:00
David Cernat
d612cbcc7b Revert "Disable CharGen custom class choice until we can handle custom classes" 
This reverts commit e81bf7318c.
 2016-08-29 21:04:32 +08:00
Koncord
a03c2f5019 Now server & client sensitive to version 2016-08-27 15:36:22 +08:00
Koncord
8a5e32c631 Show the InputBox only if queue is free 2016-08-27 13:58:06 +08:00
Koncord
4c2415e9db Fix focus for InputDialog 
Created a special pipe for future GUI modes.
 2016-08-27 13:40:11 +08:00
David Cernat
e81bf7318c Disable CharGen custom class choice until we can handle custom classes 2016-08-27 04:47:35 +03:00
David Cernat
00e7810428 Add script functions for saving and loading non-custom player classes 2016-08-27 00:14:50 +03:00
Allofich
9e1bfde46f Add comment 2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7 Disable current idle when an action is taken 2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d Update idle if current idle finishes playing 2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399 Sometimes play 1st-person weapon idle to Stop key 2016-08-25 21:34:45 +09:00
David Cernat
7bb6020e51 Display message boxes when client is disconnected. 2016-08-25 02:58:03 +03:00
David Cernat
4d2ca20445 Resolve conflicts in pull request #43 
# Conflicts:
#	README.md
 2016-08-24 22:03:35 +03:00
Koncord
1b403719f5 Merged branch master into master 2016-08-24 16:15:56 +08:00
Koncord
997c62cc52 Add --connect option to client 2016-08-24 16:15:34 +08:00
David Cernat
486de67d84 Make handshake log message less confusing 2016-08-24 06:38:38 +03:00
David Cernat
abaa8cac72 Spawn players in Pelagiad on startup 2016-08-24 06:23:32 +03:00
David Cernat
77aff346e9 Fix typo in method name "getGUIConroller", part 2 2016-08-24 05:55:02 +03:00
David Cernat
63eebd3d18 Respawn players in Fort Pelagiad instead of ToddTest for the time being 2016-08-24 05:32:40 +03:00
David Cernat
d830937f4e Fix typo in method name "getGUIConroller" 2016-08-24 04:48:35 +03:00
David Cernat
f93e382b8b Use tes3mp icon for executable, part 2 2016-08-24 04:01:05 +03:00
David Cernat
5385563972 Let players inform others about Lua script-induced cell & pos changes 2016-08-24 02:53:39 +03:00
David Cernat
d24b4d0a2d Disable New, Save and Load buttons in main menu 2016-08-24 00:46:32 +03:00
David Cernat
7b187d0295 Fix visual glitch when jumping without adjusting camera afterwards 2016-08-23 22:27:12 +03:00
Allofich
7db31ab58a Correct telekinesis glow length 2016-08-24 01:21:15 +09:00
scrawl
346f5a19a3 Merge pull request #1029 from Allofich/anim 
Improvements for playgroup and loopgroup
 2016-08-23 14:14:36 +02:00
Allofich
9b0e5d6b59 Loop mid-animation idles when loading a save game 2016-08-23 19:50:56 +09:00
Koncord
fc4d8b82fb Stubs for minimap 2016-08-23 11:11:25 +08:00
David Cernat
7691bcc958 Add server script callbacks for attribute and skill changes 2016-08-23 03:04:22 +03:00
David Cernat
03d6e0cb62 Send attributes and skills to server whenever they change 2016-08-23 02:24:10 +03:00
David Cernat
ce5553cda6 Get hand-to-hand attack victim's stats if there actually is a victim 2016-08-23 01:23:09 +03:00
scrawl
0fd810707e Remove unused stopLooping() 2016-08-22 23:33:26 +02:00
scrawl
b0dc625b18 Run setLoopingEnabled after the anim queue is updated 2016-08-22 23:33:24 +02:00
scrawl
719e884b7c Remove duplicate code 2016-08-22 23:25:00 +02:00
scrawl
0c9882956a Add AnimState::shouldLoop() 2016-08-22 23:25:00 +02:00
scrawl
6450c9be27 Simplify condition 2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b Emulate vanilla animation loops more closely 2016-08-23 01:42:36 +09:00
mrcheko
612c7f1a2f Revert "Revert "Merge pull request #993 from mrcheko/pathfinding"" 
This reverts commit 3732979eec.
 2016-08-19 22:15:26 +03:00
David Cernat
c4f49e05e3 Remove manual newlines for logger 2016-08-19 07:54:10 +03:00
Koncord
78210ab8ce rename openmw-mp to tes3mp-server 2016-08-19 09:38:33 +08:00
Koncord
b67789aa6a Rename openmw to tes3mp 2016-08-19 09:38:06 +08:00
Koncord
90215f4e7c Fix log messages for GCC compatibility 2016-08-19 09:37:24 +08:00
Koncord
d3c9864fb0 Fix maximum connections 2016-08-19 08:18:25 +08:00
David Cernat
e1955b440f Fix player initialization on server 2016-08-19 03:11:03 +03:00
David Cernat
cba01af683 Log player initialization on server 2016-08-19 01:32:39 +03:00
David Cernat
2337a0becb Add LOG_APPEND method for writing to log without timestamp and level 2016-08-18 23:17:46 +03:00
David Cernat
f4744f8547 Add additional log info 2016-08-18 22:29:54 +03:00
David Cernat
97f944dde7 Use logger for most console messages 2016-08-18 20:20:17 +03:00
Aesylwinn
91fd966146 Fix some issues detected by coverity for the editor. 2016-08-18 12:42:35 -04:00
Allofich
b332a13b4e Don't restart looped animations on repeated calls 2016-08-18 23:23:38 +09:00
David Cernat
a36c20eaae Reduce server console spam 2016-08-18 16:13:04 +03:00
David Cernat
436548413e Resolve conflicts in pull request #39 
# Conflicts:
#	CMakeLists.txt
 2016-08-18 15:10:52 +03:00
Marc Zinnschlag
2fef8948f1 Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale' 2016-08-18 09:13:43 +02:00
David Cernat
a2dbeb6c95 Share skills and attributes correctly upon logging in, and fix grammar 2016-08-18 05:21:25 +03:00
Koncord
35991fcd15 Add logger to client 2016-08-18 07:58:37 +08:00
Koncord
7f8c0ecbbd Logging in file for server 2016-08-18 07:58:09 +08:00
David Cernat
c94f818478 Add script functions for getting attributes and skills by their names 2016-08-18 00:55:35 +03:00
David Cernat
41868cc9cc Add script functions for getting attributes and skills by their IDs 2016-08-18 00:13:45 +03:00
David Cernat
e5cb58e7c4 Add debug info about ID_GAME_BASE_INFO packets 2016-08-17 21:18:04 +03:00
David Cernat
8eda381016 Make formatting consistent, part 2 2016-08-17 18:20:36 +03:00
David Cernat
1363c4c5b6 Make formatting consistent 2016-08-17 18:04:35 +03:00
David Cernat
1bbd7c271f Add fail-safes to DedicatedPlayer cell updating to narrow down problems 2016-08-17 07:27:40 +03:00
David Cernat
e39b66af4f Move logger to components 2016-08-17 06:15:44 +03:00
David Cernat
38c8d2344b Uncomment sending of stats packets to and from new players 2016-08-17 04:52:15 +03:00
David Cernat
aa69c156c7 Fix race-related graphical glitches when players spawn 2016-08-17 01:06:50 +03:00
Koncord
a840d84b39 Merged branch master into master 2016-08-17 05:53:09 +08:00
Koncord
ee8d9895dc Porting Log.cpp to C++98 2016-08-17 05:52:40 +08:00
scrawl
dda5bfbc9f CharacterPreview no longer depends on osgViewer 2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3 LocalMap no longer depends on osgViewer 2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb Remove unneeded setGraphicsContext() calls 2016-08-16 19:33:09 +02:00
scrawl
0209c70583 Improve performance by skipping update if transform is unchanged 2016-08-16 17:50:59 +02:00
scrawl
4751e0e953 Improve performance of animateCollisionShapes by caching the node path 2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84 Revert "animateCollisionShape checks if the shape is really animated" 
This reverts commit cbf344663f.

Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00
 2016-08-16 17:50:59 +02:00
scrawl
3ef9b3f44d Merge pull request #1025 from Allofich/anim 
Use loopfallback for idle animation groups
 2016-08-16 16:30:55 +02:00
Aesylwinn
7125775648 Change free axis rotation. 2016-08-15 15:07:43 -04:00
Allofich
c05782581e Account for all instances of play() 2016-08-16 02:52:55 +09:00
David Cernat
3c6710a7b5 Merge pull request #35 from OpenMW/master 
Add OpenMW commits from 2nd week of August
 2016-08-15 19:21:09 +03:00
Allofich
6163c7bb03 Use loopfallback for idle animation groups 2016-08-16 01:15:26 +09:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
scrawl
641005b317 Remove Camera's children before removing the Camera 
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
 2016-08-15 18:12:46 +02:00
Koncord
a92ef8b6bd Some fixes 2016-08-15 22:49:34 +08:00
scrawl
a44ba0e461 Merge pull request #966 from kpp/find_mygui 
Find mygui
 2016-08-15 16:36:48 +02:00
Koncord
e9ee9c8b3b Remove C++11 in Log.h 2016-08-15 21:45:49 +08:00
Koncord
b3320c7bb9 Add forgoten ctime header 2016-08-15 21:35:29 +08:00
Koncord
8d88381dac added prefix LOG_ to loglevel 2016-08-15 21:33:18 +08:00
Koncord
170455e08a Fix headers 2016-08-15 21:15:36 +08:00
Roman Proskuryakov
4cffdb67d8 Uses case-sensitive MyGUI_* variables 2016-08-15 15:59:02 +03:00
Koncord
c695923825 Added master server stuff 2016-08-15 07:48:55 +08:00
Koncord
02a447c589 Added logger 2016-08-15 07:45:42 +08:00
Aesylwinn
3e4ac0c662 Potential fix for context sensitive select mode issues. 2016-08-14 14:43:29 -04:00
scrawl
71f786ff84 Delete the WorkQueue first 
Fixes a potential crash on exit.
 2016-08-14 18:10:29 +02:00
scrawl
3732979eec Revert "Merge pull request #993 from mrcheko/pathfinding" 
This reverts commit 5190275b37, reversing
changes made to d7845012bf.
 2016-08-14 18:04:33 +02:00
scrawl
c3340ec143 Merge pull request #1022 from Allofich/anim 
Make loopgroup loop correct number of times
 2016-08-14 17:02:38 +02:00
scrawl
1edcea2ff5 Merge pull request #1023 from psi29a/small_fixes 
small fixes
 2016-08-14 16:49:26 +02:00
scrawl
30b549124e Fix use-after-free 2016-08-14 16:42:29 +02:00
scrawl
c65492193c Use osg::clone 2016-08-14 16:41:44 +02:00
scrawl
0fbc0d0da7 Attempt to silence warning 2016-08-14 16:41:17 +02:00
Bret Curtis
0547d4b937 clang says that these must be in the MWWorld namespace 2016-08-14 16:17:09 +02:00
scrawl
8c44334409 Merge pull request #1021 from Allofich/weight 
Corrections to tooltip displays of zero-weight items
 2016-08-14 15:14:58 +02:00
scrawl
2f6075329b Clang warning fixes 2016-08-14 15:10:50 +02:00
Allofich
a381a15b19 Make loopgroup loop correct number of times 2016-08-14 21:57:06 +09:00
Allofich
7bf04b5014 Allow showing value of zero-weight lights 2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff Use getWeightString() to avoid casting to int 2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e Allow weight tooltips for gold and keys if not 0 2016-08-14 19:32:43 +09:00
Allofich
caf025f93d Don't show 0 weight tooltips except for potions 2016-08-14 19:27:59 +09:00
Allofich
cf7278f8ae Don't show weight tooltip for 0-weight equipment 2016-08-14 18:37:41 +09:00
Allofich
ee2702087c Make zero-weight boots play light boot footsteps 2016-08-14 17:27:47 +09:00
scrawl
f3f02fe154 Merge pull request #1019 from Allofich/bound 
Don't allow re-casting of bound equipment spells
 2016-08-13 21:02:32 +02:00
Allofich
d617651307 Don't allow re-casting of bound equipment spells 2016-08-14 02:05:23 +09:00
Aesylwinn
101c3cc90d Rotate around center of selection. 2016-08-12 17:12:10 -04:00
Aesylwinn
571969cd65 Scale from center of selection. 2016-08-12 17:11:37 -04:00
MiroslavR
ddbfe0c944 Fix disabled door markers appearing on the map (Fixes #3348) 2016-08-12 03:14:36 +02:00
Aesylwinn
388917df89 Base editor rotate/scale commit. 2016-08-10 19:31:34 -04:00
Allofich
cb9bb92b26 Play locked sounds on locked objects instead of actors 2016-08-10 21:31:14 +09:00
Allofich
83b715734f Move part of addGlow() to addSpellCastGlow() 2016-08-10 02:52:43 +09:00
Allofich
1c76c93ed8 Use raw pointer to node in glowupdater 2016-08-10 01:35:22 +09:00
Allofich
67f31d948e Add removeTexture method 2016-08-10 01:11:14 +09:00
Allofich
4b9aff7a03 Glowupdater fix when using shaders 2016-08-10 00:43:14 +09:00
Allofich
9b2cb2fb8c Cleanups 2016-08-10 00:25:33 +09:00
Allofich
775162ccdf Rewrite spell glow implementation 2016-08-09 22:56:53 +09:00
Allofich
cad41599cf Fix travis build error and warnings 2016-08-09 22:56:53 +09:00
Allofich
1910128e9c Don't remove uniform when spell glow ends 2016-08-09 22:56:53 +09:00
Allofich
35c14bb9bb Minor rewrite, make "open" spells play glow effect 2016-08-09 22:56:53 +09:00
Allofich
e132b52a69 Handle spell glows within updatecallback 2016-08-09 22:56:53 +09:00
Allofich
123c626f2d Add glow when using telekinesis on doors 2016-08-09 22:56:53 +09:00
Allofich
57138b416e Fix spell glows to only run one at a time 2016-08-09 22:56:53 +09:00
Allofich
3841a8fb40 Make non-actors glow when they cast spells 2016-08-09 22:56:53 +09:00
Allofich
dca7b4beb7 Make non-actors also play spell casting sounds 2016-08-09 22:56:53 +09:00
Koncord
2bdacc950b Fix messagebox in connection failed 2016-08-09 18:25:52 +08:00
Koncord
edd214dd00 Removed redundant requestQuit 2016-08-09 18:19:03 +08:00
Marc Zinnschlag
a563a9d336 added missing Q_OBJECT 2016-08-09 10:21:37 +02:00
Marc Zinnschlag
96fd9263bf Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable' 2016-08-09 10:17:26 +02:00
Aesylwinn
448c9d5a5b Fix globals not being initialized with a valid type. 2016-08-09 00:17:41 -04:00
scrawl
0bbd715f65 Fix the cloned StateSet not being assigned 2016-08-09 01:13:19 +02:00
scrawl
5190275b37 Merge pull request #993 from mrcheko/pathfinding 
Pathfinding unification
 2016-08-09 00:41:03 +02:00
Aesylwinn
0963adb2f4 Fix pointer being deleted twice. 2016-08-08 14:36:50 -04:00
David Cernat
babba95413 Merge pull request #34 from OpenMW/master 
Add OpenMW commits from 1st week of August
 2016-08-08 15:53:56 +03:00
scrawl
46538b9438 Merge pull request #1011 from devnexen/master 
Mainly making compilable under OpenBSD.
 2016-08-07 20:34:03 +02:00
mrcheko
e2cd87fcc7 fix veritcal aiming 2016-08-07 19:23:08 +03:00
Marc Zinnschlag
aa1ed9b172 Merge remote-tracking branch 'aesylwinn/RenderWater' 2016-08-07 17:03:58 +02:00
scrawl
7b557af885 Merge pull request #1007 from MiroslavR/save-anim-state 
Save scripted animation state
 2016-08-06 20:39:32 +02:00
David Carlier
83bab29e4b Mainly making compilable under OpenBSD. 
Renaming one resource file as the space led to issue for qt/moc.
 2016-08-06 19:00:27 +01:00
Aesylwinn
16d0580ce8 Fix struct/class mismatch. 2016-08-05 15:39:08 -04:00
Koncord
1022b6b27c Fix a header size 2016-08-06 03:28:01 +08:00
Aesylwinn
1f32f1eef5 Add water texture. 2016-08-05 14:55:40 -04:00
Aesylwinn
9454f4f2e7 Use shared water geometry + state generation, 
Fix water position and render bin,
Fix passed cell parameter being ignored
 2016-08-05 13:49:44 -04:00
Aesylwinn
5753f52b47 Move water mesh + simple state generation to components library. 2016-08-05 13:25:05 -04:00
Koncord
114a11ea78 Getting rid of packages spam 
I think this is temporary solution. I have an idea how to cache the result of functions and send data after callback.
 2016-08-05 14:28:45 +08:00
Koncord
7898b1181d Reduced package size 2016-08-05 14:21:09 +08:00
Koncord
a815d013fe Reducing CPU usage for server 2016-08-05 14:16:02 +08:00
Aesylwinn
3904a24e6c Add missing include. 2016-08-05 00:30:28 -04:00
Aesylwinn
5674e0da24 Render water in editor. 2016-08-04 23:01:43 -04:00
Koncord
e4e17ca4b9 Close #30 2016-08-05 00:31:15 +08:00
David Cernat
8686b9cc12 Merge pull request #29 from OpenMW/master 
Add OpenMW commits from end of July
 2016-08-04 00:56:36 +03:00
David Cernat
8dd8e22a0b Replace tabs with spaces in LocalPlayer changes 2016-08-04 00:55:28 +03:00
David Cernat
3362902396 Update position after changing cell (for real) 2016-08-04 00:03:05 +03:00
David Cernat
b0bd10f219 Allow script-based teleportation from interior to exterior cell 0,0 2016-08-03 22:07:49 +03:00
LohikaarmeHAV
19c74a4d6e Part two 2016-08-03 20:39:46 +03:00
LohikaarmeHAV
7309be8592 First part 2016-08-03 20:20:55 +03:00
lohikaarme
e8ef5c233f Miss info 2016-08-03 14:24:21 +03:00
lohikaarme
0592d1cdcf Commnent? 2016-08-03 14:22:25 +03:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
lohikaarme
48bcde8cc9 ... 2016-08-02 15:41:52 +03:00
LohikaarmeHav
b0cf276cfc hups 2016-08-02 15:27:40 +03:00
LohikaarmeHav
7cd991107c Nah 
Preview seem to not like removing mCamPositionSet and I have do other things.
 2016-08-02 15:26:12 +03:00
LohikaarmeHav
c6bc30d6a8 Forgot to remove line and add comment. 2016-08-02 14:27:19 +03:00
LohikaarmeHav
2e6f80688c Removed debug 2016-08-02 14:10:08 +03:00
Koncord
b4c7914a25 Added <memory> header for Windows 2016-08-02 19:00:43 +08:00
LohikaarmeHav
c6ec473280 Camera reset now every time cell object->view is pressed. 2016-08-02 13:46:43 +03:00
Koncord
74c103ddc1 Fixed types in all GetInterface functions 
Move lib_t type to Scripts/Types.hpp
 2016-08-02 18:10:06 +08:00
Koncord
e513c3676d Added forgotten header to project 2016-08-02 17:53:56 +08:00
Koncord
9375b540d6 removed '#undef _SEP_' 2016-08-02 17:35:18 +08:00
Koncord
bdfaea2d46 Implement 'setenv' for windows 
Paths converter
Move 'split' from main to Utils
 2016-08-02 17:32:10 +08:00
scrawl
3374630e7b Merge pull request #1008 from Internecine/bug3451-invalid-enchantments 
Fixes Bug 3451 - Invalid Enchantment IDs
 2016-08-02 10:14:59 +02:00
David Cernat
72026955f5 Add missing preprocessor directive for Windows build of server 2016-08-02 07:08:31 +03:00
Internecine
90735d226d Replaced Store::find usage with Store::search to remove exception handlers. 2016-08-02 11:43:41 +12:00
David Cernat
09d564424f Translate Russian code comment into English 2016-08-01 19:26:42 +03:00
Marc Zinnschlag
f32d0121fc Merge remote-tracking branch 'aesylwinn/KeyConfigAndShortcuts' 2016-08-01 09:57:11 +02:00
Internecine
14165352f6 Added exception handlers when trying to retreive enchantment and magic effect data. 2016-08-01 13:16:42 +12:00
Aesylwinn
f73d60cc73 Make scene controls use configurable speed modifier. 2016-07-31 16:28:03 -04:00
Aesylwinn
bf2ab4ed45 Change the way modifiers are handled so they can be shared. 2016-07-31 16:07:17 -04:00
Aesylwinn
faea33b888 Revert "Change scene controls to more closely match blender as requested" 
This reverts commit bc7ae70f0b.
 2016-07-31 05:54:13 -04:00
Aesylwinn
bc7ae70f0b Change scene controls to more closely match blender as requested 
in the forums.
 2016-07-30 09:53:45 -04:00
Koncord
31e2ab54d6 Revert "Update position after changing cell" 
This reverts commit 5e072b9d3c.
 2016-07-30 04:57:43 +08:00
Aesylwinn
1cce085fa2 Remove unused headers. 2016-07-29 16:35:43 -04:00
Koncord
5e072b9d3c Update position after changing cell 2016-07-30 04:12:47 +08:00
Aesylwinn
2f97d6cffb Move tool tip processing to ShortcutManager, 
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
 2016-07-29 16:02:46 -04:00
Aesylwinn
d7a83d80a2 Change some key binding defaults. 2016-07-29 15:00:58 -04:00
Aesylwinn
3475b83e90 Clean up modifier/shortcut class and handle focus out event, 
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
 2016-07-29 15:00:35 -04:00
Koncord
7107136808 New API 
SetExterior(pid, x, y)
GetExteriorX(pid)
GetExteriorY(pid)

also "SetCell" will now move to the named external cells (e.g. SetCell(pid, "Balmora"))
 2016-07-30 01:33:28 +08:00
Koncord
0549a7a01d Fixed type cast 2016-07-28 20:09:12 +08:00
Aesylwinn
96a3c278fd Added shortcuts for loading a cell relative to the camera, 
Removed Ctl+V binding for "Verify" because that is associated
with paste.
 2016-07-27 21:40:53 -04:00
Aesylwinn
65201badf6 Add custom page for key bindings. 2016-07-27 19:15:24 -04:00
mrcheko
293a0f768c use real distance to target to determinate 'ready to attack' state 2016-07-27 23:43:32 +03:00
LohikaarmeHav
f142f9bf86 wtf 2016-07-27 21:37:52 +03:00
Aesylwinn
b685c0ce6c Add ability to clear shortcut/modifier setting with right click. 2016-07-27 14:07:53 -04:00
Aesylwinn
12db6d2114 Add modifier setting. 2016-07-27 13:53:33 -04:00
Marc Zinnschlag
63fd1e8df7 Merge remote-tracking branch 'origin/master' 2016-07-27 15:49:11 +02:00
Koncord
23a37fc7fc Ignore LuaBridge warnings 
Remove TINYXML_LIBRARIES
 2016-07-27 17:53:26 +08:00
Koncord
d3414148fc Simplify LangLua::Call 2016-07-27 17:51:23 +08:00
Aesylwinn
b204758be1 More shortcuts. 2016-07-27 01:53:21 -04:00
Aesylwinn
3f7f75cc9d Exclude keys not compatible with qt 4 2016-07-27 00:44:34 -04:00
Aesylwinn
3edc77a32b Remove QShortcut usage, 
Add a lot of shortcuts,
Remove debug messages
 2016-07-27 00:24:16 -04:00
Koncord
5a6c1750d9 Fixed some build warnings and IsTimerElapsed function 2016-07-27 10:35:27 +08:00
Aesylwinn
08af82e1bd Switched to an interactive method for key input, 
Redid text representation for shortcuts
 2016-07-26 21:22:31 -04:00
AnyOldName3
20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 2016-07-27 00:58:31 +01:00
Stanislav Zhukov
075b600b3a Fix for Windows 2016-07-27 06:55:21 +08:00
Aesylwinn
05888e7925 Updated more tool tips to show shortcut configs. 2016-07-25 22:43:37 -04:00
Aesylwinn
8c5fddf150 Fix pathgrid selection mode not being removed from toolbar. 2016-07-25 20:49:28 -04:00
Aesylwinn
051aec2729 Added methods to keep text mentioning shortcuts up to date, 
fixed potential issue with widget relationship tracking,
hopefully got rid of signed/unsigned errors (Qt4/5 issue)
 2016-07-25 20:49:09 -04:00
Stanislav Zhukov
4316d4d1bf Merge pull request #21 from TES3MP/tes3mp-gui 
Tes3mp gui
 2016-07-25 16:16:32 -05:00
Aesylwinn
f251c3867d Redesigned shortcut handler to be capable of dealing with child and 
parent widgets. This should be the final design change. Also, some
various bug fixes.
 2016-07-23 21:23:02 -04:00
Koncord
86dccbed4b Fix CMake 2016-07-24 02:30:07 +08:00
David Cernat
f4342f0bde Stop requiring amx folder for non-Pawn builds. Use correct Windows identifiers for preprocessor directives in server code. 2016-07-23 20:06:14 +03:00
Koncord
1e3eff91ac Merged branch tes3mp-gui into tes3mp-gui 2016-07-23 22:08:01 +08:00
Koncord
9ab77cb123 New API functions: MessageBox, CustomMessageBox, InputDialog 
New Callback: OnGUIAction
 2016-07-23 22:02:06 +08:00
Stanislav Zhukov
fe50394f4d Fix movement desync 
I think this should fix all movements desyncs
 2016-07-22 23:40:34 +08:00
Aesylwinn
acdb636935 Qt4 protected signal workaround and signed/unsigned mismatch. 2016-07-22 02:41:00 -04:00
Aesylwinn
455d227f3c Changed shortcut design to allow a configurable second output. Also 
re-added shift for temporarily changing camera speed.
 2016-07-22 01:58:17 -04:00
MiroslavR
4a3529488b Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220 Fix moved references disappearing when modified by a plugin 2016-07-22 02:12:03 +02:00
MiroslavR
d790747389 Implement deletion of moved references (Bug #3471) 2016-07-22 01:59:02 +02:00
davidcernat
ab309180c2 Add useful debug info for cell changes 2016-07-21 23:07:37 +03:00
Aesylwinn
1b5273f2b7 Finally re-added rendering stats, refactored some functions 
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
 2016-07-20 15:00:00 -04:00
AnyOldName3
59639e3988 Make it build again (but remove the new functionality). 2016-07-20 15:16:53 +01:00
Aesylwinn
faa84e0a35 - Further extended usage of new shortcut class 
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
 2016-07-20 08:25:11 -04:00
Aesylwinn
d8fa3fd1de Added orbit "center on selection" shortcut. 2016-07-20 08:25:11 -04:00
Aesylwinn
e8626e588a Changes in shortcut design. 
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
 2016-07-20 08:25:11 -04:00
Aesylwinn
3fa4fdb839 Remove use of c++11 feature and add some missing headers. 2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0 Base key config/shortcut implementation 2016-07-20 08:25:11 -04:00
AnyOldName3
95d2c7ea5c Attempt to unescape characters when constructing file paths, introducing compilation errors. 2016-07-20 02:48:57 +01:00
davidcernat
3c8543bfaf Make player references cross exterior cells only when called by server 
Previously, clientside representations of players were able to move to a new exterior cell once during their movement tick and then again when sending a cell change packet to the server. Besides causing crashes in CellRef because of a messy cell-changing record, this also led to major desyncs.

Clientside representations of players can now only change their cells when a server-sent cell change packet specifically allows it.
 2016-07-20 03:26:25 +03:00
David Cernat
360eec30a0 Merge pull request #2 from OpenMW/master 
Add recent OpenMW commits by AnyOldName3
 2016-07-20 02:58:57 +03:00
Marc Zinnschlag
c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 2016-07-19 16:19:28 +02:00
Aesylwinn
3483b54df5 Build fix. 2016-07-18 00:05:27 -04:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04:00
davidcernat
7bf08e5e5a Fix transition between exterior cells for non-local players 
Make the local player send a packet whenever moving from one exterior cell to another, don't require objects to have RefNums to be moved correctly between exterior cells, and increase the packet priority for cell changes.
 2016-07-17 22:03:20 +03:00
MiroslavR
19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 2016-07-17 19:52:12 +02:00
Koncord
6f07d590d4 Fix SetPos and SetAngle functions 
Fix types for SetPos and SetAngle
 2016-07-17 17:59:46 +08:00
mrcheko
203804ff15 fix AiPackage repeating 2016-07-16 19:08:49 +03:00
mrcheko
59a1a6d117 checkWayIsClear: remove PATHFIND_CAUTION_DIST check 2016-07-16 19:07:48 +03:00
Stanislav Zhukov
645a21af21 Added new script functions for lua compatibility 
GetPosX, GetPosY, GetPosZ
GetAngleX, GetAngleY, GetAngleZ
 2016-07-16 16:19:35 +08:00
Stanislav Zhukov
ce92f30022 Fix maximum incoming connections 2016-07-13 04:24:42 +08:00
Stanislav Zhukov
b09e4a0218 Fix chat 'y' 
Now you can close chat only if pressed 'Enter'.
 2016-07-13 03:21:30 +08:00
AnyOldName3
f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 2016-07-12 17:09:57 +01:00
Koncord
299c4c904e Resurrect function 2016-07-12 23:26:53 +08:00
GrimKriegor
ace719507c Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1 
https://github.com/TES3MP/TES3MP/issues/1
 2016-07-12 01:42:05 +01:00
AnyOldName3
e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 2016-07-12 01:06:57 +01:00
mrcheko
b4e94e2aae Merge remote-tracking branch 'upstream/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
 2016-07-12 00:45:01 +03:00
AnyOldName3
1a0642f1db Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing 2016-07-11 22:33:15 +01:00
mrcheko
8d4f0660ce fix hardcoded melee attack ranges 2016-07-12 00:17:43 +03:00
AnyOldName3
195dd27780 Resolve obvious runtime error revealing more subtle one 2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c Trim unneeded code 2016-07-12 04:17:08 +09:00
AnyOldName3
2a9b12bb3f Fix an issue preventing compilation, revealing another that doesn't make much sense. 2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776 Remove a compilation error and set up framework to remove the others 2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 2016-07-11 01:16:32 +01:00
scrawl
2329812988 Merge pull request #995 from Allofich/traps 
Trap and lock fixes
 2016-07-10 17:19:36 +02:00
scrawl
67d3571fac Fix activation distance in third person mode 2016-07-10 17:10:19 +02:00
mrcheko
05794505c8 travis build fix 2016-07-10 17:25:50 +03:00
Allofich
599e6708ec Allow using keys to open trapped objects of lock level 0 2016-07-10 23:08:11 +09:00
Allofich
cabe038a97 Make lockpick and probe sounds 3d positional 2016-07-10 22:08:42 +09:00
Allofich
249918612d Play trap disarm sound when key used on trapped object 2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf Play trap activation sound on trapped object, not actor 2016-07-10 21:39:53 +09:00
mrcheko
f57858b750 Merge remote-tracking branch 'upstream/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
 2016-07-10 14:36:48 +03:00
MiroslavR
b0fcad4cb8 Don't stack effects for scrolls of the same type (Fixes #3466) 2016-07-10 03:49:09 +02:00
MiroslavR
75a66ced20 Fix actors lacking turning animations while in first person mode 2016-07-10 01:48:54 +02:00
mrcheko
d2fe6fe857 Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding 
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/aicombat.hpp
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
#	apps/openmw/mwmechanics/aiwander.cpp
#	apps/openmw/mwmechanics/aiwander.hpp
 2016-07-09 22:59:54 +03:00
MiroslavR
dc0bc5b68c Implement Face instruction (Feature #1424) 2016-07-09 02:16:47 +02:00
scrawl
6f376bd499 Merge pull request #983 from Allofich/telekinesis 
Don't allow telekinesis on actors or teleport doors
 2016-07-08 23:47:43 +02:00
Allofich
7a0f9a7989 Clean up, remove unnecessary code changes 2016-07-09 02:24:08 +09:00
Allofich
53ceefa46a Allow some telekinesis on teleport doors 2016-07-09 01:08:00 +09:00
Allofich
4e54338ce0 Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
scrawl
e362e3e6a5 Fix cppcheck warnings 2016-07-07 23:50:48 +08:00
Poncho
5b3ac5ff27 Use correct direction multipliers during awareness check 2016-07-07 23:50:48 +08:00
scrawl
0720a19fc0 Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
scrawl
994ad3e004 Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117) 2016-07-07 23:50:48 +08:00
scrawl
cd8c84dc6c Fix typo in SameRace dialogue function (function was inverted, Fixes #3116) 2016-07-07 23:50:48 +08:00
scrawl
5d4063d8c7 LocalScripts: initialize mIter 2016-07-07 23:50:47 +08:00
Koncord
1e29409dd5 Add OpenMW-mp target 2016-07-07 23:50:38 +08:00
Allofich
0e5c3f781f Only allow trap distance check to apply to player 2016-07-07 22:10:38 +09:00
Allofich
7de3afaa7d Cleanups 2016-07-07 21:57:00 +09:00
Allofich
cb621939fd Streamline trap code 2016-07-07 21:56:54 +09:00
Allofich
35a23c3b49 Implement and use new method allowTelekinesis() 2016-07-07 21:54:31 +09:00
Allofich
8014f37879 Avoid duplicate code 2016-07-07 21:54:30 +09:00
Allofich
538209b0a2 Change variable to mRatio and initialize it 2016-07-07 21:54:29 +09:00
Allofich
e25e698978 Fix telekinesis check for activators 2016-07-07 21:54:29 +09:00
MiroslavR
80f2ae0ca7 Apply magic effects while waiting/sleeping 2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4 Player's death now interrupts waiting/sleeping 2016-07-06 00:15:25 +02:00
MiroslavR
d4e29e3e0c Clear projectiles on non-incremental time advances 2016-07-06 00:11:58 +02:00
mrcheko
0793e4a80e refactor pathfinding code in AiWander: use AiPackage::pathTo, reuse AiPackage::ObstacleCheck 2016-07-05 21:38:41 +03:00
Allofich
c1236f4113 Simplified code 2016-07-04 20:25:25 +09:00
Allofich
c02695e56d Cleanups and fixes 2016-07-04 16:06:16 +09:00
Allofich
199607423b Use iMaxActivateDist for AI actors that use Activate packages 2016-07-04 16:06:16 +09:00
Allofich
64d298d2b5 Use raycast distance when player activates trapped object 2016-07-04 16:06:15 +09:00
Allofich
64d53a2314 Avoid double raycasts when using getFacedObject 2016-07-04 16:06:04 +09:00
Allofich
574e40db5e Don't allow telekinesis on activators 2016-07-04 01:50:47 +09:00
scrawl
343dccdbcc Merge pull request #980 from scrawl/voice_fix 
Voice fix
 2016-07-02 21:55:46 +02:00
scrawl
d96e49c04a Do not set change flag when running forEach on an empty cell 2016-07-02 20:44:14 +02:00
scrawl
8f62ea2e80 Fix for "RigGeometry rendering with no skeleton" errors 2016-07-02 20:19:55 +02:00
scrawl
b9b73d7b12 Replace "sys::default" with ESM::CellId::sDefaultWorldspace 2016-07-02 19:48:11 +02:00
scrawl
96757a3b7c Fix non-predefined cells not being saved correctly 2016-07-02 19:43:08 +02:00
MiroslavR
c8b61cb234 Cache magic effects in MWMechanics::Spells 2016-07-02 12:50:00 +02:00
MiroslavR
700dde116e Show remnant corprus effects in magic window 2016-07-02 05:17:24 +02:00
MiroslavR
54f52f7bae Implement effect removal for abilities (Fixes #3455) 2016-07-01 18:50:28 +02:00
scrawl
252b27f0ef Remove getEyePos() 2016-07-01 15:04:59 +02:00
Allofich
b29e9e9c77 Don't allow telekinesis on actors or teleport doors 2016-07-01 02:27:20 +09:00
MiroslavR
72d2daae90 Fix InventoryStore::purgeEffect being reverted by the next recalculation of mMagicEffects 2016-06-29 22:54:11 +02:00
scrawl
528de956da Merge pull request #981 from Allofich/magicka 
Fix timing of some magicka calculations
 2016-06-29 20:42:18 +02:00
Allofich
2290346296 Fix timing of some magicka calculations 2016-06-30 02:59:09 +09:00
scrawl
5eb6c548d7 Merge pull request #965 from kpp/find_tinyxml 
Find tinyxml
 2016-06-28 02:51:51 +02:00
scrawl
509e5dfe4d Include cleanup 2016-06-27 22:10:30 +02:00
scrawl
4699a8098b Include fix 2016-06-27 21:51:18 +02:00
scrawl
1739351b7a Remove now unused Sound_Decoder::rewind() 2016-06-27 21:38:04 +02:00
scrawl
dc1b010cf0 Don't analyze the loudness for sounds that don't need it 2016-06-27 21:37:13 +02:00
scrawl
965aaebbdb Analyze the loudness data as the stream is decoded for playback 
Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.

The benefit is that we need to decode the audio just once instead of twice.

We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
 2016-06-27 21:32:54 +02:00
scrawl
fc293aa048 Merge pull request #978 from Allofich/fatigue 
Fix update of fatigue display
 2016-06-27 17:05:05 +02:00
scrawl
5d9f611869 Merge pull request #979 from MiroslavR/master 
Show correct class image in level-up dialog
 2016-06-27 16:58:50 +02:00
Allofich
1602eb3de8 Fix so that keepPlayerAlive() will not run twice 2016-06-27 21:43:49 +09:00
Allofich
19a20a6871 Fix update of fatigue display 2016-06-27 21:17:06 +09:00
MiroslavR
7244809c4a Remove redundant part of condition 2016-06-26 15:17:52 +02:00
Marc Zinnschlag
594444a85a Merge remote-tracking branch 'aesylwinn/MultipleDeletion' 2016-06-26 08:11:43 +02:00
MiroslavR
0db3af1b89 ESSImporter: load specialization increases 2016-06-26 03:28:13 +02:00
MiroslavR
dfc62c99b4 Show correct class image in level-up dialog (Fixes #3443) 2016-06-26 03:22:58 +02:00
Allofich
dc468dd139 Fix magicka and fatigue calculations from fortifying attributes 2016-06-25 19:21:49 +09:00
Allofich
5d3aebd04b Update disposition check between persuasion attempts 2016-06-22 01:47:09 +09:00
terrorfisch
be25e2ba75 Make NPCs use both hands in weaponless combat. 2016-06-20 10:24:51 +02:00
Allofich
b1be3596dc Cleanup of #include statements 2016-06-18 10:56:28 +09:00
Allofich
4a38fb8650 Use namespace block in aiactivate 2016-06-17 20:59:37 +09:00
scrawl
f549b5fb7a Add missing include 2016-06-17 04:34:31 +02:00
scrawl
c18de84798 Fix a crash that could occur when two or more plugins move a deleted ref to another cell (Fixes #3446) 2016-06-17 02:27:49 +02:00
scrawl
3ce63c3f6e Merge pull request #967 from Allofich/AIPackageFixes 
AI package cleanups
 2016-06-16 20:22:51 +02:00
Allofich
c2b51112f2 AI package cleanups 2016-06-16 17:17:56 +09:00
scrawl
693d3cea4a Float to surface fix 2016-06-15 19:38:04 +02:00
scrawl
b5cb11ff07 Split refreshCurrentAnims into multiple functions 2016-06-15 03:14:44 +02:00
scrawl
372f2e2f18 Merge pull request #962 from Allofich/AIPackageFixes 
Duration fixes for Follow and Escort
 2016-06-14 20:47:32 +02:00
Allofich
3bebbab78e Duration fixes for Follow and Escort 2016-06-15 02:11:30 +09:00
scrawl
3ec4ee6290 Make a copy of map key to work around it being invalidated (Fixes #3329) 2016-06-13 02:06:44 +02:00
Roman Proskuryakov
28c63aea72 Uses FindTinyXML to find package 2016-06-12 21:40:02 +03:00
Roman Proskuryakov
edb41b5b08 Rewrites FindLIBUNSHIELD using LibFindMacros 
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
 2016-06-12 14:44:04 +03:00
scrawl
4acfe1a7e4 Move cleanupSummonedCreature to the mechanics manager (Bug #3439) 2016-06-12 02:43:33 +02:00
scrawl
910ad76e29 Remove spell effects when a summoned creature expires (Bug #3439) 2016-06-12 00:41:13 +02:00
scrawl
b7e45b046d When a summoned creature dies, wait for its death animation to complete before removing it (Bug #3439) 2016-06-12 00:40:55 +02:00
scrawl
a825882c6b Process death events at the end of the death animation (Fixes #1873) 2016-06-12 00:04:50 +02:00
scrawl
37afe966cf Update comment 2016-06-11 21:25:40 +02:00
scrawl
b6230bd31f Reject weather dialogue conditions when in an interior cell (Fixes #3437) 2016-06-11 18:26:20 +02:00
scrawl
844cbc5a14 Add isNullAction() method to fix compiler warning 2016-06-11 18:26:20 +02:00
scrawl
7a30ef5cc1 Do not consider actors following the player as hostiles 2016-06-11 18:26:20 +02:00
Marc Zinnschlag
148f2c9539 Merge remote-tracking branch 'aesylwinn/QTimerFix' 2016-06-11 11:26:14 +02:00
scrawl
a85932a62b Ignore the collision box offset when launching projectiles (Fixes #3201) 2016-06-10 23:47:01 +02:00
scrawl
c6601ab2ab Do not use the collision box offset for combat hit tests (Fixes #3201) 2016-06-10 23:47:01 +02:00
scrawl
8fcc1911d9 Use fCombatDistance as the creature attack range 2016-06-10 23:47:01 +02:00
Aesylwinn
f6c3b44cfb Fix QTimer not being stopped in right thread 2016-06-10 12:10:14 -04:00
Daniel Pettersson
943d9d97dc Slowfall now stops momentum when jumping 2016-06-10 15:22:12 +02:00
scrawl
a00e4de5c3 Fix another bug related to vanity mode toggle 2016-06-10 01:44:32 +02:00
scrawl
c47a679ac9 Fix queueing of vanity mode toggle (Bug #3421) 2016-06-10 01:39:37 +02:00
scrawl
ce91637cf9 Do not use/assign the camera distance in first person mode (Fixes #3421) 2016-06-10 01:05:43 +02:00
scrawl
166cced22f Merge pull request #957 from svaante/master 
Added 1.5 bonus for ranged weapons when weapons are rated
 2016-06-10 00:01:05 +02:00
scrawl
a14f1bc222 Merge pull request #954 from Allofich/AIWanderDuration 
Improve duration calculations in Wander AI
 2016-06-09 23:46:37 +02:00
Aesylwinn
ae50300053 Add ability to remove multiple rows in subrecords. 2016-06-09 15:42:40 -04:00
Allofich
55ac1fab68 Change Wander duration to run on a counter 2016-06-10 04:36:18 +09:00
Daniel Pettersson
256439f884 Added 1.5 bonus for ranged weapons when weapons are rated 2016-06-09 21:23:36 +02:00
Marc Zinnschlag
3dce406829 Merge remote-tracking branch 'aesylwinn/FixFocus' 2016-06-09 08:57:05 +02:00
scrawl
abcd2219e8 Ignore the calling actor in getEnemiesNearby / getActorsFighting 2016-06-08 22:13:21 +02:00
Aesylwinn
2f39a6e20d Fix camera input not being reset when focus for widget is lost. 2016-06-08 13:25:47 -04:00
Marc Zinnschlag
447ba08be5 Merge remote-tracking branch 'aesylwinn/FixTracking' 2016-06-08 09:23:35 +02:00
scrawl
165f048792 Do not count dead NPCs as observers (Fixes #3434) 2016-06-07 22:01:44 +02:00
Aesylwinn
7657684dad Fix mouse tracking to fix tooltip behavior. Also hide tooltips 
when the mouse is moved.
 2016-06-07 13:22:39 -04:00
scrawl
12eea9ed69 Remove magic number in getMaxActivationDistance 2016-06-07 15:18:36 +02:00
Marc Zinnschlag
b079db7913 Merge remote-tracking branch 'aesylwinn/EditPathgrid' 2016-06-07 08:35:16 +02:00
scrawl
8fb8c2bae5 Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order 2016-06-07 02:43:25 +02:00
scrawl
f417d7780a Fix the enemy nearby check (Bug #3423) 2016-06-07 01:55:34 +02:00
scrawl
dfc2f3469a Don't play music if no playlist is set 2016-06-07 01:36:09 +02:00