scrawl
1447bfa215
Improve scene loading performance by creating collision objects with the correct rotation right away instead of adjusting it later
2017-02-04 15:12:01 +01:00
David Cernat
a2e3fe18fe
[Client] Send ID_PLAYER_CELL_STATE to server at end of CharGen
...
Also, allow requests for ID_PLAYER_CELL_STATE from the server.
2017-02-04 09:13:15 +02:00
David Cernat
44e27148d5
Merge pull request #140 from OpenMW/master
...
Add OpenMW commits up to 4 Feb 2017
2017-02-04 07:37:17 +02:00
scrawl
eaeba4138b
Move the deletion of PreloadItem to the worker thread
2017-02-04 02:36:44 +01:00
David Cernat
c1427b2558
[General] Simultaneously send loads & unloads in ID_PLAYER_CELL_STATE
2017-02-03 20:27:40 +02:00
David Cernat
63974af131
Merge pull request #139 from OpenMW/master
...
Add OpenMW commits up to 3 Feb 2017
2017-02-03 07:57:14 +02:00
scrawl
0be811c519
Update the resource cache every second instead of every frame
...
A dry run takes about ~1.5ms. Even though it's all done in the worker thread, the locks used can stall loading operations that are about to happen in other threads, and just in general this CPU load is unnecessary.
2017-02-03 03:44:30 +01:00
David Cernat
958ff06ca8
[General] Rename ID_DOOR_ACTIVATE into ID_DOOR_STATE
2017-02-01 11:54:40 +02:00
Koncord
f78c749981
[Client] Use "NULL" instead "nullptr"
...
nullptr keyword introduced in C++11
2017-02-01 15:58:29 +08:00
David Cernat
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
2017-02-01 09:28:23 +02:00
scrawl
34deb6e7b1
Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes
2017-02-01 06:00:14 +01:00
David Cernat
703f253712
[Client] Delete new LocalEvents after sending them
2017-01-31 09:48:37 +02:00
David Cernat
9f1e491a75
[General] Make WorldEvents store information about multiple objects
2017-01-28 12:34:45 +02:00
David Cernat
624b85347a
[Client] Create LocalEvent class and use it instead of WorldEvent
2017-01-27 20:57:47 +02:00
David Cernat
055376c8ee
[Client] Only send ID_PLAYER_CELL_LOAD when CharGen is over
2017-01-26 13:14:22 +02:00
David Cernat
97aabf4a7d
[General] Sketch out sending of cell loading/unloading info in packets
2017-01-26 09:02:01 +02:00
David Cernat
0cd7c3ea3d
Merge pull request #131 from OpenMW/master
...
Add OpenMW commits up to 21 Jan
2017-01-22 11:20:20 +02:00
MiroslavR
c64351b3e8
ESS-import: player is no longer disabled (Bug #3246 )
2017-01-21 03:39:51 +01:00
David Cernat
c77120df6d
Merge pull request #129 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/actiontake.cpp
2017-01-19 06:34:09 +02:00
scrawl
cc19b4bd8a
Fix door rotation order in collision case (Bug #3707 )
2017-01-19 02:19:44 +01:00
scrawl
45fb4f04b1
Update reference of the interpreter context when an Activate results in a take action ( Fixes #3727 )
2017-01-18 21:57:50 +01:00
David Cernat
fa8650f99a
Merge pull request #128 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
2017-01-18 15:38:18 +02:00
NeveHanter
e82d542d89
Merge remote-tracking branch 'upstream/master' into bugfix-3617
2017-01-15 09:49:45 +01:00
NeveHanter
811e9ad9f3
Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater.
...
Also allowed projectiles to fly through the dead bodies as in vanilla.
2017-01-15 09:49:25 +01:00
David Cernat
f376b8416e
Merge pull request #127 from OpenMW/master
...
Add OpenMW commits up to 15 Jan
2017-01-15 02:51:15 +02:00
scrawl
b87abb0456
Reset activation flags when an object is copied ( Fixes #3671 , Fixes #3719 )
2017-01-14 15:29:36 +01:00
David Cernat
70b43ecef6
Merge pull request #126 from OpenMW/master
...
Add OpenMW commits up to 14 Jan
2017-01-14 05:59:16 +02:00
scrawl
69ce9f32bc
Activate/OnActivate fix (Bug #3712 )
2017-01-14 00:10:43 +01:00
David Cernat
dfb87e9e0d
Merge pull request #124 from OpenMW/master
...
Add OpenMW commits up to 11 Jan
2017-01-11 13:30:22 +02:00
MiroslavR
f1f9209814
Creatures now auto-equip shields ( Fixes #3704 )
2017-01-08 20:52:04 +01:00
scrawl
7b5f3e3cdc
Fix crash in ProjectileManager when a sound id fails to play or is not found
2017-01-01 21:34:31 +01:00
David Cernat
59c3dbe6af
Merge pull request #120 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2016-12-30 23:59:30 +02:00
Marc Zinnschlag
dedd95f52a
Merge remote-tracking branch 'miroslavr/save-cleanup'
2016-12-29 08:37:59 +01:00
David Cernat
fba4878fee
Merge pull request #118 from OpenMW/master
...
Add OpenMW changes up to 27 Dec
2016-12-27 03:49:52 +02:00
MiroslavR
c9dd63af8d
Merge pull request #1171 from NeveHanter/travel-followers-cost
...
Implemented "paying" for travelling followers
2016-12-26 22:34:39 +01:00
NeveHanter
8568cd049f
Removed "less" character from the documentation by the requested opportunity.
2016-12-26 21:46:43 +01:00
David Cernat
5bdfb72752
Merge pull request #116 from OpenMW/master
...
Add OpenMW changes up to 26 Dec
2016-12-26 01:09:20 +02:00
NeveHanter
ff4aba2a6e
Moved duplicated code to common ActionTeleport static method and reordered travel price calculations
2016-12-23 21:27:29 +01:00
MiroslavR
87fd011a28
Clean-up saves by dropping references with invalid RefNums ( Fixes #1956 )
2016-12-22 20:48:58 +01:00
scrawl
cf496287f7
Silence static analysis warnings
2016-12-22 14:43:54 +01:00
scrawl
dc1f788cff
Use osg::PI over M_PI
2016-12-21 16:49:37 +01:00
Koncord
6e6237541a
Fix "comparison between signed and unsigned integer expressions"
2016-12-21 16:13:39 +08:00
NeveHanter
8902bb5b13
Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith
2016-12-20 12:38:51 +01:00
David Cernat
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
2016-12-17 23:27:09 +02:00
Koncord
804259b2c9
Change some printf to LOG_MESSAGE_SIMPLE
...
printf is not streamed to files
2016-12-16 18:50:34 +08:00
Koncord
536715cf46
Cleanup tes3mp headers
2016-12-16 16:59:15 +08:00
Leon Krieg
c7b4b2cdd7
Fixed multiple spelling mistakes
2016-12-14 16:39:33 +01:00
scrawl
8bdd5d1131
Merge pull request #1151 from Aussiemon/projectilelightsfix
...
Update to implementation of projectile lights
2016-12-14 14:33:09 +01:00
mrohrlach
71e74f5a93
Moved projectile light calculation to separate method
2016-12-13 18:04:20 -07:00
mrohrlach
f0f78c9d64
Slight adjustments to disintegration fix
2016-12-09 19:55:26 -07:00
mrohrlach
9624d8aade
Added new method and variable to track float remainders of disintegration effections
2016-12-09 19:48:56 -07:00
mrohrlach
f5da179a90
Removed two more bad casts
2016-12-09 18:15:40 -07:00
mrohrlach
3b0c791892
Removed bad casts and unnecessary comments
2016-12-09 18:10:06 -07:00
mrohrlach
c2e5f24e98
Tidying up
2016-12-04 16:31:11 -07:00
mrohrlach
ef5cf76ad8
Implemented retrieval of effect colors for lights, made recommended changes
2016-12-04 16:11:21 -07:00
mrohrlach
3816d0f6dc
Changed light values to better match vanilla. Still need to pull diffusion properties from spells
2016-12-03 19:44:52 -07:00
mrohrlach
099e79edbe
Changed a line that did not need to be changed apparently
2016-12-03 19:12:25 -07:00
mrohrlach
61097d93b9
Replaced tabs with spaces (oops)
2016-12-03 19:09:03 -07:00
mrohrlach
49ce80346c
Changed methods slightly to ensure non-magic projectiles do not receive lights
2016-12-03 15:42:24 -07:00
mrohrlach
83945cf280
Added reasonable approximation of magic bolt lights
2016-12-03 15:24:21 -07:00
David Cernat
7bbeed629d
Merge pull request #109 from OpenMW/master
...
Add OpenMW changes up to 25 Nov
2016-11-26 01:58:43 +02:00
scrawl
762460f042
Use negative count when restocking item to ensure that its properly tracked ( Fixes #3635 )
2016-11-22 22:42:04 +01:00
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
