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

2729 commits

Author SHA1 Message Date
MiroslavR
46a3244107 Fix thrown weapon sources being used to apply on strike enchantments (Fixes #3634) 2016-11-22 18:18:20 +01:00
David Cernat
1feec58ed2 Merge pull request #108 from OpenMW/master 
Add OpenMW changes up to 20 Nov, part 3
 2016-11-20 22:57:47 +02:00
scrawl
16a913c549 Add emission of water ripple particles for water-walking actors (Fixes #3608) 2016-11-20 18:47:12 +01:00
David Cernat
f9ca98498d Merge pull request #107 from OpenMW/master 
Add OpenMW commits up to 20 Nov, part 2
 2016-11-20 19:30:24 +02:00
scrawl
385db50f2d Merge pull request #1131 from Allofich/waterwalking 
Make water walking mechanics closer to original MW
 2016-11-20 17:19:15 +01:00
Allofich
0e429ae41d Make water walking mechanics closer to original MW 2016-11-20 22:21:33 +09:00
David Cernat
49a78d8462 Merge pull request #105 from OpenMW/master 
Add OpenMW changes up to 19 Nov
 2016-11-19 22:24:48 +02:00
David Cernat
b028f0b51f Merge pull request #104 from OpenMW/master 
Add OpenMW commits up to 17 Nov
 2016-11-17 21:13:58 +02:00
David Cernat
6e630e6123 Send inventory packets when picking up world items 2016-11-17 20:51:07 +02:00
MiroslavR
7e5ba4d435 Fix default values of some GMSTs 2016-11-17 19:43:02 +01:00
MiroslavR
5e46121046 Implement fleeing AI (Closes #1118) 2016-11-16 20:15:25 +01:00
David Cernat
fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 2016-11-15 21:54:06 +02:00
David Cernat
8d2793401e Merge pull request #103 from OpenMW/master 
Add OpenMW commits up to 13 Nov
 2016-11-14 14:08:16 +02:00
Allofich
fee39afe38 Don't allow resting on water with water walking 2016-11-13 19:50:33 +09:00
David Cernat
25afa47e08 Only declare ptrCellStore for WorldPackets that need it 2016-11-04 15:47:55 +02:00
David Cernat
cee7843576 Send ID_OBJECT_DELETE when taking world items through inventory screen 2016-10-30 02:26:32 +03:00
David Cernat
a4647de048 Break away from OpenMW by giving RefNum indexes to new created objects 2016-10-30 00:21:55 +03:00
David Cernat
1f982e4dc7 Find objects from world packets using both ID and reference number 2016-10-28 21:31:41 +03:00
David Cernat
aaf4cc0d7e Prevent being in a menu from disabling script execution or actor damage 2016-10-25 17:48:00 +03:00
David Cernat
c25ebc34b3 Shorten WorldPacket IDs by removing WORLD from them 2016-10-25 12:15:27 +03:00
David Cernat
bdb53e1cb4 Implement ID_WORLD_DOOR_ACTIVATE and send it from MWBase::World 2016-10-25 10:40:55 +03:00
David Cernat
3a5a5e73a1 Send ID_WORLD_OBJECT_UNLOCK from ingame scripts and regular unlocking 2016-10-24 11:43:27 +03:00
David Cernat
94c5d6d2f9 Don't use autoEquip on player-controlled NPCs 2016-10-24 11:15:09 +03:00
David Cernat
47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
 2016-10-24 09:18:21 +03:00
David Cernat
a6fa0073a0 Find items by mRefNum.mIndex instead of mRefNum for WorldPackets 2016-10-23 23:13:42 +03:00
David Cernat
0a44bea91d Send cell coordinates in tes3mp using mData instead of mCellId.mIndex 2016-10-23 16:55:30 +03:00
David Cernat
cbc132612a Use mRefNum.mIndex instead of just mRefNum and add extra debug 2016-10-23 16:33:53 +03:00
David Cernat
17f66e4e90 Implement ID_WORLD_OBJECT_PLACE 2016-10-23 13:30:32 +03:00
David Cernat
6e43baf73e Send Cell instead of CellId because of problems with the latter 2016-10-22 20:09:13 +03:00
David Cernat
103b1e3f72 Send CellId in ID_WORLD_OBJECT_DELETE 2016-10-22 18:44:13 +03:00
David Cernat
3c49157ed7 Rename WorldPackets to ID_WORLD_OBJECT_DELETE and ID_WORLD_OBJECT_PLACE 2016-10-22 18:05:32 +03:00
David Cernat
40f1db2d86 Create SearchByRefNumCustomVisitor in CellStore that returns entire Ptr 2016-10-22 17:47:21 +03:00
David Cernat
b3d6dad0c5 Send ID_WORLD_OBJECT_REMOVAL from actiontake.cpp and not worldimp.cpp 2016-10-22 17:10:57 +03:00
David Cernat
cc98a25dcf Add searchByRefNum method to OpenMW's CellStore 2016-10-22 16:47:11 +03:00
David Cernat
92463c4a03 Fix Windows server crash caused by printing event->CellRef()->mRefID 2016-10-22 14:13:16 +03:00
David Cernat
8080cceac6 Add some placeholder code so Stanislav can test it 2016-10-22 12:45:19 +03:00
David Cernat
ac666edebd Add a CellRef to WorldEvent 2016-10-20 22:15:47 +03:00
David Cernat
b2845cd17c Create and start using WorldEvent class 2016-10-20 14:28:19 +03:00
David Cernat
a42d5f2429 Make client send placeholder ID_WORLD_OBJECT_REMOVAL to server 2016-10-20 12:53:48 +03:00
MiroslavR
407abc605f Fix auto-equipping of blunt weapons 2016-10-19 22:37:45 +02:00
scrawl
9c549a85ce Merge pull request #1108 from MiroslavR/autoequip-weap 
Auto-equip weapons
 2016-10-19 20:45:47 +02:00
MiroslavR
76ddd9bebb Add a setting for merchant auto-equipping prevention 2016-10-19 02:22:49 +02:00
scrawl
a7d4928593 Properly handle moved references in respawning code (Fixes #3600) 2016-10-18 23:51:45 +02:00
MiroslavR
1d3008594d Autoequip weapons (Fixes #3562) 2016-10-18 13:57:35 +02:00
MiroslavR
14240cf7a2 Fix autoEquip to better match vanilla (Fixes #3590) 2016-10-16 17:27:17 +02:00
MiroslavR
7b59eda13a Import base weather states before loading region modifiers (Fixes #3594) 2016-10-15 17:34:03 +02:00
David Cernat
3136a12051 Resolve conflicts in pull request #75 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2016-10-14 18:34:17 +03:00
Allofich
1c54f54ab8 Fix shadowing warnings 2016-10-15 00:12:46 +09:00
scrawl
db09858f59 Don't allow the player to activate objects when dead 2016-10-13 14:42:10 +02:00
scrawl
3dce155d96 Fix uninitialized variable 2016-10-11 14:50:13 +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
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
Allofich
6ec37b5cfb Fix shadowing warnings 2016-10-02 17:48:54 +09: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
MiroslavR
52e00f5fef Do not show uncarriable lights in item views 2016-09-24 18:01:31 +02: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
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
79c561057c Merge pull request #59 from OpenMW/master 
Add OpenMW commits up to 18 Sep
 2016-09-19 02:47:09 +03:00
scrawl
cd4b182091 Merge pull request #1051 from Allofich/textures 
Use spell effect particle textures
 2016-09-18 22:37:14 +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
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
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
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
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
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
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
Allofich
10842462c7 Send lists of models and sounds to launchMagicBolt 2016-09-04 17:42:27 +09:00