55552 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mike Moody	fb869034f2	fixing magic numbers ... changing to local entity making var names more friendly	2017-06-04 21:05:30 -07:00
Mike Moody	91db29e92f	laser initial commit	2017-06-02 15:34:25 -07:00
Seth Alves	142739eec7	Merge pull request #10602 from AndrewMeadows/simulation-ownership-002 ... fixes for some simulation ownership problems	2017-06-02 14:23:19 -07:00
Ryan Huffman	c0bca73ec7	Merge pull request #10606 from huffman/feat/startup-went-to-event ... Add startup_sent_to user activity event	2017-06-02 13:49:41 -07:00
Chris Collins	34201ea1da	Merge pull request #10599 from jherico/ktx_cache_wipe ... Add versioning support to the KTX cache	2017-06-02 13:02:18 -07:00
Andrew Meadows	d480123e93	Merge pull request #10555 from ctrlaltdavid/21372 ... Make stopwatch buttons work properly	2017-06-02 11:27:27 -07:00
Brad Davis	1f95daf5c1	Add dev menu option to wipe KTX cache on next launch	2017-06-02 11:19:43 -07:00
Ryan Huffman	0d96f82888	Merge pull request #10592 from birarda/close-report ... Send a close event to API on shutdown	2017-06-02 10:57:41 -07:00
Ryan Huffman	0fdbf4a342	Add startup_sent_to user activity event	2017-06-02 09:59:29 -07:00
Seth Alves	bc2311cb35	Merge pull request #10561 from AndrewMeadows/sanity-check-physics ... fix crash in EntityMotionState::handleDeactivation()	2017-06-02 09:55:20 -07:00
David Kelly	70b6236890	Merge pull request #10605 from davidkelly/dk/analyticsForBubble ... Add UserActivity calls for bubble usage	2017-06-02 09:48:15 -07:00
David Kelly	2feea16063	added comment	2017-06-02 09:47:03 -07:00
Seth Alves	f47a49e631	Merge pull request #10597 from druiz17/record-standard ... Saved recording are officially g zipped and pose are played back to the standard endpoint	2017-06-02 09:44:03 -07:00
David Kelly	4dae77cd9d	make sure we dont log the initial call to onBubbleToggled	2017-06-02 08:45:02 -07:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
Stephen Birarda	6a89726a6a	Merge pull request #10593 from birarda/log-api-session-id ... print the metaverse session ID to the debug log	2017-06-01 18:02:17 -07:00
Stephen Birarda	6d1bbc389d	use a sleep instead of a yield waiting for close event	2017-06-01 17:57:23 -07:00
Stephen Birarda	9fad8d1821	rename ClosureEventSender to CloseEventSender	2017-06-01 17:52:01 -07:00
Andrew Meadows	29a05d7eb4	bid immediately when creating new entity ... also clear EntityMotionState::_numInactiveUpdates on new ownership	2017-06-01 17:39:21 -07:00
Andrew Meadows	74827fc4c8	recently moved static objects added to changelist ... since static objects are not active this will make the interface release ownership of recently changed static objects	2017-06-01 17:39:21 -07:00
Andrew Meadows	e34f979ed9	add EntityMotionState::isLocallyOwned() for cleaner logic	2017-06-01 17:39:21 -07:00
Andrew Meadows	c56a6c44f8	minor formatting fix	2017-06-01 17:39:21 -07:00
Brad Davis	b9f9cddea0	Add versioning support to the KTX cache	2017-06-01 17:16:24 -07:00
David Kelly	37b738ff8b	initial cut at some UserActivities for the bubble	2017-06-01 16:46:31 -07:00
Brad Davis	3fdad14ca4	Merge pull request #10571 from jherico/ktx_tests ... FileCache refactoring and test, plus KTX unit tests	2017-06-01 16:09:14 -07:00
Stephen Birarda	0f22b07026	move session ID logging later in app startup	2017-06-01 16:07:36 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
Stephen Birarda	06b3ecfdc3	also log metaverse session ID during ctor of AccountManager	2017-06-01 15:50:56 -07:00
Dante Ruiz	77eb75db95	add .json to extension	2017-06-01 22:48:59 +01:00
Dante Ruiz	6bc53388f8	Merge branch 'master' of github.com:highfidelity/hifi into record-standard	2017-06-01 22:34:57 +01:00
Seth Alves	4c69ec4365	Merge pull request #10588 from druiz17/recorder-fix ... Changed the input recorder to store actions by strings	2017-06-01 14:34:09 -07:00
Dante Ruiz	725388043f	removed double semi-colons	2017-06-01 22:30:50 +01:00
Dante Ruiz	2a5c43026a	gzip recording data	2017-06-01 22:27:51 +01:00
Stephen Birarda	3d98f1b3ee	print metaverse session ID to debug log	2017-06-01 13:46:37 -07:00
Stephen Birarda	c513d04b52	remove crash event definition for now	2017-06-01 13:40:50 -07:00
Stephen Birarda	792d938262	send quit event during shutdown on thread, with timeout	2017-06-01 13:01:24 -07:00
Zach Fox	4e929f6d92	Merge pull request #10581 from zfox23/snapshot_fixForUrlShare ... Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't	2017-06-01 11:51:14 -07:00
Dante Ruiz	c0003f6791	Merge branch 'master' of github.com:highfidelity/hifi into record-standard	2017-06-01 19:06:50 +01:00
Dante Ruiz	9a8030cc09	Merge branch 'recorder-fix' into record-standard	2017-06-01 19:01:54 +01:00
Dante Ruiz	0e82b33d6d	final changes	2017-06-01 19:00:31 +01:00
Dante Ruiz	e52765b641	playback recording back through the standard inputs	2017-06-01 18:51:24 +01:00
David Kelly	017955dca8	Merge pull request #10587 from davidkelly/dk/5028 ... Don't allow sorting on non-sortable columns in PAL	2017-06-01 10:49:11 -07:00
Dante Ruiz	c686acc071	fixing build issue	2017-06-01 18:20:56 +01:00
Dante Ruiz	23a9209285	Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix	2017-06-01 18:06:37 +01:00
Dante Ruiz	a1e0737928	saving work	2017-06-01 18:06:06 +01:00
David Kelly	b6b2f92af2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028	2017-06-01 09:58:07 -07:00
Andrew Meadows	e27199601f	Merge pull request #10585 from samcake/orange ... Fixing warnings	2017-06-01 09:33:16 -07:00
samcake	257813ec38	comment the code	2017-06-01 09:19:02 -07:00
Dante Ruiz	36002e8b92	Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix	2017-06-01 17:01:59 +01:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00