2729 commits

Author	SHA1	Message	Date
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