1437 commits

Author	SHA1	Message	Date
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Chris Collins	3a603e7ced	Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject ... change handling of life-time of TabletProxy QObjects	2017-04-11 11:53:47 -07:00
Seth Alves	077a4fe4ae	change handling of life-time of TabletProxy QObjects	2017-04-11 10:56:47 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	6c49db0f1b	add missing include for qScriptRegisterMetaType in Agent	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00
Zach Fox	0aa1e633fe	Fix overrides and warnings (finally?)	2017-04-10 22:15:45 -07:00
Zach Fox	2561d38d93	Fix GCC warning	2017-04-10 22:15:45 -07:00
Zach Fox	04792bf3bc	Typo fix.	2017-04-10 22:15:45 -07:00
Zach Fox	16be0ca70c	Birarda's CR changes	2017-04-10 22:15:44 -07:00
Zach Fox	1984d5bc0c	Cleanup	2017-04-10 22:15:44 -07:00
Zach Fox	3832abffee	Almost theregit add -A	2017-04-10 22:15:44 -07:00
Zach Fox	4489c34e84	I'm on fire	2017-04-10 22:15:44 -07:00
Zach Fox	5edd5d2b30	It's working...it's workinggit add -A!	2017-04-10 22:15:44 -07:00
Zach Fox	a16e261735	Checkpoint before a number of confusing changes	2017-04-10 22:15:44 -07:00
Stephen Birarda	4ed22ad7ac	move audio loudness to AvatarData, change AvatarData to ScriptOwnership	2017-04-10 22:15:44 -07:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Dante Ruiz	22521526ec	removed stray space	2017-04-06 23:41:30 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
Dante Ruiz	90f5d02c99	goto toggle option	2017-04-06 00:13:53 +01:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Seth Alves	b0b214012c	Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts ... Fix broken eventBridge on tablet after Reload All Scripts.	2017-04-04 10:45:08 -07:00
Anthony J. Thibault	8ff457a1b6	Fix broken eventBridge on tablet after Reload All Scripts. ... The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object. For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.	2017-04-03 16:03:55 -07:00
Seth Alves	43e1cec8a3	merge from upstream	2017-04-03 06:28:59 -07:00
Chris Collins	6fe210da66	Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login ... fix login-screen for hmd+tablet	2017-03-31 17:17:30 -07:00
Seth Alves	3cd134d138	fix login-screen for hmd+tablet	2017-03-31 16:41:21 -07:00
Seth Alves	c62b07d26f	add setLandscape call to tablet	2017-03-30 11:36:21 -07:00
Zach Fox	1b74576259	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00
Seth Alves	371df35013	remove code related to tablet being a model rather than an overlay. start on landscape mode	2017-03-29 14:16:14 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Seth Alves	651d87dc2a	move Qt-related stuff out of model and into model-networking	2017-03-28 07:53:25 -07:00
Dante Ruiz	f4255735a9	make login screen show up on the tablet on startup	2017-03-27 18:03:38 +01:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Seth Alves	59da607d07	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-24 15:08:23 -07:00
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Seth Alves	ce9bb439b3	change Model api in anticipation of more than just PolyVox being able to give meshes to javascript	2017-03-23 09:55:30 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Dante Ruiz	af97c7275e	Use loadQMlSource if no stack is aviable	2017-03-23 17:03:24 +01:00
Triplelexx	6e740a5fbb	change Mat4 getFront to getForward	2017-03-21 22:33:37 +00:00