8293 commits

Author	SHA1	Message	Date
Brad Davis	9fbd5d79e4	Removing duplicate declaration	2015-04-24 17:46:56 -07:00
Brad Davis	fdf2f8395d	Bad lambda type	2015-04-24 17:28:43 -07:00
Brad Davis	eb02bdc67f	Dangling function	2015-04-24 16:57:39 -07:00
Brad Davis	dab8761c71	Merge remote-tracking branch 'upstream/master' into ui-refactor	2015-04-24 16:46:48 -07:00
Brad Davis	e7b8efc2d9	Cleaning up unused stuff	2015-04-24 16:44:48 -07:00
Brad Davis	08d60c6a01	Fixing message dialog	2015-04-24 16:19:39 -07:00
Brad Davis	e5df17eb99	Merge pull request #4691 from ZappoMan/defaultAvatars ... fix default avatars on first run	2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub	dbb1e3c820	Merge pull request #4682 from jherico/offscreen ... Attempting to fix backspace issue in new UI	2015-04-24 16:10:42 -07:00
Brad Davis	0a9398808f	CR comments	2015-04-24 13:25:30 -07:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Atlante45	a4f03f8b1c	Zones use avatar position not view frustum	2015-04-24 22:16:21 +02:00
ZappoMan	37928dcd6d	fix default avatars on first run	2015-04-24 11:30:18 -07:00
Brad Hefta-Gaub	22ff2ba1b8	Merge pull request #4687 from Atlante45/zone_shape_edit_js ... Zone ShapeType/CompoundShapeURL in edit.js	2015-04-24 09:08:56 -07:00
Atlante45	a26d9ef353	Fix ShapeType/String conversion	2015-04-24 16:49:18 +02:00
Atlante45	fff8b99d10	Fix keylight color ... Was an integer division producing a float	2015-04-24 15:31:25 +02:00
Brad Davis	a4619c8e59	Merge branch 'master' into offscreen	2015-04-23 23:41:36 -07:00
Andrew Meadows	0daaf20f01	Merge pull request #4675 from sethalves/detect-ballistic ... Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor	2015-04-23 14:19:51 -07:00
Brad Davis	ae804357d8	Attempting to fix backspace issue in new UI	2015-04-23 14:10:54 -07:00
ZappoMan	5dddca37ca	fix default shape of zones	2015-04-23 13:44:39 -07:00
Seth Alves	bc65616bb3	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-23 13:09:22 -07:00
Brad Hefta-Gaub	ad7293d4ad	Merge pull request #4679 from jherico/offscreen ... Fix a couple of bugs with the new offscreen UI	2015-04-23 12:45:51 -07:00
Atlante45	0b1d4fb1d6	Merge branch 'master' of https://github.com/highfidelity/hifi into zones	2015-04-23 21:16:11 +02:00
Brad Hefta-Gaub	945433be28	Merge pull request #4678 from sethalves/fix-pile-at-origin ... don't pile things up at the origin during a load	2015-04-23 11:40:46 -07:00
Brad Davis	d0af5580c8	Fix mouse wheel and clickthrough bugs in offscreen UI	2015-04-23 10:28:03 -07:00
Atlante45	b776ea8110	Make ::contains() back into a const	2015-04-23 19:15:06 +02:00
Atlante45	b340cd06bf	Fix volume formula for capsules	2015-04-23 19:14:07 +02:00
Seth Alves	c21e06e7a7	don't pile things up at the origin during a load	2015-04-23 10:08:59 -07:00
Seth Alves	2ca592de8b	fix logic with infectious simulation ownership	2015-04-23 10:02:29 -07:00
Atlante45	83490051d9	Move shape related contains() to ShapeInfo	2015-04-23 18:55:20 +02:00
Ryan Huffman	e0d4a0b1e1	Add functionality to turn zone picking off	2015-04-23 09:36:41 -07:00
Seth Alves	10e5378396	fix mangled if	2015-04-23 09:13:18 -07:00
Atlante45	51d99da29f	Magic number	2015-04-23 17:50:26 +02:00
Atlante45	f494f86ee5	Handle registration point in transforms	2015-04-23 17:48:29 +02:00
Atlante45	bda72025af	Check mesh extend before going through triangles	2015-04-23 16:40:40 +02:00
Brad Hefta-Gaub	82d3302d1b	Merge pull request #4644 from jherico/offscreen ... Working on new-UI implementations of address bar and login	2015-04-23 07:17:45 -07:00
Atlante45	99fd590a90	Update compound shape geometry when async get	2015-04-23 16:05:06 +02:00
Atlante45	d18229d52d	Merge branch 'master' of https://github.com/highfidelity/hifi into zones	2015-04-23 15:58:57 +02:00
Atlante45	6be0910966	Fix contain for collision hulls	2015-04-23 15:58:18 +02:00
Atlante45	3a0b5f9d22	Register RenderableZoneEntityItem in EntityTreeRenderer	2015-04-23 15:34:03 +02:00
Atlante45	15482d6a57	Don't compute shape for zones	2015-04-23 15:21:51 +02:00
Atlante45	fb4d1d3557	Fix compoundShapeURL reseting shapeType	2015-04-23 14:24:20 +02:00
Atlante45	f117941c8d	Macro fixing	2015-04-23 13:25:14 +02:00
Atlante45	01f4f34911	Centralize contains standard cases	2015-04-23 13:04:59 +02:00
Atlante45	837a0d3ba8	rename collision model in edit.js	2015-04-23 12:13:52 +02:00
Atlante45	3ebe72f025	Fix read macro	2015-04-23 12:12:42 +02:00
Seth Alves	9e96026c52	move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState	2015-04-22 21:36:36 -07:00
Brad Davis	eaaada908a	Merge pull request #4674 from ZappoMan/ZoneVolume ... implement volume priority for zones	2015-04-22 20:21:30 -07:00
Brad Davis	de179256d3	Kill all the whitespace	2015-04-22 20:19:19 -07:00
Brad Davis	eab4ad9ea9	More coding standard stuff	2015-04-22 20:16:41 -07:00
Brad Davis	44efcdf82a	More coding standard	2015-04-22 20:08:49 -07:00