4235 commits

Author	SHA1	Message	Date
Howard Stearns	f8f2a067a1	whitespace	2015-09-11 12:59:07 -07:00
Howard Stearns	02fba12a48	Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings	2015-09-11 11:53:19 -07:00
Howard Stearns	67ce0966d1	Rationalize the rig state setters.	2015-09-11 11:52:20 -07:00
Brad Davis	7fecd3261d	Fixing bad merge	2015-09-11 11:40:57 -07:00
Brad Davis	244795b629	Merge branch 'homer' into temp ... Conflicts: interface/src/Application.cpp	2015-09-11 11:21:29 -07:00
Atlante45	449d6a04d8	CR	2015-09-11 14:21:56 +02:00
Atlante45	42d1ab3745	Remove accidentally added header	2015-09-11 14:21:55 +02:00
Atlante45	5808658958	Make NodeJSONStats reliable	2015-09-11 14:21:53 +02:00
Brad Davis	e9edbb9dd1	Can't promote readlock to writelock	2015-09-10 22:52:40 -07:00
Brad Davis	aa989c3687	Fixing some entity race condition crashes	2015-09-10 20:53:17 -07:00
David Rowe	4aa553c183	Stop DDE and EyeTracker early but don't destroy until later in shutdown	2015-09-10 14:53:56 -07:00
Andrew Meadows	35b894872d	Merge pull request #5753 from ctrlaltdavid/20671 ... Terminate DDE earlier during shut-down and always at start-up	2015-09-10 07:46:53 -07:00
Brad Hefta-Gaub	f29bcd8b6a	Merge pull request #5755 from jherico/lisa ... Fix possible hang when switching out of Oculus mode	2015-09-09 19:24:00 -07:00
Brad Davis	382de2b4aa	Fix possible hang when switching out of Oculus mode	2015-09-09 14:09:01 -07:00
Howard Stearns	ed2ed525b2	Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate.	2015-09-09 12:15:48 -07:00
David Rowe	01d7e68dbb	Terminate DDE earlier during shut-down and always at start-up	2015-09-09 11:29:57 -07:00
Seth Alves	9c4fdfd653	merge from upstream	2015-09-08 18:01:07 -07:00
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Howard Stearns	26f63a44fc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 15:30:22 -07:00
Howard Stearns	27f4bca0a4	Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! ... Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.	2015-09-08 14:49:58 -07:00
Seth Alves	31fcd55d47	octree uses shared pointers	2015-09-08 11:59:48 -07:00
Stephen Birarda	25aeda2e18	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-08 08:40:51 -07:00
Howard Stearns	d472fd66ff	Cleanup.	2015-09-07 17:26:22 -07:00
Howard Stearns	efeaf21305	Checkpoint smoother.	2015-09-07 16:32:51 -07:00
Howard Stearns	0065c64b31	Snapshot of no-judder, before cleanup.	2015-09-07 09:57:05 -07:00
James B. Pollack	670c5ee484	Merge pull request #5723 from jherico/lisa ... Toggle mute while holding the hydras	2015-09-06 21:45:47 -07:00
David Rowe	6923e3ce70	Fix logging of intentionally crashing Interface	2015-09-06 16:28:55 -07:00
Brad Davis	644e81e20b	Toggle mute while holding the hydras	2015-09-04 16:19:58 -07:00
Brad Hefta-Gaub	b63e15f2e9	fix a bug in bad PPS calculation	2015-09-04 15:06:56 -07:00
Howard Stearns	d3106de7c1	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-04 14:32:58 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Anthony J. Thibault	df28c7bf1a	Merge branch 'master' into ajt/new-anim-system	2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub	20bd14c8db	Merge pull request #5684 from rabedik/fxaa ... Post-process anti-aliasing effect	2015-09-04 09:01:39 -07:00
Howard Stearns	c0fec44f32	Menu item to switch between threaded and not (without restart!).	2015-09-03 19:34:25 -07:00
Anthony J. Thibault	3716d5612b	Merge branch 'master' into ajt/new-anim-system	2015-09-03 19:20:06 -07:00
Howard Stearns	32eb51d0fa	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-03 13:55:57 -07:00
Brad Davis	1f83d04423	Fix oculus crash on switching display plugin to something else	2015-09-02 18:28:43 -07:00
Anthony J. Thibault	de31b92fd5	Merge branch 'master' into ajt/new-anim-system	2015-09-02 17:53:56 -07:00
Andrew Meadows	992bd5c9d2	fix sixense and vive rotation readings for palms	2015-09-02 11:37:36 -07:00
Howard Stearns	8cf71f285d	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-01 16:03:40 -07:00
Stephen Birarda	33f6933544	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-01 14:36:16 -06:00
Anthony J. Thibault	2401e6cc4b	Merge branch 'master' into ajt/new-anim-system	2015-09-01 10:58:38 -07:00
Stephen Birarda	de2bfd0d0d	some QThread cleanup and fix in Socket	2015-08-31 11:30:31 -07:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Anthony J. Thibault	54aa0677f6	Merge branch 'master' into ajt/new-anim-system	2015-08-31 10:47:50 -07:00
Raffi Bedikian	59a758b5ec	Add AA state to RenderContext and Menu	2015-08-30 20:38:05 -07:00
Seth Alves	752c787f0b	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-28 12:50:31 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Howard Stearns	b3a919a5ca	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-27 13:46:12 -07:00
Seth Alves	e97e7de19c	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-27 13:19:15 -07:00
Stephen Birarda	229015a5da	don't allow asset-server upload if no server present	2015-08-27 12:21:38 -07:00
Brad Hefta-Gaub	79a9694d4a	Merge pull request #5648 from ctrlaltdavid/20663 ... Clean Interface.ini after a crash	2015-08-27 10:52:25 -07:00
Anthony J. Thibault	a04f356857	Merge branch 'master' into ajt/new-anim-system	2015-08-27 09:32:53 -07:00
Seth Alves	435863d1f0	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-26 17:33:59 -07:00
Ryan Huffman	4105b7369c	Remove AssetScriptingInterface	2015-08-26 15:55:29 -07:00
Brad Davis	270f2f7a3b	Fixing framerate limit, moving vsync to 2d plugin	2015-08-26 15:47:45 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Howard Stearns	0e18395fd0	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-26 12:04:28 -07:00
Anthony J. Thibault	46c1e008bc	Merge branch 'master' into ajt/new-anim-system	2015-08-26 10:37:39 -07:00
Seth Alves	23dbbcc7bb	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-26 09:42:20 -07:00
Andrew Meadows	45c846572e	Merge pull request #5645 from jherico/maggie ... Fixing problems reported by static analysis tool	2015-08-26 08:31:05 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Hefta-Gaub	b19f1e0631	Merge pull request #5658 from ctrlaltdavid/20653 ... Add Desktop object to JavaScript with width and height properties	2015-08-25 23:18:20 -07:00
Howard Stearns	38bc8634de	displayPlugin is not thread safe, and switch from simulate rate to interval in prep for sleep.	2015-08-25 21:26:46 -07:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Brad Davis	f176003dad	Fixing aspect ratio on stereo plugins	2015-08-25 19:05:31 -07:00
Howard Stearns	b8ca604bf8	Checkpoint before GenericThread.	2015-08-25 16:17:50 -07:00
David Rowe	9d3d104ec3	Add Desktop object to JavaScript with width and height properties	2015-08-25 16:13:36 -07:00
Howard Stearns	2ca4768766	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-25 10:44:54 -07:00
Seth Alves	91254245e4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-24 20:21:24 -07:00
Brad Hefta-Gaub	34e32ddaeb	Merge pull request #5636 from howard-stearns/marketplace-avatars ... marketplace avatars	2015-08-24 17:49:20 -07:00
Howard Stearns	828509e8eb	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-24 15:01:46 -07:00
Anthony J. Thibault	fa5256eefd	Merge branch 'master' into ajt/new-anim-system	2015-08-24 14:32:28 -07:00
David Rowe	f6cf77ae68	Add Developer > Display Crash Options menu item ... Is enabled by default. Disabling it stops the display of the crash handling options dialog at start-up.	2015-08-24 13:24:31 -07:00
David Rowe	9c782f6a6d	Display dialog of crash handling options at startup if Interface crashed ... Default option and Esc continue without taking any action.	2015-08-24 12:45:35 -07:00
David Rowe	63ad972576	Write and delete "application is running" marker file	2015-08-24 11:09:41 -07:00
David Rowe	07c9a0e2bb	Add Developer > Crash Interface menu item	2015-08-24 10:48:58 -07:00
Thijs Wenker	0f8cf80d45	Merge branch 'master' of https://github.com/worklist/hifi into 20660	2015-08-23 19:53:50 +02:00
Thijs Wenker	748625399e	"View -> World Axes" menu option	2015-08-23 17:59:58 +02:00
Brad Davis	d3135dcfa6	Stereo rendering work	2015-08-22 16:15:10 -07:00
Howard Stearns	74fd640f16	Restore the ability to change avatars from the edit.js marketplace button.	2015-08-21 16:49:07 -07:00
Seth Alves	fdad8fc651	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-21 13:19:19 -07:00
Howard Stearns	e84cc03bcc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-21 11:35:42 -07:00
samcake	66087872a3	Merge pull request #5621 from highfidelity/stereo ... New stereo rendering mechanism	2015-08-21 11:23:14 -07:00
Seth Alves	105470bf26	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-21 11:02:16 -07:00
Seth Alves	6db0442fda	allow for asynchronous building of collision shape	2015-08-21 10:48:26 -07:00
Brad Davis	b8b0917d9d	Attempting to fix judder issues	2015-08-21 10:01:11 -07:00
ZappoMan	a0552050b0	set vsync on startup	2015-08-21 08:23:18 -07:00
Howard Stearns	ae3e052e72	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-21 08:13:44 -07:00
Brad Davis	1e074ab81c	Remove superfluous clear	2015-08-21 00:29:28 -07:00
Brad Davis	cc037c8828	Fix culling calculations in HMD with new stereo mechanism	2015-08-21 00:29:27 -07:00
Brad Davis	476e5edb32	Fixing HMD wobble	2015-08-21 00:29:26 -07:00
Brad Davis	7fb491e48c	Cleanup plugin interface, break up oculus plugins	2015-08-21 00:29:25 -07:00
Brad Davis	76f236adf6	New stereo rendering implementation	2015-08-21 00:29:24 -07:00
ZappoMan	bd29fb2474	fix ifdef	2015-08-20 19:33:39 -07:00
ZappoMan	06b2a88fb6	toggle menu near top of window	2015-08-20 19:33:22 -07:00
ZappoMan	9f501d4d72	first cut at attempting to hide menu in full screen	2015-08-20 19:33:06 -07:00
ZappoMan	cd050b2e60	don't show hmd tools for direct mod HMDs	2015-08-20 09:53:58 -07:00