7127 commits

Author	SHA1	Message	Date
Andrzej Kapolka	0baf757c0d	Basic support for shadows on models.	2014-05-23 16:35:51 -07:00
Brad Hefta-Gaub	43bdc8c156	Merge pull request #2912 from Atlante45/point_and_glow ... Point and glow	2014-05-23 12:31:41 -07:00
Atlante45	28536eaef2	CR	2014-05-23 11:53:34 -07:00
Atlante45	f0f62ced6b	Don't create a glower if no glow	2014-05-23 11:41:42 -07:00
Brad Hefta-Gaub	861a48f6f9	Merge pull request #2911 from ey6es/master ... Use local viewer model for specular.	2014-05-23 11:35:40 -07:00
Brad Hefta-Gaub	10b0471641	Merge pull request #2906 from Barnold1953/master ... Write thread safety for Overlays QMaps	2014-05-23 11:34:02 -07:00
Atlante45	7b9f6f8505	Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow	2014-05-23 11:32:52 -07:00
barnold1953	6817c9682e	Added a new lock specific to deleting, and improved safety	2014-05-23 11:17:55 -07:00
Atlante45	df68082705	Added local glow to models	2014-05-23 11:02:07 -07:00
Andrzej Kapolka	bfd00f1b15	Use local viewer model for specular.	2014-05-23 10:57:14 -07:00
barnold1953	9553271fa1	Added some missing locks to make Overlays thread safe for reading as well.	2014-05-23 10:44:40 -07:00
Philip Rosedale	22548b9956	Merge pull request #2909 from PhilipRosedale/master ... add visual indicator of thrust direction	2014-05-23 09:58:55 -07:00
Philip Rosedale	6998dfae3c	add visual indicator of thrust direction	2014-05-23 09:57:47 -07:00
AndrewMeadows	3a638cc447	Merge pull request #2905 from ey6es/animenu ... Added animation controls for start/stop frames, loop/hold flags, "start automatically," roles (with script commands to start/stop by role).	2014-05-23 09:52:54 -07:00
AndrewMeadows	18046c9e9a	Merge pull request #2907 from PhilipRosedale/master ... Velocity damped hand positions	2014-05-23 09:50:39 -07:00
Andrzej Kapolka	4d6e8a2c9e	Or rather, replaceMatchingPriorities.	2014-05-23 09:42:36 -07:00
Andrzej Kapolka	09ba25bde5	Merge branch 'master' of https://github.com/highfidelity/hifi into animenu	2014-05-23 09:40:35 -07:00
Leonardo Murillo	f7f4c48b9b	Revert "Initialise lisencing manager after we have enabled Visage." ... This reverts commit 061f182fab.	2014-05-23 08:40:41 -06:00
Philip Rosedale	2681312b54	Velocity damped hand positions	2014-05-23 00:09:15 -07:00
barnold1953	e33cdedeef	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-22 17:56:01 -07:00
barnold1953	3a45104793	Made overlays thread safe for write operations, which solved a script ... crash.	2014-05-22 17:55:25 -07:00
Andrzej Kapolka	a32dfdb7bb	We should let people "start" even if the animation is already playing (to ... start again from the beginning). Fixed an issue with competing priorities.	2014-05-22 17:05:28 -07:00
Andrzej Kapolka	2a50b5451f	Script commands to start/stop animations by role.	2014-05-22 16:41:51 -07:00
Andrzej Kapolka	8458477b9f	Fixed a compile warning, provide means to start/stop animations.	2014-05-22 16:15:34 -07:00
Stephen Birarda	164d3c5fb3	make sure balance is cleared on logout and re-launch	2014-05-22 15:06:16 -07:00
Andrzej Kapolka	083543419d	More priority bits.	2014-05-22 15:00:36 -07:00
Stephen Birarda	79f09605d5	show credit balance in window title	2014-05-22 14:55:43 -07:00
Andrzej Kapolka	8717977437	Merge branch 'master' of https://github.com/highfidelity/hifi into animenu	2014-05-22 14:42:23 -07:00
Andrzej Kapolka	d4af39a9f5	Working on handling animation priorities to prevent Hydra move/restore from ... interfering with scripted animations.	2014-05-22 14:41:46 -07:00
Leonardo Murillo	60dfa08b30	Merge pull request #2902 from birarda/master ... change node auth URL to data.highfidelity.io	2014-05-22 15:30:44 -06:00
Brad Hefta-Gaub	5964cb9c96	Merge pull request #2901 from polac/19671_proposal ... Initialise lisencing manager after we have enabled Visage.	2014-05-22 14:28:20 -07:00
Stephen Birarda	01e8d775f2	change node auth URL to data.highfidelity.io	2014-05-22 14:24:19 -07:00
barnold1953	a48c6b82e2	Fixed my mistake by unlocking the lock.	2014-05-22 14:17:26 -07:00
barnold1953	f069b70563	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-22 12:46:39 -07:00
barnold1953	5013c8c2fa	Fixed script editor crash when script calls Script.stop(). Also made the ... processEraseMessage wait until it can lock to ensure particles are deleted.	2014-05-22 12:45:36 -07:00
Andrzej Kapolka	03abad4f20	Merge branch 'master' of https://github.com/highfidelity/hifi into animenu	2014-05-22 11:59:49 -07:00
Andrew Meadows	b0c3655076	Fix for bad bounding shape for multi-root models.	2014-05-22 11:40:36 -07:00
Atlante45	ea1359c10f	Clean up log	2014-05-22 11:11:22 -07:00
barnold1953	4036f929c9	Stopped access violation when erasing particles.	2014-05-22 10:31:30 -07:00
Andrzej Kapolka	e81e6f3cb2	Merge branch 'master' of https://github.com/highfidelity/hifi into animenu	2014-05-21 18:00:57 -07:00
barnold1953	dad2788b8c	Moved 'I am looking at' ball to be immediately above name text, and reduced opacity	2014-05-21 17:45:17 -07:00
barnold1953	5b366fe714	Merge branch 'master' of https://github.com/highfidelity/hifi ... Conflicts: interface/src/Application.cpp	2014-05-21 16:01:28 -07:00
Andrzej Kapolka	2eee9a32ac	Removed debugging line.	2014-05-21 15:39:12 -07:00
barnold1953	97c0a2fc98	Made mirror view remain constant no matter what the avatar scale is set to.	2014-05-21 15:32:23 -07:00
Andrzej Kapolka	de7c05cb2d	More animation controls.	2014-05-21 15:30:50 -07:00
barnold1953	21f03a4fb5	Made oculus camera modes only active when AllowOculusCameraModeChange is checked.	2014-05-21 12:43:44 -07:00
Andrzej Kapolka	709a9d75f6	Provide an option for the masked joints in the scriptable method, fix a couple ... of annoying warnings.	2014-05-21 12:03:47 -07:00
Andrzej Kapolka	0e15c82e49	Allow setting masked joints for each animation.	2014-05-21 11:58:20 -07:00
barnold1953	b5ad295756	Fixed improper coding style in previous pull request	2014-05-21 11:24:39 -07:00
barnold1953	3bc8e0f726	Made third person work with oculus	2014-05-21 11:21:12 -07:00