12743 commits

Author	SHA1	Message	Date
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
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
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
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
MiroslavR	ddbfe0c944	Fix disabled door markers appearing on the map (Fixes #3348)	2016-08-12 03:14:36 +02: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