14374 commits

Author	SHA1	Message	Date
Howard Stearns	730640068c	Merge pull request #6865 from ZappoMan/fixPrematureQuery ... fix premature octree query before preferences are loaded	2016-01-19 19:32:34 -08:00
Brad Hefta-Gaub	bcdff7ba4a	fix premature octree query before preferences are loaded	2016-01-19 13:11:11 -08:00
Andrew Meadows	feb2a82d93	Merge pull request #6856 from hyperlogic/tony/hand-grab-one-frame-lag-fix ... Avatar: Fix for one frame lag in hold action	2016-01-19 11:43:27 -08:00
Anthony J. Thibault	b750128c94	Avatar: centeralized palm rotation/position to world space calculation.	2016-01-19 11:03:00 -08:00
Brad Hefta-Gaub	fca5b29e6f	Merge pull request #6786 from AlessandroSigna/overlays ... Thread-safe access to EntityTree in OverlayPanel	2016-01-19 09:02:45 -08:00
Anthony J. Thibault	ec2f8db83a	Avatar: Fix for one frame lag in hold action ... AvatarActionHold now uses the most recent un-cached palm positions/orientations instead of the cached version from the previous frame.	2016-01-18 17:37:28 -08:00
samcake	29945bba92	Merge pull request #6837 from zzmp/feat/render-shadow ... Add RenderShadowTask	2016-01-18 15:45:51 -08:00
Howard Stearns	6f84a67453	Merge pull request #6840 from jherico/qml_cleanup ... File dialogs and modal message boxes in QML	2016-01-18 15:04:37 -08:00
Howard Stearns	5caf10beed	Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck ... Include checking the angular size of entities on the server side for LOD support	2016-01-18 14:13:34 -08:00
Brad Hefta-Gaub	d10e1cc39d	CR feedback, dead code cleanup	2016-01-18 12:09:21 -08:00
Brad Hefta-Gaub	88af387214	cleanup	2016-01-18 10:10:24 -08:00
Brad Hefta-Gaub	2774df38bc	check for entity size before including it for LOD	2016-01-18 09:06:57 -08:00
Brad Davis	5aa8398adb	Working on keyboard focus issues	2016-01-17 20:56:07 -08:00
Brad Davis	746c388f7a	Cleanup of QML windowing and message boxes	2016-01-15 23:14:49 -08:00
Andrew Meadows	8b420adbc8	namechange MotionType to PhysicsMotionType	2016-01-15 15:21:25 -08:00
Brad Hefta-Gaub	a70adc8a57	Merge pull request #6823 from jherico/tool_window ... Tool window in QML	2016-01-14 16:56:27 -08:00
Brad Hefta-Gaub	0ad39feeb6	juggle developer menus a bit	2016-01-14 13:31:01 -08:00
Brad Hefta-Gaub	2177765b09	wire up audio show level meter menu	2016-01-14 13:12:16 -08:00
Brad Davis	d924e042bc	Merge pull request #6834 from ZappoMan/hmdFixes ... fix issues with HMD lookout 2D, and cleanup	2016-01-14 12:42:23 -05:00
Brad Hefta-Gaub	6b76cf484d	fix issues with HMD lookout 2D, and cleanup	2016-01-14 08:48:55 -08:00
Andrew Meadows	82e261480f	Merge pull request #6827 from howard-stearns/physics-timing ... Physics timing	2016-01-14 08:39:29 -08:00
Brad Hefta-Gaub	8f8afabbfe	Merge pull request #6811 from Atlante45/master ... Fix skybox not always rendering correctly	2016-01-13 21:00:48 -08:00
Zach Pomerantz	2938829167	Add shadow items to stats	2016-01-13 17:49:37 -08:00
Brad Davis	b6272b7824	Migrate tool window to overlay/QML	2016-01-13 15:40:37 -08:00
howard-stearns	830dcb582a	Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing	2016-01-13 13:32:38 -08:00
howard-stearns	8a77e2ee95	Split physics perf timing into three parts: updateStates, stepSimulation, ... and harvestChanges.	2016-01-13 13:31:37 -08:00
Atlante45	205c14eb43	Remove unused headers	2016-01-13 11:47:43 -08:00
Atlante45	11dc3cd261	Move primitive rendering out of DeferredLightingEffect	2016-01-13 11:47:43 -08:00
Atlante45	12f9091dc1	Fix doInBatch lambdas	2016-01-13 11:47:43 -08:00
Atlante45	0008b1a055	Code cleanup	2016-01-12 20:49:25 -08:00
Andrew Meadows	e1ba4ff0a8	add CollisionMask entity property	2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub	cd167e43fb	Merge pull request #6812 from jherico/running_scripts ... Running scripts in QML	2016-01-12 13:40:47 -08:00
Howard Stearns	d1a72e8d63	Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation ... Move hand animation control into grab script	2016-01-12 13:02:59 -08:00
Brad Davis	dcc6739bce	Final functionality for running scripts	2016-01-12 12:40:46 -08:00
Brad Davis	21534cbde0	Layout for running scripts	2016-01-12 12:40:42 -08:00
Brad Hefta-Gaub	4c98c3a7a5	Merge pull request #6815 from ctrlaltdavid/20773 ... Resume Interface in 1st person if exit in 1st person	2016-01-12 12:05:12 -08:00
Brad Hefta-Gaub	8619be28ef	Merge pull request #6816 from ctrlaltdavid/20772 ... Don't use cache when use load script "from Disk" button	2016-01-12 11:46:41 -08:00
Brad Hefta-Gaub	5b9607ca29	fix merge	2016-01-12 10:36:59 -08:00
Brad Hefta-Gaub	6ac9b737d2	Merge branch 'master' of https://github.com/highfidelity/hifi into fixCrashRedux ... Conflicts: interface/src/Application.cpp	2016-01-12 10:35:24 -08:00
Brad Hefta-Gaub	5ec5ff9ad0	temporary fix to crash on startup	2016-01-12 09:11:20 -08:00
David Rowe	71ed8d2a64	Change camera to first person if start up with it in camera entity mode ... Same as happens if start up with camera in independent mode.	2016-01-12 17:39:39 +13:00
David Rowe	92d63c48dd	Resume Interface in 1st person if exited in 1st person	2016-01-12 17:38:16 +13:00
David Rowe	74515f9089	Don't use cache when user loads script from disk	2016-01-12 16:09:40 +13:00
Zach Pomerantz	801dde7950	Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape	2016-01-11 16:38:04 -08:00
Brad Davis	d1d178787c	PR comments	2016-01-11 12:55:23 -08:00
Brad Davis	d28f80aa07	Moving running scripts functionality to scripting library	2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub	dfba05ae5f	CR feedback	2016-01-11 11:07:07 -08:00
Anthony J. Thibault	8f78a0624c	Merge branch 'master' into tony/grab-script-hand-animation	2016-01-11 10:16:51 -08:00
Zach Pomerantz	c8d3342aca	Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape	2016-01-08 17:04:02 -08:00
Brad Hefta-Gaub	e2a3903def	add support for advanced/developer plugins and change diplay modes to match spec	2016-01-08 16:58:25 -08:00