26518 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	9a67f35b59	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-04 19:02:46 -07:00
David Rowe	3388406984	Add basic username, password, login, and error functionality and styling	2015-06-04 18:48:21 -07:00
Eric Levin	f276ca30cd	refactoring for common functions. Fix for randFloat	2015-06-04 17:55:55 -07:00
Seth Alves	ba42b0dcc4	updateAction and deleteAction	2015-06-04 17:51:59 -07:00
Eric Levin	241330442c	added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created.	2015-06-04 17:35:26 -07:00
Philip Rosedale	6d29524610	Merge pull request #5052 from ericrius1/lineSanitization ... added sanitization for invalid line points data. Fixed bug where occa…	2015-06-04 17:22:48 -07:00
Andrew Meadows	911baee8b8	fix for crash during bogus reconnect on login	2015-06-04 16:57:29 -07:00
Andrew Meadows	cd6bf9d461	cleanup comments	2015-06-04 16:56:14 -07:00
Eric Levin	1fd0650955	removing overlay on script ending	2015-06-04 16:54:52 -07:00
Eric Levin	5e15c14539	added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"	2015-06-04 16:45:32 -07:00
ZappoMan	5146e51d9f	improvements to avatar part clipping	2015-06-04 16:44:46 -07:00
Eric Levin	a2ae51371b	updated pointer.js script to work with new line entity	2015-06-04 15:44:39 -07:00
David Rowe	afc2f374e5	New login dialog background with circular and rectangular variations ... Developer menu item toggles between the two.	2015-06-04 14:39:28 -07:00
David Rowe	d33a249b3e	Refactor common new dialog functionality into new Dialog.qml	2015-06-04 14:39:28 -07:00
David Rowe	2c17274f49	Rename Dialog.qml to DialogOld.qml	2015-06-04 14:39:27 -07:00
Ryan Huffman	cafc5b7a7c	Merge pull request #5049 from ZappoMan/team-teaching-optimize-offset ... TEAM TEACHING - avatar changing model URLs	2015-06-04 14:29:44 -07:00
Howard Stearns	407d3b6a6e	Pitch is dependent on (largest dimension of) minimum bounding, not max. ... Adjust sound range of full volume.	2015-06-04 14:23:51 -07:00
Howard Stearns	5cbb5dadca	More perspicacious zero.	2015-06-04 14:21:12 -07:00
Howard Stearns	5727400b9a	Sound toys script (in examples/soundToys.js)	2015-06-04 14:20:19 -07:00
Brad Hefta-Gaub	5e6771d91a	Merge pull request #5048 from huffman/entity-visible ... Team Teaching - Update entity payload items to not render when entity.visible == false	2015-06-04 14:12:49 -07:00
Ryan Huffman	5af52048ec	Add render/Scene.h include to Model.h	2015-06-04 13:45:10 -07:00
ZappoMan	56ac987c9b	handle url reloading at the model level, this addresses avatars changing their models	2015-06-04 13:40:43 -07:00
Ryan Huffman	a62b55fcb2	Update entity payload items to correctly hide when not visible	2015-06-04 13:25:40 -07:00
Seth Alves	5e5bc497d9	remove debugging prints	2015-06-04 12:44:08 -07:00
Seth Alves	5f60ad3b51	put back unused variables as commented out -- there is a comment lower down that talks about them	2015-06-04 12:39:48 -07:00
Seth Alves	66ab3d455f	use shared pointers to keep track of action objects	2015-06-04 12:29:05 -07:00
Clément Brisset	6ebc3d8f8c	Merge pull request #5047 from ZappoMan/team-teaching-optimize-offset ... TEAM TEACHING - optimize part offset calculation	2015-06-04 21:11:07 +02:00
Seth Alves	8f19bad97d	pull argument extracting code into EntityActionInterface	2015-06-04 11:39:15 -07:00
ZappoMan	3593afea3b	optimize part offset calculation	2015-06-04 11:37:02 -07:00
Andrew Meadows	6b03e671d8	remove comment cruft	2015-06-04 11:28:07 -07:00
Andrew Meadows	aff751b4e6	remove old debug assert	2015-06-04 11:26:35 -07:00
Andrew Meadows	0514736a3e	remove last of *InDomainUnits code	2015-06-04 11:24:10 -07:00
Seth Alves	14026667f5	script interface for creating an action now takes an action-type name rather than having a different call for each action	2015-06-04 10:55:32 -07:00
Andrew Meadows	6ea4c58319	material changes are an "easy" property to update	2015-06-04 10:22:01 -07:00
Seth Alves	9cae11cc3c	clean up actions when DeleteEntityOperator's list is processed rather than as it's made	2015-06-04 09:55:25 -07:00
Atlante45	94ba84a84c	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-04 18:48:15 +02:00
Atlante45	93b44e6846	Collect stats on translucent/opaque mesh parts	2015-06-04 18:46:47 +02:00
Seth Alves	57d85cece0	get rid of simulation back-pointer in actions	2015-06-04 09:41:32 -07:00
Brad Hefta-Gaub	2dd2e30707	Merge pull request #5046 from ZappoMan/team-teaching ... TEAM TEACHING - merge from master	2015-06-04 09:40:00 -07:00
ZappoMan	d2deef97cc	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-04 09:24:37 -07:00
Brad Hefta-Gaub	50f44c801a	Merge pull request #5045 from Atlante45/fix_world_box ... Team Teaching - Temporary fix for models index offset	2015-06-04 09:16:31 -07:00
Atlante45	8e21d9c14b	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-04 18:11:17 +02:00
Howard Stearns	0b52f85c60	Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-initial-crash-volume	2015-06-04 09:10:42 -07:00
Clément Brisset	7ffe7b31a6	Merge pull request #5041 from ZappoMan/team-teaching-all-entities ... TEAM TEACHING - overlays and entities, fix to shrunken avatars	2015-06-04 18:00:44 +02:00
Atlante45	31d257db09	Temporary fix for models index offset	2015-06-04 17:58:44 +02:00
ZappoMan	c4756f4816	remove dead code	2015-06-04 08:49:26 -07:00
ZappoMan	4b389793ad	CR feedback	2015-06-04 08:42:10 -07:00
Brad Hefta-Gaub	b62aa21c6e	Merge pull request #5042 from Atlante45/line ... Team teaching - Line entities render to batch	2015-06-04 08:40:07 -07:00
Brad Hefta-Gaub	a534753847	Merge pull request #5043 from Atlante45/fix_world_box ... Team Teaching - Fix world box	2015-06-04 07:54:14 -07:00
Atlante45	a4340b17e9	Remove deprecated render stats	2015-06-04 14:47:04 +02:00