overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 00:06:17 +02:00

Author	SHA1	Message	Date
Atlante45	4429e144f4	Fix merge accidental code delete	2015-01-13 11:10:13 -08:00
Atlante45	2a82ff9768	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: assignment-client/src/voxels/VoxelServer.cpp interface/src/Application.cpp interface/src/Audio.cpp interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/Util.cpp interface/src/avatar/MyAvatar.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp libraries/networking/src/NodeList.cpp libraries/shared/src/DependencyManager.h	2015-01-13 11:03:14 -08:00
Atlante45	cf7089e145	Move constant back to Menu	2015-01-12 18:49:05 -08:00
Atlante45	9ce405a744	Text3DOverlay forward definition	2015-01-12 17:46:38 -08:00
Atlante45	7d39b45f16	Hopefully fixes the windows compile error	2015-01-12 17:34:07 -08:00
Atlante45	74d819fe25	Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating	2015-01-12 16:42:35 -08:00
Clément Brisset	60aafba0ce	Merge pull request #4077 from huffman/fix-render-hud-windows-linux Fix gl projection matrix stack overflow when rendering to HUD	2015-01-12 16:22:09 -08:00
Stephen Birarda	661221a189	repairs to AudioScriptingInterface playSound	2015-01-12 16:04:00 -08:00
Atlante45	934d8d58ef	Move some constants out of Menu class files	2015-01-12 16:03:15 -08:00
Atlante45	e30b119464	Some simple code cleanup	2015-01-12 15:55:25 -08:00
Thijs Wenker	7acb4e4716	Merge branch 'master' of https://github.com/worklist/hifi into 20224	2015-01-13 00:43:47 +01:00
Thijs Wenker	3da5677aaf	added HMD interface to toggle magnifier	2015-01-13 00:43:16 +01:00
Atlante45	59c9e0bb50	Wire CachesSizeDialog in Menu	2015-01-12 15:19:36 -08:00
Atlante45	7bf57b3cca	Removed unecessary method/cleanup header	2015-01-12 14:53:31 -08:00
Atlante45	e62fbe2557	Cleanup some headers	2015-01-12 14:09:26 -08:00
Atlante45	fd2b0edf7a	Alphabetical order	2015-01-12 14:01:56 -08:00
Atlante45	894c4c9d59	All dialogs in Menu are QPointers	2015-01-12 14:00:23 -08:00
Atlante45	19f321c171	Fixed caches not in DM	2015-01-12 13:56:41 -08:00
Atlante45	38dc1643ef	New Caches size dialog	2015-01-12 12:46:11 -08:00
Atlante45	5be5dc716f	Make sure every widget has diolog has a parent	2015-01-12 12:45:50 -08:00
Andrzej Kapolka	cad8313e56	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2015-01-12 12:00:20 -08:00
David Rowe	022760be1d	Remove menu item for Show Voxel Nodes which is no longer available And change Show Entity Nodes shortcut from Ctrl-Shift-2 to Ctrl-Shift-1.	2015-01-12 11:52:51 -08:00
Atlante45	98dd401ea3	Remove duplicate definition	2015-01-12 11:12:19 -08:00
Stephen Birarda	d30490c760	resolve conflicts on merge with upstream master	2015-01-12 09:25:37 -08:00
Thijs Wenker	e4fd027d15	"load script from URL" button in Running scripts window	2015-01-12 00:49:41 +01:00
Thijs Wenker	8feb51013b	running script window treeview fully works	2015-01-12 00:41:38 +01:00
Andrzej Kapolka	d002359989	Stitching improvement.	2015-01-09 16:43:51 -08:00
Thijs Wenker	1d6066c837	replaced GetVersionEx with new Version helpers to resolve deprecation warnings.	2015-01-10 01:41:07 +01:00
Thijs Wenker	d84a65a5f9	running scripts list -> treeview initial	2015-01-10 01:29:06 +01:00
Ryan Huffman	e00b629133	Fix gl projection matrix stack overflow when rendering to HUD The projection matrix stack is considerably smaller than the modelview stack and was overflowing on Windows and Linux machines that were tested.	2015-01-09 16:11:17 -08:00
Andrzej Kapolka	e3074d726b	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: libraries/metavoxels/src/Spanner.cpp	2015-01-09 11:52:05 -08:00
Andrzej Kapolka	d82f269263	Don't show grid for tools where it isn't needed, started on "fill" tool.	2015-01-09 11:46:40 -08:00
Atlante45	05d2887c94	Move Torso twist to HeadData with Lean	2015-01-09 11:15:01 -08:00
ZappoMan	925b13cc93	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-09 09:19:53 -08:00
Philip Rosedale	285e588266	Merge pull request #4072 from Atlante45/network_replies_cleanup Windows crash fix	2015-01-09 07:42:36 -08:00
Atlante45	891d8d5abf	Removed unecessary foreach	2015-01-08 18:22:25 -08:00
Atlante45	1c4903c346	Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix	2015-01-08 16:33:01 -08:00
ZappoMan	a03c2b79fa	first cut at adding colors to GeometryCache and supporting batch internally	2015-01-08 15:52:33 -08:00
Andrzej Kapolka	c99e2c3ec6	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: libraries/networking/src/PacketHeaders.cpp	2015-01-08 14:57:03 -08:00
Andrzej Kapolka	8b2baf65e8	Color/material fix.	2015-01-08 14:13:23 -08:00
Andrzej Kapolka	ec32739689	CSG improvements.	2015-01-08 12:52:52 -08:00
Atlante45	e73f8baf93	Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix	2015-01-08 11:54:54 -08:00
Atlante45	4157a3ca40	Remove lean from head rotation	2015-01-08 11:33:14 -08:00
David Rowe	198226450a	Suppress warnings about inconsistent DLL linkage of lrintf in Windows This warning in Windows builds is due to redefinition of lrintf in gverb library's ladspa-util.h file.	2015-01-08 11:26:32 -08:00
Atlante45	0bae05b924	Remove chat message	2015-01-08 11:25:53 -08:00
Andrew Meadows	25b9b50468	Merge pull request #4065 from ZappoMan/voxelEctomy fix some warnings and remove more references to voxels	2015-01-08 08:07:06 -08:00
Andrzej Kapolka	4c3163fae8	Closer to working stitching.	2015-01-07 17:24:26 -08:00
ZappoMan	91351d7700	fix warnings	2015-01-07 16:09:26 -08:00
ZappoMan	806e691bbf	restore camera lookAt and keepLookingAt features	2015-01-07 13:41:07 -08:00
Brad Hefta-Gaub	ddea2c4a68	Merge pull request #4058 from huffman/entity-tool-updates Entity tool updates	2015-01-07 12:42:47 -08:00
Ryan Huffman	b471c1fa71	Update hotkey for audio stats	2015-01-07 12:15:53 -08:00
David Rowe	6c4932f9d0	Coding standard	2015-01-07 11:24:10 -08:00
David Rowe	40274df279	Add downloads information changed event for JavaScript	2015-01-07 11:20:46 -08:00
Andrzej Kapolka	1abf111d7f	Index fix.	2015-01-07 11:19:40 -08:00
Brad Hefta-Gaub	8ad21d61c4	Merge pull request #4056 from huffman/audio-buffer-starvation-detection Audio buffer starvation detection	2015-01-07 11:18:34 -08:00
Ryan Huffman	50fcf4ba8f	Remove output buffer starvation log warnings	2015-01-07 11:06:36 -08:00
Ryan Huffman	19639367bf	Use usecTimestampNow instead of QDateTime::currentMSecsSinceEpoch	2015-01-07 11:04:09 -08:00
Brad Hefta-Gaub	476887b7ef	Merge pull request #4055 from huffman/fix-overlays Update setting drawOnHUD and update to write lock for editOverlay	2015-01-07 10:56:18 -08:00
Andrew Meadows	d3d80a0b1b	Merge pull request #4049 from ZappoMan/gpuStreamizing Work on removing immediate mode OpenGL from application	2015-01-07 10:55:15 -08:00
Andrew Meadows	559ec41bfe	Merge pull request #4051 from Atlante45/master Restored addReverb default arg	2015-01-07 10:25:26 -08:00
Ryan Huffman	40f277b630	Fix use of dependency manager	2015-01-07 10:20:49 -08:00
Ryan Huffman	d113b3f85c	Update getAudio() calls to use DependencyManager instead	2015-01-07 09:48:41 -08:00
Stephen Birarda	35a69ce049	remove the faceplus find module	2015-01-07 09:48:12 -08:00
Ryan Huffman	cb80e18ad0	Update default detection period to be int	2015-01-07 09:47:24 -08:00
Ryan Huffman	a07d92b6ea	Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection Conflicts: interface/src/Audio.cpp interface/src/Audio.h interface/src/Menu.cpp interface/src/ui/PreferencesDialog.cpp	2015-01-07 09:46:07 -08:00
Ryan Huffman	08776aec9d	Add output starve settings to preferences	2015-01-07 09:37:17 -08:00
Ryan Huffman	a660e7efed	Add output starve values to settings	2015-01-07 09:37:03 -08:00
Ryan Huffman	77aecaabd0	Remove extra switch output call	2015-01-07 09:36:26 -08:00
Ryan Huffman	288e2ee45a	Add output buffer starve detection to audio	2015-01-07 09:36:14 -08:00
Ryan Huffman	68a9d80ba3	Update setting drawOnHUD and update to write lock for editOverlay	2015-01-06 18:14:40 -08:00
Andrzej Kapolka	48fb9a27ba	Progress on heightfield/voxel interface.	2015-01-06 17:55:04 -08:00
ZappoMan	e0338dd787	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-06 16:42:25 -08:00
Atlante45	29839df9fe	Restored addReverb default arg	2015-01-06 16:35:30 -08:00
Clément Brisset	fb6fb8a38d	Merge pull request #4050 from birarda/lasagna-not-spaghetti put back current address storage in Menu	2015-01-06 16:29:52 -08:00
Stephen Birarda	9c191be106	use the AddressManager's method to store current address	2015-01-06 16:13:06 -08:00
Stephen Birarda	8c8a925085	put back current address storage in Menu	2015-01-06 16:06:07 -08:00
David Rowe	8b0d859686	Add method to access downloads information in JavaScript	2015-01-06 15:54:07 -08:00
ZappoMan	fb68037b74	more removal of immediate mode	2015-01-06 15:51:39 -08:00
ZappoMan	d796ebf632	migrate circle overlays to use renderVertices()	2015-01-06 14:43:42 -08:00
Andrzej Kapolka	a20b12ad44	Material painting for stacks.	2015-01-06 14:25:26 -08:00
ZappoMan	1bfce7d876	more removal of immediate mode	2015-01-06 14:14:13 -08:00
ZappoMan	0d63391be8	formatting	2015-01-06 12:31:42 -08:00
ZappoMan	873403a333	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing Conflicts: interface/src/Audio.cpp interface/src/Audio.h interface/src/Menu.cpp interface/src/Menu.h	2015-01-06 12:27:16 -08:00
Atlante45	9d5ff5d274	Fix mouse disappearing in the menus on Windows	2015-01-06 10:36:42 -08:00
Philip Rosedale	413cbacbc1	Merge pull request #4043 from ZappoMan/voxelEctomy more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 10:07:38 -08:00
ZappoMan	ac1f7c9a84	multi-mode renderVertices	2015-01-06 09:52:27 -08:00
Stephen Birarda	5fadfa8c17	remove doubled friend declaration, is in macro	2015-01-06 09:35:11 -08:00
ZappoMan	b940dcfdb3	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
Andrew Meadows	f3255eeb0e	Merge pull request #4008 from birarda/lasagna-not-spaghetti some Audio cleanup in prep for audio untangle	2015-01-06 09:13:12 -08:00
ZappoMan	0606861b66	dashed lines in GeometryCache	2015-01-05 21:45:17 -08:00
ZappoMan	56a3f98b27	renderLinestrip() for audio scope and 3d rectangle overlays	2015-01-05 21:04:56 -08:00
ZappoMan	a9b7367fa9	more work on eliminating immediate mode calls	2015-01-05 20:51:05 -08:00
ZappoMan	9545bd1907	add alternate renderGrid for audio scope	2015-01-05 19:34:37 -08:00
Andrzej Kapolka	5a46f3e20d	Material/ray testing bits.	2015-01-05 18:37:47 -08:00
ZappoMan	0e943ae240	remove render view frustum mode	2015-01-05 17:23:10 -08:00
ZappoMan	bd1612f6a4	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-05 16:51:31 -08:00
Sam Gateau	2fdcbb1a97	changing the atmoshpere position	2015-01-05 16:46:42 -08:00
ZappoMan	7cf4bd1860	remove head mouse	2015-01-05 16:29:02 -08:00
ZappoMan	8b22b166ac	convert lookat vectors and laser pointers to use renderLine()	2015-01-05 16:06:35 -08:00
ZappoMan	a20fa1242d	first cut are removing immediate mode GL_LINES	2015-01-05 15:46:48 -08:00
Stephen Birarda	f116d0bf5d	block until audio IO stops on app quit	2015-01-05 15:20:36 -08:00
Atlante45	be050b0469	Added missing deletes	2015-01-05 15:13:07 -08:00
Sam Gateau	56758759e5	making the sun position a direction	2015-01-05 15:02:12 -08:00
Stephen Birarda	dbe4b6ccc0	include QDesktopServices in UpdateDialog	2015-01-05 14:45:41 -08:00
Stephen Birarda	9bcacaf512	put back declared constructor, inputReceived signal	2015-01-05 14:43:23 -08:00
Stephen Birarda	53ac1a2bb2	don't include QtGui from UpdateDialog	2015-01-05 14:41:38 -08:00
Stephen Birarda	51bba4884f	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
ZappoMan	c2d45df541	add renderBevelCornersRect to GeometryCache	2015-01-05 14:39:14 -08:00
Andrzej Kapolka	808cb2e4bc	Substantial cleanup, working on interface between heightfields and dual contour surfaces.	2015-01-05 14:33:40 -08:00
Ryan Huffman	defb2cbffd	Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size Conflicts: interface/src/Audio.cpp	2015-01-05 14:07:06 -08:00
ZappoMan	bd38df2a15	replace GL_LINES with a call to renderWireBox for node bounds	2015-01-05 13:58:58 -08:00
Sam Gateau	f03b253260	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2015-01-05 13:23:14 -08:00
Andrew Meadows	162854c5a5	Merge pull request #4025 from ZappoMan/voxelEctomy Voxel ectomy	2015-01-05 13:20:30 -08:00
Sam Gateau	3e4cbfd2dc	clean code	2015-01-05 13:12:28 -08:00
Sam Gateau	7529b3d1b0	clean code	2015-01-05 13:10:32 -08:00
Ryan Huffman	c5e42aa50e	Merge pull request #4035 from ZappoMan/audioStarvation add audio starvation detection	2015-01-05 13:05:27 -08:00
Sam Gateau	0b8b4c6d08	for simple shadow map, cover 2 regions of the view frustum and not just one for similar quality	2015-01-05 13:01:21 -08:00
Brad Hefta-Gaub	58a2a5eb83	Merge pull request #4027 from huffman/grid-shader-updates Grid shader updates	2015-01-05 13:00:05 -08:00
Sam Gateau	b8e44a3e7a	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2015-01-05 11:27:53 -08:00
Sam Gateau	458ea6759e	Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes	2015-01-05 11:27:29 -08:00
Stephen Birarda	6d8f319e51	remove Audio methods re-introduced after merge	2015-01-05 09:27:01 -08:00
Stephen Birarda	dfb02aea0c	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
Brad Hefta-Gaub	89e499a78f	only active sixsense palms	2015-01-04 12:26:30 -08:00
Philip Rosedale	218ae9c9d8	Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity	2015-01-04 12:12:57 -08:00
Philip Rosedale	fefcdfa9f6	Revert "Hydra hands deactivate when placed back on controller base"	2015-01-03 21:03:23 -08:00
Andrzej Kapolka	547c6db0a4	Slight simplification.	2015-01-02 17:43:41 -08:00
ZappoMan	b0ac9e22c1	Merge branch 'master' of https://github.com/highfidelity/hifi into audioStarvation	2015-01-02 17:33:25 -08:00
ZappoMan	1df54cffd6	add audio starvation detection	2015-01-02 17:28:51 -08:00
Andrzej Kapolka	a504d03b14	Normal fix.	2015-01-02 17:14:17 -08:00
Ryan Huffman	bbfe2ff1b9	Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size	2015-01-02 17:08:02 -08:00
Ryan Huffman	4a72a4be83	Add audio output buffer size to settings	2015-01-02 17:03:01 -08:00
Ryan Huffman	0d71d25063	Add min/max for audio buffer size	2015-01-02 17:02:44 -08:00
Ryan Huffman	4c5bb66bd7	Add audio output buffer size to preferences	2015-01-02 16:01:04 -08:00
Ryan Huffman	f97109f6a4	Add outputBufferSizeFrames property to Audio	2015-01-02 16:00:07 -08:00
Andrzej Kapolka	3959f99910	Fixed voxel textures.	2015-01-02 13:57:27 -08:00
Sam Gateau	ef7c002237	Improving the shadow effect with lightmaps	2015-01-02 10:31:34 -08:00
Andrzej Kapolka	e242459ea2	More render progress.	2014-12-31 17:33:43 -08:00
Andrzej Kapolka	08dfd28ec0	More rendering bits.	2014-12-31 15:53:38 -08:00
Ryan Huffman	b6b2388d41	Update grid rendering to fade from center location rather than distance from camera	2014-12-31 11:15:44 -08:00
ZappoMan	9630279459	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy Conflicts: examples/editVoxels.js examples/fallingSand.js examples/growTrees.js interface/src/Application.cpp interface/src/Application.h libraries/avatars/CMakeLists.txt libraries/entities/src/EntityItem.h	2014-12-31 10:50:53 -08:00
Brad Hefta-Gaub	43e6ba77fa	Merge pull request #4007 from AndrewMeadows/inertia Bullet physics part 1	2014-12-31 10:33:00 -08:00
Brad Hefta-Gaub	d47b0a33ea	Merge pull request #3995 from huffman/camera-display Camera tool - orientation + mode display	2014-12-31 10:32:31 -08:00
Ryan Huffman	7478b631da	Move write lock in Overlays::overlayDrawOnChanged to encompass reads	2014-12-31 10:16:29 -08:00
Ryan Huffman	5caec4dea5	Update overlays to handle updates in drawOnHUD after creation	2014-12-31 10:15:15 -08:00
Andrew Meadows	ec1ef39a7f	Merge pull request #4023 from PhilipRosedale/master Torso twists to follow head, fix bug with head rotations	2014-12-31 08:01:39 -08:00
Philip Rosedale	104f7b7576	make formula more readable	2014-12-30 20:34:12 -08:00
ZappoMan	5cef7d0e9d	more voxelEctomy	2014-12-30 20:24:27 -08:00
ZappoMan	95bb125e48	more voxelEctomy	2014-12-30 20:13:57 -08:00
ZappoMan	27d8ccb51e	more voxelEctomy	2014-12-30 19:58:04 -08:00
ZappoMan	f1de9cabe9	comment	2014-12-30 19:07:32 -08:00
ZappoMan	49d8f2b2f5	more work on voxelEctomy	2014-12-30 18:52:33 -08:00
ZappoMan	141e231958	more work on voxelEctomy	2014-12-30 18:41:56 -08:00
Andrzej Kapolka	83967d49cf	More rendering bits.	2014-12-30 18:16:49 -08:00
ZappoMan	4ea9bbc309	first major pass at voxelEctomy	2014-12-30 18:08:58 -08:00
Philip Rosedale	dc9937e11a	only twist own body, remove unused head functions	2014-12-30 17:02:53 -08:00
Philip Rosedale	98cbb2355f	Merge branch 'master' of https://github.com/worklist/hifi	2014-12-30 17:00:38 -08:00
ZappoMan	2a129b6635	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy	2014-12-30 16:49:38 -08:00
samcake	20d66d201e	Merge pull request #4020 from ZappoMan/gpuStreamizing Improvements to GeometryCache::renderQuad()	2014-12-30 16:49:16 -08:00
Philip Rosedale	b76f5bf272	Merge branch 'master' of https://github.com/worklist/hifi	2014-12-30 15:41:06 -08:00
Andrzej Kapolka	de4776ef08	More progress on rendering.	2014-12-30 15:36:22 -08:00
Ryan Huffman	3bfc298349	Remove extraneous getDrawonHUD call	2014-12-30 15:31:08 -08:00
Ryan Huffman	929200bc76	Remove qDebug	2014-12-30 15:30:53 -08:00
Philip Rosedale	f4f43d6b38	added twisting of torso to follow head, fixed bug with body rotation not factored out of head rotation, removed credits from title bar	2014-12-30 15:11:32 -08:00
Ryan Huffman	0105906dc7	Merge branch 'master' of github.com:highfidelity/hifi into camera-display Conflicts: examples/editEntities.js	2014-12-30 15:02:59 -08:00
Ryan Huffman	2b835e621c	Rename 2D -> HUD, 3D -> World in Overlays	2014-12-30 14:50:17 -08:00
ZappoMan	e1d8022409	working on removing voxels	2014-12-30 14:11:31 -08:00
ZappoMan	fbfa40e3c9	remove hair	2014-12-30 13:44:25 -08:00
ZappoMan	eb4b8291d7	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2014-12-30 13:28:49 -08:00
Andrzej Kapolka	135e3bf574	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-30 13:25:57 -08:00
Andrzej Kapolka	0d07875f94	Fix overflow warning.	2014-12-30 12:54:12 -08:00
ZappoMan	be137534b5	first cut at registered quads to reduce copies of constantly changing quads	2014-12-30 12:38:16 -08:00
Clément Brisset	5f07e3425d	Merge pull request #4015 from PhilipRosedale/master Hydra hands deactivate when placed back on controller base	2014-12-30 12:04:16 -08:00
ZappoMan	a4520f6a07	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2014-12-30 10:27:06 -08:00
Philip Rosedale	ca35520796	Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity	2014-12-29 22:24:16 -08:00
Andrzej Kapolka	fbd4ca5c08	More work on rendering.	2014-12-29 18:37:06 -08:00
dev	c99ad77799	fixing the size of the name displayed on screen	2014-12-29 16:45:14 -08:00
Andrzej Kapolka	10fdb01436	Fix for toggling Hermite display.	2014-12-29 15:16:40 -08:00
Andrzej Kapolka	c78d38b925	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-29 14:38:17 -08:00
Andrzej Kapolka	84a2a8b83d	Working on rendering.	2014-12-29 14:37:53 -08:00
Stephen Birarda	ba09bbae3b	use arrow notation for address manager in application	2014-12-29 11:02:45 -07:00
Stephen Birarda	c7a5f3c86c	resolve conflicts and merge with upstream master	2014-12-29 10:59:42 -07:00
Andrew Meadows	9b7e50858a	merge upstream/master into andrew/inertia Conflicts: libraries/avatars/CMakeLists.txt libraries/entities/CMakeLists.txt	2014-12-29 09:15:49 -08:00
ZappoMan	0790bd77b7	almost completely eliminate immediate mode QUADS	2014-12-24 11:14:50 -08:00
ZappoMan	02a1721185	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2014-12-24 10:25:41 -08:00
Philip Rosedale	0ef26b1446	Merge pull request #4004 from Atlante45/modeluploader_scripting_interface Entity upload	2014-12-23 16:58:52 -08:00
Atlante45	2a54ef01ef	Set texture limit back to 1024	2014-12-23 15:06:22 -08:00
Atlante45	da636ca918	ModelUploader only has static methods accessible	2014-12-23 14:00:23 -08:00
Atlante45	f317b54017	Broke down ModelUploader::zip()	2014-12-23 13:48:13 -08:00
Stephen Birarda	0a66b23efa	remove current address from address bar dialog	2014-12-23 13:33:19 -08:00
Atlante45	879c3e2fd0	Add entity model upload	2014-12-23 12:30:00 -08:00
ZappoMan	1f307e9667	more work on removing immediate mode GL_QUADS	2014-12-23 09:50:38 -08:00
ZappoMan	3d42d532e4	more work on removing immediate mode GL_QUADS	2014-12-22 17:43:02 -08:00
Atlante45	55370477db	Remove Application dependency	2014-12-22 16:40:24 -08:00
ZappoMan	14458ac8fd	first pass at removing immediate mode GL_QUADS	2014-12-22 13:47:18 -08:00
Atlante45	327daacecd	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp libraries/networking/src/NodeList.cpp	2014-12-22 13:34:18 -08:00
Brad Hefta-Gaub	483155f246	Merge pull request #3989 from birarda/master fix luckily linked dependencies in prep for shared hifi libraries	2014-12-21 11:34:43 -08:00
Brad Hefta-Gaub	6bcc4ec896	Merge pull request #3996 from huffman/fix-overlay-vertices Fix quad vertices for ImageOverlay and TextOverlay	2014-12-20 05:40:54 -08:00
Andrzej Kapolka	4153e32f57	Normal fix.	2014-12-19 18:31:49 -08:00
Brad Hefta-Gaub	07102c6a29	Merge pull request #3991 from huffman/fix-defaults-url Fix default scripts url to use s3.amazonaws.com	2014-12-19 16:06:59 -08:00
Ryan Huffman	25a78534aa	Fix quad vertices for ImageOverlay and TextOverlay	2014-12-19 15:52:31 -08:00
Andrzej Kapolka	2711b3f312	Closer to working edits.	2014-12-19 15:37:58 -08:00
Ryan Huffman	468c564566	Replace glutSolidCube with GeometryCache::renderSolidCube	2014-12-19 15:29:00 -08:00
Ryan Huffman	7249a7e299	Merge branch 'master' of github.com:highfidelity/hifi into camera-display Conflicts: interface/src/ui/ApplicationOverlay.cpp	2014-12-19 15:27:33 -08:00
Stephen Birarda	9bd0bc671b	resolve conflicts on merge with upstream master	2014-12-19 14:48:18 -08:00
Stephen Birarda	bd69a3aae3	Merge pull request #3993 from ZappoMan/gluRemoval more glu/glut removal	2014-12-19 14:44:29 -08:00
Stephen Birarda	4f478e158f	remove includes for glu for APPLE	2014-12-19 13:59:43 -08:00
ZappoMan	2e3a522e73	remove glut.h from CmakeLists.txt and fix a compiler issue with Hair.cpp	2014-12-19 13:53:44 -08:00
ZappoMan	1db1914a2e	replace gluProject() with just the math	2014-12-19 13:46:33 -08:00
Stephen Birarda	08581b4dac	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-19 12:50:32 -08:00
Clément Brisset	dbfbe35a49	Merge pull request #3986 from birarda/domain-connect fix domain connection with port, show current address in address bar	2014-12-19 12:49:51 -08:00
ZappoMan	046564ec47	oops double	2014-12-19 12:35:47 -08:00
ZappoMan	d585f8c707	replace gluOrtho2D() with glOrtho()	2014-12-19 12:10:40 -08:00
Ryan Huffman	f3a600da7e	Remove glut call	2014-12-19 12:01:18 -08:00
Ryan Huffman	e4ce7d11dc	Fix default scripts url to use s3.amazonaws.com	2014-12-19 11:32:52 -08:00
Stephen Birarda	115dc28c9c	add glu includes on OS X to stopgap GLUT removal	2014-12-19 10:54:00 -08:00
Ryan Huffman	2e96bbe38b	Merge branch 'master' of github.com:highfidelity/hifi into camera-display	2014-12-19 10:37:47 -08:00
Andrew Meadows	a141ce37e4	merge upstream/master into andrew/inertia	2014-12-19 10:25:03 -08:00
Brad Hefta-Gaub	821cbe610c	Merge pull request #3975 from ctrlaltdavid/20212 CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion	2014-12-19 09:55:45 -08:00
Ryan Huffman	51a64650e4	Fix use of glOrtho and replace getDeferredLightingEffect w/ DependencyManager	2014-12-19 09:04:54 -08:00
Thijs Wenker	e913095af5	Merge branch 'master' of https://github.com/worklist/hifi into 20216 Conflicts: interface/CMakeLists.txt	2014-12-19 13:53:33 +01:00
Ryan Huffman	5b89208068	Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display Conflicts: interface/src/ui/ApplicationOverlay.cpp interface/src/ui/overlays/Cube3DOverlay.cpp	2014-12-18 16:46:17 -08:00
Stephen Birarda	0b1445f8b5	show the address dialog with current address selected	2014-12-18 16:41:37 -08:00
Ryan Huffman	2e95618bed	Remove 'start' property alias from Base3DOverlay	2014-12-18 16:38:27 -08:00
Ryan Huffman	74f8579922	Update line3d to have a separate 'start' property and use transform/rotation	2014-12-18 16:37:19 -08:00
Stephen Birarda	1ab66c2bfe	split port and hostname for cleaner domain changes	2014-12-18 16:17:03 -08:00
ZappoMan	8091564a73	remove all glut	2014-12-18 16:12:30 -08:00
Atlante45	296c0025de	Switched to auto and changed macro	2014-12-18 15:42:38 -08:00
Andrew Meadows	11f01e1859	merge upstream/master into andrew/inertia	2014-12-18 15:01:08 -08:00
ZappoMan	6f6cf3b08d	Merge branch 'master' of https://github.com/highfidelity/hifi into librarization	2014-12-18 14:52:00 -08:00
Atlante45	990362b8ff	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-18 14:18:21 -08:00
Andrew Meadows	85fd1fc14f	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.cpp	2014-12-18 13:46:06 -08:00
ZappoMan	11b4400099	move all glut-ness to geometry cache	2014-12-18 11:20:17 -08:00
Stephen Birarda	9f21b41d3f	updates for new DependencyManager API	2014-12-17 18:08:41 -08:00
Stephen Birarda	7beb3a7b62	resolve conflicts on merge with upstream master	2014-12-17 16:57:35 -08:00
Stephen Birarda	9425ea2c17	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 16:47:15 -08:00
Ryan Huffman	27e13385ed	Fix drawing of Cube3D on the ApplicationOverlay This seems to break because the ApplicationOverlay is drawn to a texture buffer first, which is incompatible with the DeferredLightingEffect implementation.	2014-12-17 16:40:04 -08:00
Ryan Huffman	a0623c930b	Add setting of drawOnApplicaitonOverlay	2014-12-17 16:39:52 -08:00
Ryan Huffman	9bd7912f9f	Add support for drawing 3d overlays on the Application Overlay	2014-12-17 16:25:25 -08:00
Thijs Wenker	2884de1fe4	include fix	2014-12-18 01:18:05 +01:00
Thijs Wenker	835e14a7b2	This might solve it?	2014-12-18 00:52:31 +01:00
Thijs Wenker	95b0f2515b	this doesn't make `real sense` to me, perhaps this helps	2014-12-18 00:32:11 +01:00
Atlante45	0bd9ed469e	Changed NodeList::getInstance() calls to use the DM	2014-12-17 15:28:25 -08:00
Atlante45	ce7f72d2cd	Update macro	2014-12-17 15:26:47 -08:00
Thijs Wenker	8a1618c269	missed one.	2014-12-18 00:22:59 +01:00
Thijs Wenker	151ddab118	make stuff build without RealSense	2014-12-18 00:16:51 +01:00
Andrew Meadows	6ea766b48d	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityTypes.cpp	2014-12-17 13:21:00 -08:00
ZappoMan	1a9cf126e4	Merge branch 'master' of https://github.com/highfidelity/hifi into librarization Conflicts: interface/src/Application.cpp libraries/entities-renderer/src/EntityTreeRenderer.h	2014-12-17 13:16:11 -08:00
ZappoMan	9f9b8bcb68	move interface/entities to libraries/entities-renderer	2014-12-17 12:54:41 -08:00
ZappoMan	2be3b73e8c	move TextRender to libraries/render-utils	2014-12-17 12:32:52 -08:00
ZappoMan	a465aa20ff	more Application and Menu dependency removal	2014-12-17 11:41:42 -08:00
ZappoMan	5d636e21c6	more Application dependency cleanup	2014-12-17 11:10:45 -08:00
Thijs Wenker	227e041a12	Merge branch 'master' of https://github.com/worklist/hifi into 20216	2014-12-17 19:42:44 +01:00
Stephen Birarda	737741c13b	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 09:23:42 -08:00
Andrzej Kapolka	ab52f434c9	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-16 17:07:16 -08:00
Stephen Birarda	a99589f6a4	fix some indentation and a conditional	2014-12-16 17:06:59 -08:00
Stephen Birarda	b7099442c1	repair interaction between AudioNoiseGate and Audio	2014-12-16 16:50:13 -08:00
Stephen Birarda	9491b8230b	remove AudioNoiseGate destructor	2014-12-16 16:39:57 -08:00
Stephen Birarda	d83718fe8d	cleanup separated AudioNoiseGate	2014-12-16 16:39:18 -08:00
Stephen Birarda	f982f5a538	remove declaration of CLIPPING_THRESHOLD in Audio	2014-12-16 16:32:00 -08:00
Stephen Birarda	be184719b5	move the audio noise gate to its own class	2014-12-16 16:31:29 -08:00
ZappoMan	3dfded89b8	remove menu dependency from EntityTreeRenderer, some Application cleanup	2014-12-16 16:28:09 -08:00
Stephen Birarda	0429b338c0	remove last Audio ref to Menu, fix local/server echo	2014-12-16 16:02:41 -08:00
Stephen Birarda	223a48609a	remove a couple more Menu dependencies in Audio	2014-12-16 15:49:17 -08:00
Stephen Birarda	e86c5ff683	remove Audio dependency on Menu	2014-12-16 15:45:17 -08:00
ZappoMan	74a8f0059d	some Application dependecy cleanup	2014-12-16 15:43:24 -08:00
Atlante45	c40e83c9e4	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-16 15:42:40 -08:00
ZappoMan	d385a7b8ac	header file cleanup	2014-12-16 15:35:56 -08:00
Stephen Birarda	e0752cef54	remove collision sound creation calls	2014-12-16 15:35:37 -08:00
Stephen Birarda	fe7b678193	begin removal of C++ procedural audio calls	2014-12-16 15:33:38 -08:00
Atlante45	b2dac6f53f	DM users update	2014-12-16 15:32:11 -08:00
Stephen Birarda	eb790af193	hookup previous mouse press for mute to AudioToolBox	2014-12-16 15:30:28 -08:00
Stephen Birarda	0fae699ed3	remove a couple of headers, fix mute bool call	2014-12-16 15:26:56 -08:00
Stephen Birarda	369fdc5771	move audio toolbox into its own class	2014-12-16 15:24:57 -08:00
ZappoMan	ee2ce718b4	header file cleanup	2014-12-16 15:14:14 -08:00
Stephen Birarda	d9ab673442	hook menu calls up to AudioIOStreamStatsRenderer	2014-12-16 15:05:14 -08:00
Atlante45	11a2ecab56	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/entities/EntityTreeRenderer.h interface/src/ui/ApplicationOverlay.cpp libraries/render-utils/src/GlowEffect.cpp libraries/render-utils/src/Model.cpp	2014-12-16 15:02:37 -08:00
Clément Brisset	7632dbead3	Merge pull request #3968 from ZappoMan/InterfaceConfigEctomy Librarization	2014-12-16 14:56:11 -08:00
Stephen Birarda	0f18a9651b	replace audio with AudioIOStatsRenderer in ApplicationOverlay	2014-12-16 14:53:36 -08:00
Stephen Birarda	1db12453d4	move audio stats into member of Audio	2014-12-16 14:47:24 -08:00
Atlante45	2039895898	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/renderer/GlowEffect.cpp interface/src/renderer/TextureCache.cpp	2014-12-16 14:27:50 -08:00
ZappoMan	b449f650a0	more Model cleanup	2014-12-16 14:22:02 -08:00
ZappoMan	89101872bb	move Model and AnimationHandle to libraries	2014-12-16 14:04:39 -08:00
Atlante45	4d1529f77b	typedefs	2014-12-16 14:02:22 -08:00
ZappoMan	85c8951734	really remove the debug settings from Model rendering	2014-12-16 13:57:22 -08:00
Atlante45	e8a22f6f0f	Switched to chared pointers and macros	2014-12-16 13:54:52 -08:00
Stephen Birarda	60447e48cb	handle input from Audio class in AudioScope	2014-12-16 13:29:42 -08:00
ZappoMan	efa8a752f2	remove dependency on Menu from Model	2014-12-16 13:14:57 -08:00
Stephen Birarda	3c6c37710d	hook AudioScope to new Dependency Audio	2014-12-16 13:03:46 -08:00
ZappoMan	16c1e597f1	remove Application dependency from Model	2014-12-16 12:53:22 -08:00
Stephen Birarda	a9eaa4b9f7	more decoupling of Audio from Interface	2014-12-16 12:43:06 -08:00
Stephen Birarda	6fd55e6f42	make Audio class use DependencyManager	2014-12-16 12:31:01 -08:00
ZappoMan	58183515e6	more windows shenanigans	2014-12-16 12:23:54 -08:00
Stephen Birarda	fba256692f	rename variables in AudioScope	2014-12-16 12:04:26 -08:00
Stephen Birarda	c734bc89a3	move the audio scope into its own class	2014-12-16 11:54:59 -08:00
ZappoMan	fc1e1ecfc0	move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled	2014-12-16 11:27:44 -08:00
Stephen Birarda	1cf88e7666	Merge branch 'master' of https://github.com/highfidelity/hifi into lasagna-not-spaghetti	2014-12-16 10:47:45 -08:00
Stephen Birarda	aeb273a882	move environment mute to Audio	2014-12-16 10:46:24 -08:00
ZappoMan	4d79a08533	remove Application dependencies from AmbientOcclusion and DeferredLightingEffect	2014-12-16 10:32:03 -08:00
Stephen Birarda	78edb94963	move address lookup errors to AddressBarDialog	2014-12-16 10:12:25 -08:00
DaveDubUK	7ab9dfbfe1	Window.nonBlockingForm-fix	2014-12-16 14:48:28 +00:00
DaveDubUK	9493440d32	Window.nonBlockingForm-fix	2014-12-16 13:33:10 +00:00
DaveDubUK	cd95f7bd23	Window.nonBlockingForm active status was not being tested correctly. Was causing unexpected fail on second attempt to show form	2014-12-16 13:20:11 +00:00
ZappoMan	5cba44fd5b	moved JointState	2014-12-15 19:49:16 -08:00
ZappoMan	660bf2720e	convert AnimationCache to DependencyManager	2014-12-15 19:48:15 -08:00
ZappoMan	02737a4ec4	move JointState to libraries	2014-12-15 19:38:30 -08:00
ZappoMan	41c135c4e5	move GlowEffect to libraries	2014-12-15 19:19:21 -08:00
ZappoMan	8f3d23c5b3	remove Menu dependency from GlowEffect	2014-12-15 19:06:54 -08:00
ZappoMan	4eef4c2438	move RenderUtils.cpp/h to libraries	2014-12-15 18:52:40 -08:00
ZappoMan	e52338d25c	get rid of InterfaceConfig.h in GlowEffect	2014-12-15 17:38:57 -08:00
ZappoMan	37abe8e89c	move RenderUtils.cpp/h to libraries	2014-12-15 17:35:26 -08:00
ZappoMan	e53833b306	make GlowEffect support DependencyManager	2014-12-15 17:29:48 -08:00
ZappoMan	79bc5e0507	Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy	2014-12-15 16:48:07 -08:00
Atlante45	e5e2eb4e8a	Moved GLCanvas in DM and DM to QSharedPointers	2014-12-15 16:20:52 -08:00
Andrzej Kapolka	67a6134d9a	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: interface/src/MetavoxelSystem.cpp	2014-12-15 15:30:27 -08:00
Andrzej Kapolka	50c1e9fb40	Fixes for missing audio device.	2014-12-15 22:41:35 -08:00
ZappoMan	bfcc78c57d	replaced Application::resourcesPath() with PathUtils::resourcesPath()	2014-12-15 15:20:18 -08:00
ZappoMan	753dc07cdd	cleanup windows hackery	2014-12-15 14:58:47 -08:00
Stephen Birarda	1b48cf7f5a	use DependencyManager for AddressManager	2014-12-15 14:54:20 -08:00
ZappoMan	0c14b0f8fc	windows build hackery	2014-12-15 14:47:26 -08:00
Andrew Meadows	67c3a25475	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.h	2014-12-15 14:46:46 -08:00
ZappoMan	bc78beb05f	windows build hackery	2014-12-15 14:41:15 -08:00
ZappoMan	f802e99a24	windows build hackery	2014-12-15 14:32:33 -08:00
ZappoMan	df7e115556	move ProgramObject to libraries	2014-12-15 14:21:22 -08:00
ZappoMan	49cacd85bd	move GeometryCache to library	2014-12-15 14:00:41 -08:00
ZappoMan	dee8f69722	windows build hackery	2014-12-15 13:33:47 -08:00
Thijs Wenker	2633b0dee7	reordered includes	2014-12-15 22:26:47 +01:00
ZappoMan	ea6d6e9f72	windows build hackery	2014-12-15 13:26:27 -08:00
Thijs Wenker	1dfa313d16	Merge branch 'master' of https://github.com/worklist/hifi into 20216 Conflicts: interface/src/Menu.cpp	2014-12-15 22:22:51 +01:00
ZappoMan	7b973453b4	move TextureCache to library	2014-12-15 13:14:16 -08:00
Thijs Wenker	c4a9cae943	flipped some values to get a nicer hand-tracking	2014-12-15 21:47:00 +01:00
ZappoMan	a92b65b0e9	now lets see if this works	2014-12-15 12:42:04 -08:00
Atlante45	68430e1346	Moved GLCanvas to DependencyManager	2014-12-15 11:54:33 -08:00
Stephen Birarda	fa8b7020b0	repairs to MetavoxelSystem after reset to upstream	2014-12-15 11:49:43 -08:00
ZappoMan	28f2dc62ea	add windowshacks.h to GPUConfig.h and move it to shared	2014-12-15 11:49:01 -08:00
ZappoMan	94cf8b3384	reduce calls to DependencyManager::get<> where possible	2014-12-15 11:43:30 -08:00
ZappoMan	3bc1321549	reduce calls to DependencyManager::get<> where possible	2014-12-15 11:40:17 -08:00
ZappoMan	90c1132dd5	reduce calls to DependencyManager::get<> where possible	2014-12-15 11:28:57 -08:00
Atlante45	25df784f43	Headers cleanup	2014-12-15 10:56:42 -08:00
ZappoMan	049cb25f07	make ModelBlender work with DependancyManager	2014-12-15 10:56:29 -08:00
ZappoMan	e0a017e963	make GeometryCache work with DependancyManager	2014-12-15 10:49:34 -08:00
ZappoMan	7d75d2d1bf	make TextureCache work with DependancyManager	2014-12-15 10:34:16 -08:00
ZappoMan	c6b033fa0e	revert out the InterfaceConfig.h changes	2014-12-15 10:12:55 -08:00
ZappoMan	6b39783de7	revert out the InterfaceConfig.h changes	2014-12-15 10:12:04 -08:00
ZappoMan	7d1081473e	remove _textureCache	2014-12-15 09:42:35 -08:00
Stephen Birarda	8549e9cb53	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
ZappoMan	ca39c79df4	unix compile	2014-12-15 08:50:36 -08:00
ZappoMan	3de3540ebe	move back into interface for now	2014-12-15 08:37:33 -08:00
ZappoMan	4ac673fe63	more render util cleanup	2014-12-15 08:16:42 -08:00
ZappoMan	e9ea6b20ce	use TextureCache::getInstance() instead of Application::getInstance()->getTextureCache()	2014-12-15 08:16:18 -08:00
ZappoMan	2df4c017f1	move GeometryCache out of application and remove dependency on Model	2014-12-15 08:15:55 -08:00
ZappoMan	e253b8afa4	move TextureCache out of interface and Application	2014-12-15 08:14:53 -08:00
Atlante45	738f23f326	Moved visage and dde over to DependencyManager	2014-12-14 22:30:13 -08:00
Atlante45	65094f2165	Update headers	2014-12-14 21:47:08 -08:00
Atlante45	1db3592d4c	Switched meFaceshifto DependencyManager for Faceshift	2014-12-14 19:56:42 -08:00
Atlante45	39a19a297f	Switched menu to DependencyManager for Faceshift	2014-12-14 16:31:03 -08:00
Atlante45	1d9e53e227	Switched avatar to DependencyManager for Faceshift	2014-12-14 16:28:28 -08:00
Atlante45	ad2dee5eaa	Switched devices to DependencyManager for Faceshift	2014-12-14 16:26:08 -08:00
Philip Rosedale	99fd7b3d6c	Merge pull request #3963 from ZappoMan/test fix warning	2014-12-13 23:16:16 -08:00
Andrzej Kapolka	51f82b4cd9	More stack bits.	2014-12-13 17:49:55 -08:00
Thijs Wenker	821e9ddfed	Merge branch 'master' of https://github.com/worklist/hifi into 20216	2014-12-13 23:05:04 +01:00
Thijs Wenker	3f26e1b63a	RealSense Initial	2014-12-13 23:04:19 +01:00
ZappoMan	31db2188cb	remove test comment	2014-12-13 07:58:13 -08:00
ZappoMan	d28e274876	fix warning	2014-12-13 07:43:40 -08:00
Andrzej Kapolka	dfcb22bd7a	More progress towards stacks.	2014-12-12 15:12:03 -08:00
Andrzej Kapolka	5e01695899	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-12 12:11:33 -08:00
Andrzej Kapolka	c1c5991ac5	Fix for distorted replaced textures.	2014-12-12 12:07:48 -08:00
David Rowe	fe8937e37e	Make lasers able to emanate from index finger tips	2014-12-11 21:31:08 -08:00
Brad Hefta-Gaub	aae000d50e	Merge pull request #3956 from Atlante45/dont_hide_mouse_on_every_window Don't hide mouse when over a widget	2014-12-11 16:06:05 -08:00
Atlante45	df66a0049b	Don't hide mouse when over a widget	2014-12-11 15:33:46 -08:00
Andrzej Kapolka	ebfbcdfe42	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-11 15:27:57 -08:00
Clément Brisset	14918ff86a	Merge pull request #3952 from ZappoMan/HMDMode More HMD work - keep more dialogs from being moved to HMD	2014-12-11 15:26:36 -08:00
Philip Rosedale	b160d5b571	Merge pull request #3955 from ey6es/master Fix for normal and specular maps on skinned models.	2014-12-11 15:23:59 -08:00
Philip Rosedale	8505aaceba	Merge pull request #3953 from ZappoMan/someCleanup Remove some dead code from Voxel rendering	2014-12-11 15:23:27 -08:00
ZappoMan	0813d53bee	CR feedback	2014-12-11 15:17:22 -08:00
Andrzej Kapolka	828813dd07	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-11 14:57:36 -08:00
Andrzej Kapolka	77b19241d7	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-11 14:44:30 -08:00
Andrzej Kapolka	7611354df6	Fix for normal maps on skinned models.	2014-12-11 14:43:58 -08:00
Brad Hefta-Gaub	31cbd6e88c	Merge pull request #3954 from ctrlaltdavid/20226 CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize	2014-12-11 14:33:24 -08:00
ZappoMan	3eb7314c98	remove PrimitiveRenderer	2014-12-11 14:13:44 -08:00
ZappoMan	29672aec09	removing VoxelShader and PointShader which were both disabled	2014-12-11 13:55:10 -08:00
Andrew Meadows	c3f8f8ab98	init PhysicsEngine with an EntityEditPacketSender	2014-12-11 13:29:29 -08:00
ZappoMan	c9bc95580d	add support for generic windowWatcher that keeps dialogs from being moved to HMD display	2014-12-11 12:30:17 -08:00
AndrewMeadows	84e82cd03b	Merge pull request #3947 from ZappoMan/HMDMode Make the Chat, Running Scripts, and Address bar "avoid" HMD Screen	2014-12-11 10:48:32 -08:00
AndrewMeadows	bb6f976699	Merge pull request #3945 from ZappoMan/someCleanup AudioRefector-ectomy	2014-12-11 10:39:41 -08:00
ZappoMan	ec54b609df	dry up code and make chat window avoid the hmd screen	2014-12-10 17:23:39 -08:00
ZappoMan	06d348c399	get have addressbar avoid the hmd screen	2014-12-10 17:13:34 -08:00
ZappoMan	d058b5554e	make sure the running scripts widget doesn't start on the HMD screen	2014-12-10 16:58:36 -08:00
ZappoMan	7f887ba75f	more spatial audio removal	2014-12-10 15:46:10 -08:00
ZappoMan	eda7432868	remove audio reflector	2014-12-10 15:37:48 -08:00
Andrzej Kapolka	d402f767c1	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-10 15:23:27 -08:00
Andrzej Kapolka	c57fd15bc9	Rather than loading the entire FBX file into a byte array, read it straight from the QNetworkReply.	2014-12-10 15:22:48 -08:00
ZappoMan	74a6fd5ca7	fix joystick pick	2014-12-09 20:03:00 -08:00
Atlante45	88a576f846	fix action events for gamepad;	2014-12-09 19:35:38 -08:00
David Rowe	ff6db7a9fa	Merge branch 'master' into 20226	2014-12-09 19:20:30 -08:00
David Rowe	8cf50b71ea	Update some comments to reflect changes	2014-12-09 19:18:37 -08:00
Brad Hefta-Gaub	69f7a89003	Merge pull request #3937 from Atlante45/mouse_pick_in_oculus Mouse pick improvments	2014-12-09 18:33:25 -08:00
David Rowe	136c3a2cce	Replace 2D and 3D text overlay textWidth() method with textSize()	2014-12-09 18:32:53 -08:00
Atlante45	dc4c9cd545	Correctly Hide/Show cursor	2014-12-09 18:00:14 -08:00
Sam Gateau	01c13cd6f1	Fix the broken shadows by simply calling the needed setViewTransform which is used for rendering the ENitites and avatars	2014-12-09 17:58:17 -08:00
Atlante45	43dc35d549	Use correct mouse coordinate	2014-12-09 17:53:23 -08:00
Atlante45	b197558b87	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-09 16:46:13 -08:00
Atlante45	8765d9a9b3	Mouse cursor modifications	2014-12-09 16:30:37 -08:00
Andrzej Kapolka	8ccb44b71e	Bits of stack implementation.	2014-12-09 16:24:07 -08:00
Andrew Meadows	3fd2f12a73	merge upstream/master into andrew/inertia Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntitySimulation.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTreeElement.cpp libraries/entities/src/SimpleEntitySimulation.cpp libraries/entities/src/SimpleEntitySimulation.h libraries/entities/src/SphereEntityItem.cpp	2014-12-09 12:41:53 -08:00
Stephen Birarda	ada325da2b	Merge pull request #3931 from Atlante45/mouse_pick_in_oculus Misc fixes	2014-12-09 12:13:24 -08:00
Atlante45	649940de24	wrong pickray function	2014-12-09 11:53:32 -08:00
Atlante45	a6f7a1ce15	guard against NULL _models	2014-12-09 11:52:20 -08:00
ZappoMan	1eaa2caa6c	fix to crash on rapidly switching domains	2014-12-09 11:40:47 -08:00
Atlante45	ba81030aa1	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-08 16:53:56 -08:00
Atlante45	fa73730359	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-08 16:46:34 -08:00
ZappoMan	cdeaaf2ca9	fix deadlock in enter/leave events	2014-12-08 15:06:34 -08:00
ZappoMan	efbe8ce757	Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions	2014-12-08 14:15:20 -08:00
ZappoMan	0592b74a06	make collision callbacks work	2014-12-08 14:15:03 -08:00
Brad Hefta-Gaub	a9079b64e4	Merge pull request #3922 from AndrewMeadows/thermonuclear overhaul EntitySimulation API (and relay relevant EntityItem properties to simulation when they change)	2014-12-08 13:56:06 -08:00
Clément Brisset	681a1a3297	Merge pull request #3917 from ctrlaltdavid/20202 CR for Job #20202 - Add "backgroundVisible" property to text overlays	2014-12-08 11:43:52 -08:00
Andrew Meadows	9e9929da91	merge upstream/master into andrew/thermonuclear	2014-12-08 11:22:39 -08:00
ZappoMan	27bc394bed	repair collision info mismatch	2014-12-08 10:52:53 -08:00
Atlante45	299389ccef	Fixed typo	2014-12-08 09:59:33 -08:00
Philip Rosedale	60c2a89292	Merge pull request #3915 from ZappoMan/modelRayPick Proper Model Ray Picking	2014-12-07 14:19:26 -08:00
ZappoMan	d698594899	use common findRayTriangleIntersection	2014-12-06 19:39:02 -08:00
ZappoMan	91fd574eb5	Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick	2014-12-06 15:28:54 -08:00
ZappoMan	1a1fb18ba1	removed dead code	2014-12-06 15:03:26 -08:00
ZappoMan	c8e648c4d7	removed unused menu item	2014-12-06 15:00:29 -08:00
ZappoMan	a03984a561	removed some debug code	2014-12-06 14:59:50 -08:00
ZappoMan	3bb16ce831	properly wire up precision picking in JS api	2014-12-06 12:03:46 -08:00
ZappoMan	7ea85073f4	introduce precision picking in API form	2014-12-06 11:45:49 -08:00
David Rowe	dbb547507d	Merge branch 'master' into 20202	2014-12-06 11:14:45 -08:00
ZappoMan	303274a554	tweaks and debug cleanup	2014-12-06 10:59:48 -08:00
ZappoMan	1fec69698e	get the triangle picking for submeshes working, remove some debug	2014-12-05 23:23:21 -08:00
ZappoMan	f1c6e2d1a2	more debugging	2014-12-05 19:52:48 -08:00
Andrew Meadows	7d96ad5836	cleanup of EntitySimulation API * remove EntityItem::_simulationState (only useful to EntitySimulation) * move code from SimpleEntitySimuation to EntitySimulation * EntitySimulation now maintans many QSets of entities * cleanup and clarify use of EnityTree::updateEntity() * reduced cost of polling for entity expiries * changed "UpdateFlags" to "DirtyFlags" and clarified what they're for	2014-12-05 18:08:53 -08:00
Atlante45	d89d10d263	Hide cusor in VR mode	2014-12-05 17:36:46 -08:00
Atlante45	1bb08ef30f	Centered reticule	2014-12-05 17:10:58 -08:00
Atlante45	ee124f580d	removed _mouse{X,Y}	2014-12-05 17:02:49 -08:00
ZappoMan	ae647d39d0	fix models with registrations other than 0,0,0	2014-12-05 16:14:18 -08:00
Atlante45	469c958c98	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-05 15:30:20 -08:00
Atlante45	4bc7e1a3e8	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-05 14:46:52 -08:00
Sam Gateau	c49b753c98	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-12-05 13:38:30 -08:00
ZappoMan	d5fbe5b6b4	Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick	2014-12-05 12:48:00 -08:00
ZappoMan	a6b86da47a	basics of triangle picking working for models	2014-12-05 11:31:27 -08:00
David Rowe	bd6ea9b4e7	Render with backgroundAlpha property	2014-12-05 11:18:03 -08:00
David Rowe	f5a1c26492	Add backgroundAlpha property to 2D and 3D text overlays	2014-12-05 11:08:00 -08:00
ZappoMan	0647211fb8	Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick	2014-12-05 10:13:55 -08:00
Sam Gateau	0fbdda7582	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-12-05 10:13:38 -08:00
ZappoMan	d3aacc3838	Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest Conflicts: interface/src/MetavoxelSystem.cpp	2014-12-05 10:11:49 -08:00
Philip Rosedale	0ad361fd60	Merge pull request #3902 from samcake/tot Adding detection of a "hifi" global light in a FBX file used to pass information	2014-12-05 10:07:52 -08:00
ZappoMan	e68e3fe774	Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" This reverts commit `6d385d9a75`.	2014-12-05 10:06:17 -08:00
ZappoMan	9753c82a3b	get rid of redundant _displayViewFrustum and use _viewFrustum	2014-12-05 10:04:23 -08:00
ZappoMan	feab942375	Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" This reverts commit `6d385d9a75`.	2014-12-05 10:01:16 -08:00
Atlante45	7322cd3ece	Coding Standard	2014-12-04 20:16:50 -08:00
Atlante45	90d4e7bae9	Comments	2014-12-04 19:38:39 -08:00
Atlante45	d2b0cdbac3	Hydra reticule rendering for Oculus	2014-12-04 19:31:59 -08:00
Atlante45	9f444581e9	Fixed JS picking in oculus	2014-12-04 18:53:30 -08:00
Atlante45	84da070901	Correct mouse position in occulus	2014-12-04 18:27:03 -08:00
Atlante45	abe9704dbc	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-04 17:26:22 -08:00
Atlante45	7026af7b9a	Centrilized Oculus interference in pickRay	2014-12-04 17:26:14 -08:00
Sam Gateau	66c10544ae	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-12-04 17:16:39 -08:00
Andrzej Kapolka	466d99bcbb	Removed unused members.	2014-12-04 17:12:06 -08:00
ZappoMan	6b5fdceb6e	more work on improved model picking	2014-12-04 16:48:04 -08:00
Andrzej Kapolka	ace415b138	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: interface/src/MetavoxelSystem.cpp	2014-12-04 16:46:32 -08:00
ZappoMan	37ffa48fa3	more work on improved model picking	2014-12-04 16:43:12 -08:00
Sam Gateau	1102b4d633	Moving GPU into it's own library	2014-12-04 16:40:55 -08:00
Sam Gateau	f4e1af6abc	clean code in GeometryCache around the FBX file loader	2014-12-04 12:02:30 -08:00
ZappoMan	b6fd3628c8	first round of hacking on implementing rendering of models for detailed ray picking	2014-12-04 12:00:38 -08:00
Atlante45	3b6936b47d	Changed Mag and reticules data representation	2014-12-04 11:16:01 -08:00
Sam Gateau	592e902f46	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-12-04 00:25:15 -08:00
Atlante45	e246b979f7	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus	2014-12-03 17:50:17 -08:00
Atlante45	8d814ab07b	Updated Oculus pickray	2014-12-03 17:05:42 -08:00
Atlante45	bd39688c62	Magnifiy window tweaks	2014-12-03 17:04:26 -08:00
Andrzej Kapolka	6764f29cd2	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-03 16:49:10 -08:00
Andrzej Kapolka	8fb766a5d0	Only recreate the renderers for nodes that have changed.	2014-12-03 16:44:13 -08:00
Atlante45	0624ab7c72	Fixed aspect ratio and cropped overlay texture	2014-12-03 16:04:23 -08:00
ZappoMan	cd92185c5b	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork Conflicts: examples/newEditEntities.js interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h libraries/entities/src/EntityTree.h	2014-12-03 15:07:47 -08:00
Atlante45	73004d1bee	Decoupled reticules from Overlays view	2014-12-03 14:40:47 -08:00
Brad Hefta-Gaub	f10b656877	Merge pull request #3870 from AndrewMeadows/thermonuclear pull entity simulation out of EntityTree	2014-12-03 14:30:44 -08:00
Andrzej Kapolka	7a81e6c9e1	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-03 14:30:31 -08:00
Sam Gateau	322dd38322	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-12-03 14:23:49 -08:00
Andrzej Kapolka	df23a84cc2	Bump up the glyph texture size so that we don't spill over into another texture.	2014-12-03 14:18:47 -08:00
Sam Gateau	913007939b	Trying to read the light attribute	2014-12-03 14:12:50 -08:00
Stephen Birarda	5c3e90f64f	resolve conflicts on merge with upstream master	2014-12-03 13:11:56 -08:00
Andrzej Kapolka	88048e8599	Make sure the position of the heightfield/voxel brush is valid before acting.	2014-12-03 12:47:32 -08:00
Andrzej Kapolka	d975e3f0ce	Fixed signed/unsigned warnign.	2014-12-03 12:38:10 -08:00
Andrzej Kapolka	1e93137e6b	Fix for overflow when computing metavoxel stats.	2014-12-03 12:24:58 -08:00
Andrzej Kapolka	e32c214e4d	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-03 12:08:06 -08:00
Brad Hefta-Gaub	f70f07e694	Merge pull request #3890 from PhilipRosedale/master When in HMD, arrow keys make jump turns	2014-12-03 10:54:22 -08:00
ZappoMan	5f9c1c490b	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork	2014-12-03 10:44:56 -08:00
Stephen Birarda	98f56aaa0c	fix URL/filename discrepancy for local scripts	2014-12-03 09:55:55 -08:00
Philip Rosedale	d63ace9f61	fix angular velocity from oculus, tweak hair	2014-12-02 23:53:46 -08:00
Philip Rosedale	57e2f71bb7	remove unused body delta pitch, roll	2014-12-02 23:24:47 -08:00
Philip Rosedale	3ca20a7eee	Add jump/warp turning when in HMD	2014-12-02 23:08:34 -08:00
Andrzej Kapolka	94d0612804	Fix for Hermite display.	2014-12-02 20:17:18 -08:00
Andrzej Kapolka	1a1b1ca3f3	Fix for voxelizing heightfields.	2014-12-02 19:49:27 -08:00
Andrzej Kapolka	990a533eea	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-02 17:13:32 -08:00
Philip Rosedale	73d358b150	Merge pull request #3888 from PhilipRosedale/master Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js	2014-12-02 15:31:50 -08:00
Andrew Meadows	a21ebe4f6a	merge andrew/thermonuclear into andrew/inertia	2014-12-02 15:31:30 -08:00
Andrew Meadows	c9ea6885c1	PhysicsEngine is now an EntitySimulation	2014-12-02 15:29:41 -08:00
ZappoMan	a47a0377ef	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork	2014-12-02 14:57:30 -08:00
ZappoMan	63d1ac8375	implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle	2014-12-02 14:56:12 -08:00
Philip Rosedale	06b22cf605	...and don't turn on/off UI from hydra	2014-12-02 14:50:25 -08:00
Andrzej Kapolka	284cd54e28	More detachment fixes.	2014-12-02 14:33:54 -08:00
Sam Gateau	8b75272cde	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-12-02 13:49:28 -08:00
Sam Gateau	40df497374	Hack for the Viking Palace scene before demo for good looking lightmaps	2014-12-02 13:48:59 -08:00
Atlante45	bf21376c90	TexturedHemisphere class	2014-12-02 13:34:11 -08:00
Andrzej Kapolka	d7a64260b1	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-02 13:24:46 -08:00
Andrzej Kapolka	4d233c09a3	At least on Linux, fixes an annoying issue where closing the application window causes it to disappear and reappear briefly before exiting.	2014-12-02 13:19:39 -08:00
Andrzej Kapolka	a022b7fa17	Fix for successive heightfield placements.	2014-12-02 13:12:45 -08:00
ZappoMan	cc012aad00	reset view frustum	2014-12-02 12:54:10 -08:00
Atlante45	3c5f33f0ac	Hemisphere vbo refactoring	2014-12-02 12:28:04 -08:00
Andrzej Kapolka	b4b1559e32	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-02 12:07:38 -08:00
ZappoMan	6d385d9a75	get rid of redundant _displayViewFrustum and use _viewFrustum	2014-12-02 11:45:33 -08:00
Andrew Meadows	ff7559c2c2	merge upstream/master into andrew/thermonuclear	2014-12-02 11:41:29 -08:00
Brad Hefta-Gaub	22bee75f7f	Merge pull request #3885 from birarda/double-scripts fix for ScriptEngine blocked load	2014-12-02 11:19:28 -08:00
Andrew Meadows	b9944edf66	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00
Andrew Meadows	0814949e4c	moving EntityCollisionSystem back to entities lib	2014-12-02 11:05:17 -08:00
Stephen Birarda	0a92374ca6	fix an incorrect connection to script load error	2014-12-02 10:39:20 -08:00
Stephen Birarda	d7f168999d	don't block main thread for a script load	2014-12-02 10:30:23 -08:00
Brad Hefta-Gaub	9d213f9fb7	Merge pull request #3884 from huffman/entity-tools-polish Entity tools polish	2014-12-02 10:21:20 -08:00
Brad Hefta-Gaub	7f8f57b055	Merge pull request #3879 from birarda/master fix for ice-server heartbeat without an access token, hifi:// URL	2014-12-02 10:19:12 -08:00
ZappoMan	526664ac57	delete old dead code	2014-12-01 22:11:34 -08:00
Andrzej Kapolka	5b4869f43d	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-01 16:43:39 -08:00
Ryan Huffman	0b7ddb009d	Fix tabification of tool windows	2014-12-01 16:33:51 -08:00
Andrew Meadows	1df6c32a4e	moving Shape* back into shared lib removing dependency of entities lib on physics lib physics lib now depends on entities lib	2014-12-01 16:03:14 -08:00
dev	21d3892094	Merge branch 'master' of https://github.com/highfidelity/hifi into fbx	2014-12-01 13:03:18 -08:00
Ryan Huffman	fc5adef501	Update the tool window to use tabbed windows	2014-12-01 12:24:40 -08:00
Sam Gateau	845e687fc5	Adding a Hack for the apaartment model to boost the lightmaps	2014-12-01 11:45:07 -08:00
ZappoMan	6d7f799dbe	oculus mirror lean hack	2014-12-01 10:32:35 -08:00
Stephen Birarda	40db44e4bd	fix for custom hifi URL lookup	2014-12-01 09:59:51 -08:00
AndrewMeadows	1b5b4c0b44	Merge pull request #3872 from ZappoMan/cleanupMenus remove Entities developer menu items from C++ menu, make them available through script	2014-12-01 09:29:56 -08:00
Philip Rosedale	e44ca5a7f7	Merge pull request #3876 from ZappoMan/bugFixes fixes the stutter in animation when observer moves	2014-11-30 18:44:21 -08:00
Sam Gateau	321d651d77	Hack for avoiding lightmaps loading in starchamber	2014-11-30 12:54:43 -08:00
Brad Hefta-Gaub	91fe014411	Merge pull request #3875 from PhilipRosedale/master Auto-turn body when head yaw is beyond 45 degrees in HMD	2014-11-30 05:40:55 -08:00
ZappoMan	5c2cc20313	fixes the stutter in animation when observer moves	2014-11-28 17:36:55 -08:00
David Rowe	583e079d3a	Fix Hydra cursors in VR display They weren't being drawn at the correct location an so weren't matching up with location of voxel being added or deleted, for example.	2014-11-28 10:01:15 -08:00
Brad Hefta-Gaub	8a86b2d239	Merge pull request #3873 from samcake/tot Fix lighmaps for VC demo 12/1/2014	2014-11-27 13:01:10 -08:00
Sam Gateau	c78af1c982	fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why	2014-11-27 10:48:36 -08:00
Philip Rosedale	c284303031	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-26 20:35:51 -08:00
Philip Rosedale	56b27a2595	Merge pull request #3871 from ZappoMan/HMDMode Various HMD Tools improvements	2014-11-26 20:33:38 -08:00
ZappoMan	fe010b685a	more HMD Tools improvements, better support for detecting adding/removing screens	2014-11-26 20:19:23 -08:00
Philip Rosedale	e822b191d0	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-26 19:57:31 -08:00
Philip Rosedale	39042f61cd	1P mirror can lean fwd/back	2014-11-26 19:57:18 -08:00
ZappoMan	184acaedef	switch to single button for mode switching	2014-11-26 19:43:01 -08:00
ZappoMan	85ca03199e	remove Entities developer menu items from C++ menu, make them available through script	2014-11-26 17:53:41 -08:00
ZappoMan	fe9fab68bf	don't exit app in full screen or hdm mode	2014-11-26 17:30:59 -08:00
Andrzej Kapolka	5710bfcf6c	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-26 16:19:16 -08:00
Andrzej Kapolka	0a329bbe3c	More work on LOD rendering; now rendering in preview.	2014-11-26 16:18:57 -08:00
Philip Rosedale	f0fa627892	Merge pull request #3869 from ctrlaltdavid/fix-leap-hands-in-face Fix Leap hands in face	2014-11-26 15:49:29 -08:00
Andrew Meadows	5acaaa9c3b	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/entities/EntityCollisionSystem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTree.h libraries/entities/src/EntityTreeElement.cpp	2014-11-26 15:36:08 -08:00
Philip Rosedale	91aca51dc6	Merge pull request #3868 from ZappoMan/HMDMode First cut at HMD Tools window	2014-11-26 14:53:25 -08:00
Andrzej Kapolka	790b085307	Rejiggering the heightfield renderer for LOD.	2014-11-26 13:02:11 -08:00
ZappoMan	711f9f6905	fix bug where audio meter is incorrectly offset when in oculus mode	2014-11-26 12:34:47 -08:00
ZappoMan	2fc3fdc7e6	improve how cameras are reset when leaving vr mode	2014-11-26 12:26:02 -08:00
Andrew Meadows	d84f57fafa	merge upstream/master into andrew/thermonuclear	2014-11-26 12:18:19 -08:00
Andrew Meadows	cda8ac85c1	EntityCollisionSystem moves to interface and interface connects EntityCollision system to EntityTree	2014-11-26 12:15:24 -08:00
Andrew Meadows	dd3a7b9b9d	EntitySimulation takes EntityItem* rather than ID	2014-11-26 12:12:43 -08:00
ZappoMan	208eb663bd	prevent HMD tools from being moved to HMD screen	2014-11-26 12:07:39 -08:00
David Rowe	5f58c76842	Fix hands being put in face if Leap on HMD is set but Leap not connected The joints were reporting themselves as "active" even though the Leap wasn't connected, both at startup if not connected and after unplugging.	2014-11-26 12:03:10 -08:00
Brad Hefta-Gaub	b136f4c649	Merge pull request #3867 from AndrewMeadows/bispinor don't lookup entity by ID when deleting script	2014-11-26 11:07:07 -08:00
Andrzej Kapolka	1d9c7d7c72	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-26 10:56:23 -08:00
ZappoMan	0c5a978411	fix crash in activateWindowAfterEnterMode in no oculus case	2014-11-26 10:53:38 -08:00
ZappoMan	ad6680553c	snap cursor to center of HMD tools dialog when shown, or app when the dialog is hidden	2014-11-26 10:46:47 -08:00
Andrew Meadows	3262c9a8bd	don't lookup entity when deleting script	2014-11-26 10:27:03 -08:00
ZappoMan	c580617921	better mirrored monitor support	2014-11-26 10:23:44 -08:00
ZappoMan	59eeeb9006	add debug details to HMDTools	2014-11-26 10:11:29 -08:00
Sam Gateau	fa375539d0	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-11-26 09:42:31 -08:00
ZappoMan	821cf46ee9	don't delete the HMDToolsDialog on hide, keep it around till app exit.	2014-11-26 09:11:26 -08:00
ZappoMan	ee46c781c4	expand comment	2014-11-26 08:40:11 -08:00
Philip Rosedale	7737994399	Merge pull request #3865 from ctrlaltdavid/20197 CR for Job #20197 - Bug: Initial ping stats mis-reported	2014-11-26 08:08:50 -08:00
ZappoMan	53ecf97df2	fix broken camera after leaving oculus/hmd mode	2014-11-25 21:58:26 -08:00
ZappoMan	e94db7bbc2	removed some debug, added a resetSensors() on exit of HMD mode	2014-11-25 20:37:13 -08:00
ZappoMan	f111fb2c4b	added a comment to clarify why getCameraOrientation has an oculus special case	2014-11-25 20:36:39 -08:00
Andrzej Kapolka	f6a6e185cf	Heightfield import simplifications.	2014-11-25 18:53:27 -08:00
Andrzej Kapolka	7f14a66922	More work on heightfield quadtrees.	2014-11-25 18:27:09 -08:00
Sam Gateau	77077f4e9c	hack a separate emissive information in the g-buffer	2014-11-25 18:17:28 -08:00
Sam Gateau	cb1850e082	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-11-25 14:10:30 -08:00
ZappoMan	aa44906841	make HMD tools a checkable menu	2014-11-25 13:27:16 -08:00
Brad Hefta-Gaub	883fda241f	Merge pull request #3864 from huffman/entity-tools-front-draw Update entity tools to draw grabbers in front	2014-11-25 12:55:16 -08:00
ZappoMan	333f323856	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode	2014-11-25 12:46:18 -08:00
ZappoMan	bc376a0a15	more improvements to HMD Tools	2014-11-25 12:46:00 -08:00
ZappoMan	6108f7d9cd	fix bug in resetSensors moving cursor to center of window on multiple screen systems	2014-11-25 12:45:20 -08:00
Ryan Huffman	0b23b57e1e	Update border comment in Cube3DOverlay	2014-11-25 12:43:01 -08:00
Brad Hefta-Gaub	c4ea6bac1d	Merge pull request #3863 from huffman/overlay-front-draw Overlay Front Draw	2014-11-25 12:27:21 -08:00
Ryan Huffman	2cb30c2157	Update color used for Cube3DOverlay border	2014-11-25 12:17:46 -08:00
Ryan Huffman	f8c8ed868e	Update float that should be bool	2014-11-25 12:08:48 -08:00
Ryan Huffman	c5f2b3b588	Add borderSize to Cube3DOverlay	2014-11-25 12:05:13 -08:00
AndrewMeadows	450b365bb6	Merge pull request #3860 from ZappoMan/cleanupMenus remove spatial audio menu items	2014-11-25 11:28:18 -08:00
Ryan Huffman	9020fee31a	Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw	2014-11-25 09:53:18 -08:00
Ryan Huffman	649ae4a448	Update 3D overlays to only use one list	2014-11-25 09:49:10 -08:00
ZappoMan	e35242345c	first cut at HMD Tools dialog	2014-11-25 09:26:24 -08:00
ZappoMan	a28d74570d	bug fixes in setFullscreen() and setEnableVRMode()	2014-11-25 09:25:22 -08:00
Ryan Huffman	4febc45b6a	Add drawInFront to Base3DOverlay::getProperty	2014-11-25 08:44:38 -08:00
Ryan Huffman	925c2a8f6c	Update array to use pointers	2014-11-25 08:34:44 -08:00
Ryan Huffman	8b982872c2	Add calls to Overlays::render3DFront()	2014-11-24 23:19:53 -08:00
Ryan Huffman	0b46e35f31	Add support for separate list of 3d overlays to be drawn in front	2014-11-24 23:19:17 -08:00
Ryan Huffman	1d865ace9d	Add drawInFront property to Base3DOverlay	2014-11-24 21:16:29 -08:00
David Rowe	732ad8f993	Use valid font for Windows so that '-'s are displayed	2014-11-24 18:33:10 -08:00
David Rowe	01867e2459	Display "--" for ping values if not yet valid	2014-11-24 18:32:47 -08:00
dev	ce103acdf6	More debugging of the FBXReader in order to understand how to interpret the material fields	2014-11-24 18:32:36 -08:00
Sam Gateau	6a63099a0f	Fixed syntax issues and review critics, put all the debugging code in a #define block	2014-11-24 15:24:20 -08:00
Sam Gateau	68e2df8fc2	add a emissive parameter value to the lightmap shaders	2014-11-24 14:35:42 -08:00
ZappoMan	08772bbae0	remove spatial audio menu items	2014-11-24 13:07:22 -08:00
Sam Gateau	f67b4b9ff4	clean out comments so the 2 rendering modes for entities work, scene batch or per model batch	2014-11-24 11:44:54 -08:00
Andrew Meadows	37093cbd00	merge upstream/master into andrew/inertia Conflicts: interface/src/Application.cpp	2014-11-24 11:24:39 -08:00
Sam Gateau	1f22d5b493	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-11-24 10:05:39 -08:00
Philip Rosedale	137642f8a5	Merge pull request #3858 from ZappoMan/modelSceneRendering make render entities as scene the default	2014-11-23 14:08:25 -08:00
ZappoMan	2e9a9bf5c2	make render entities as scene the default	2014-11-23 12:01:58 -08:00
ZappoMan	80c1f5038c	Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks	2014-11-23 11:39:05 -08:00
ZappoMan	5ea6973fe7	fix isFacingAvatar for 3d text overlays	2014-11-23 10:53:03 -08:00
ZappoMan	efe202b7e8	make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby	2014-11-22 21:25:43 -08:00
ZappoMan	93755e6506	fix bugs in unloading scripts when changing domains	2014-11-22 11:53:50 -08:00
Sam Gateau	87471df7a1	First version of the lighmap working	2014-11-21 18:08:34 -08:00
Andrzej Kapolka	41eaf340c6	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-21 12:47:26 -08:00
Andrzej Kapolka	296718e2aa	Removed redundant members, clarified class names, used better hash factors.	2014-11-21 12:46:24 -08:00
David Rowe	9e32b2c64e	Suppress Windows C4305 compiler warnings in gverb includes	2014-11-20 20:58:31 -08:00
Andrzej Kapolka	87cc565c1a	I believe this should be a better hash function for the voxel coordinates.	2014-11-20 18:16:57 -08:00
Philip Rosedale	e07f53d022	remove unused test audio filters	2014-11-20 19:57:24 -06:00
Philip Rosedale	6e89437bce	simplify audio scope menu(s)	2014-11-20 19:34:56 -06:00
Andrzej Kapolka	2adb519193	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-20 17:34:51 -08:00
Philip Rosedale	9a9f6bc485	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-20 19:20:57 -06:00
Philip Rosedale	57d3bac805	Merge pull request #3844 from ZappoMan/sitEntityScript First cut at sit entity script	2014-11-20 19:20:39 -06:00
Andrzej Kapolka	d4693232d3	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-20 17:17:09 -08:00
Andrzej Kapolka	f2f7335f58	Increase the block size, reduce the overhead.	2014-11-20 17:16:52 -08:00
Philip Rosedale	ddcd39ea65	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-20 18:51:04 -06:00
Philip Rosedale	2a260f86c8	Merge pull request #3845 from birarda/lobby tweaks for new lobby orb	2014-11-20 18:46:43 -06:00
Andrzej Kapolka	1e294e043b	Batch voxel drawing, too.	2014-11-20 16:37:37 -08:00
Philip Rosedale	d8a74a4db4	add max distance at which you will auto-magically look at someone else	2014-11-20 18:34:06 -06:00
ZappoMan	b2c342c5c7	add support for unload method	2014-11-20 15:36:28 -08:00
Philip Rosedale	cd2a6f0f9c	merge fix	2014-11-20 17:35:50 -06:00
Philip Rosedale	e1ad9d3b4b	Fix eyes jittering when turning away/toward someone	2014-11-20 17:26:11 -06:00
Andrzej Kapolka	da85714dc8	Batch heightfield sections for better performance.	2014-11-20 15:09:38 -08:00
Andrew Meadows	1b778603c8	fix for crash in SkeletonModel::updateStandingFoot()	2014-11-20 14:21:08 -08:00
Stephen Birarda	47f86fac68	have QAudioOutput cleaned up with injector thread	2014-11-20 13:48:29 -08:00
Andrzej Kapolka	53809803dd	These edits need to be sent reliably	2014-11-20 12:56:56 -08:00
Andrzej Kapolka	d351a65999	Increase the smoothing cutoff.	2014-11-20 12:09:33 -08:00
Andrzej Kapolka	0a976ad262	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-20 11:26:29 -08:00
Sam Gateau	7daff18101	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-11-20 09:57:59 -08:00
Sam Gateau	764ad72471	adding the light map support from FBX	2014-11-20 09:54:41 -08:00
Andrzej Kapolka	fa122b505a	Further improvement to normals.	2014-11-19 17:38:45 -08:00
Atlante45	4d5451fafe	Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f Conflicts: interface/src/avatar/Avatar.cpp interface/src/avatar/SkeletonModel.cpp	2014-11-19 17:28:24 -08:00
Andrzej Kapolka	82fc75b2c4	Tweak to normal computation on dual contour surfaces.	2014-11-19 17:27:10 -08:00
Andrew Meadows	47f2cbd73b	merge upstream/master into andrew/inertia	2014-11-19 17:07:55 -08:00
Atlante45	ae3bcc8f06	No more .f	2014-11-19 16:53:39 -08:00
Brad Hefta-Gaub	3a8e89f754	Merge pull request #3831 from ey6es/master Clear the saccade when Faceshift is active.	2014-11-19 16:39:18 -08:00
Brad Hefta-Gaub	7dd88eca08	Merge pull request #3829 from samcake/temp1 refining the avatar display name rendering with different behavior if in...	2014-11-19 16:39:04 -08:00
Brad Hefta-Gaub	0b7c3d3356	Merge pull request #3828 from AndrewMeadows/bispinor don't slide feet during idle animations	2014-11-19 16:38:34 -08:00
Andrew Meadows	961dc5a231	merge andrew/thermonuclear into andrew/inertia Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h	2014-11-19 15:41:53 -08:00
Andrzej Kapolka	e943a6167c	Clear the saccade when Faceshift is active.	2014-11-19 13:27:13 -08:00
Andrzej Kapolka	b68c836b12	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-19 11:49:27 -08:00
dev	fc54ad93b8	refining the avatar display name rendering with different behavior if in HMD mode or not	2014-11-19 11:46:59 -08:00
Andrew Meadows	82bf0f6210	menu item for "idle animations shift hips" hack	2014-11-19 09:38:10 -08:00
Ryan Huffman	d1d561b833	Initialize ToolWindow _selfHidden property	2014-11-19 09:18:17 -08:00
Andrew Meadows	6673d9d0c2	avatar stands on lowest toe	2014-11-19 09:13:24 -08:00
dev	ce50152863	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-19 01:06:33 -08:00
dev	2e19ad48a7	ready for pull request	2014-11-19 00:50:59 -08:00
Andrzej Kapolka	d273e7c399	Render heightfields -> render spanners.	2014-11-18 19:49:08 -08:00
dev	4028e66c08	trying to fix the lighting issue in stereo and fix the display name size and orientation	2014-11-18 18:59:54 -08:00
Andrzej Kapolka	a0f75c990e	Working on fetching/clearing heightfield chunks.	2014-11-18 17:12:47 -08:00
Andrzej Kapolka	632f3bfa7f	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-18 17:12:40 -08:00
Stephen Birarda	2274b35d08	connect to sandbox domain by default	2014-11-18 15:35:11 -08:00
Brad Hefta-Gaub	ee19a2d5a7	Merge pull request #3820 from huffman/grid-updates Grid tool updates + fixes	2014-11-18 14:57:08 -08:00
Brad Hefta-Gaub	b94f8c6b87	Merge pull request #3818 from samcake/temp0 Introduce the Stereo optimization for occulus rendering path	2014-11-18 14:56:14 -08:00
Ryan Huffman	2bfd3d213a	Update ToolWindow to auto-hide itself when main window loses focus	2014-11-18 12:50:37 -08:00
Ryan Huffman	ad3d7fbfb4	Improve performance of drawing GridOverlay3D	2014-11-18 12:24:52 -08:00
Andrzej Kapolka	add615810b	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-18 11:19:04 -08:00
dev	5f3488eff6	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-18 10:34:49 -08:00
Andrew Meadows	3864adf82d	merge upstream/master into andrew/inertia	2014-11-18 10:24:17 -08:00
Andrew Meadows	388830c2a2	Merge branch 'bispinor' into inertia Conflicts: interface/src/entities/RenderableModelEntityItem.cpp libraries/entities/src/BoxEntityItem.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTree.h libraries/entities/src/EntityTreeElement.cpp	2014-11-18 10:23:38 -08:00
Brad Hefta-Gaub	e1085a6cbb	Merge pull request #3816 from AndrewMeadows/bispinor changes to EntityTree simulation state management	2014-11-18 10:03:22 -08:00
Andrew Meadows	2d400e6ae0	rename PhysicsWorld to PhysicsEngine	2014-11-18 09:55:25 -08:00
dev	853015da4c	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-18 09:47:25 -08:00
dev	2997589559	Merge branch 'temp0' of https://github.com/samcake/hifi into temp0	2014-11-18 09:46:43 -08:00
dev	4442b46880	Introduce the stereo improvment for the Oculus rendering path	2014-11-18 09:44:30 -08:00
Philip Rosedale	4168249ef5	Merge pull request #3817 from ZappoMan/movables Add "rotate" and "sounds" to movable.js	2014-11-18 09:17:08 -08:00
ZappoMan	35b5dd520e	added simulated holdingClickOnEntity in case of no mouse move	2014-11-17 20:12:58 -08:00
Andrzej Kapolka	24dc5f0db9	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-17 18:44:50 -08:00
Andrzej Kapolka	a3e65fc231	Simplification, window fix.	2014-11-17 18:44:38 -08:00
Andrew Meadows	b07a580651	merge updstream/master into andrew/bispinor	2014-11-17 17:50:17 -08:00
Andrew Meadows	af606f01a9	combined SimulationStates Moving and Changing also funnel entity updates by UDP packet through a single list	2014-11-17 17:35:44 -08:00
Atlante45	5eac93dcfd	User separate gverb instance for local reverb	2014-11-17 16:59:23 -08:00
Andrzej Kapolka	4308a45028	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-17 16:46:51 -08:00
Andrew Meadows	dd0bdabfe1	setSimulationState() --> computeSimulationState()	2014-11-17 15:50:35 -08:00
AndrewMeadows	b48c2c2717	Merge pull request #3813 from Atlante45/draggable_js Faster and better Local reverb / no echo	2014-11-17 15:16:06 -08:00
AndrewMeadows	c2e80aed70	Merge pull request #3809 from Atlante45/mute_signal JS Mute signal	2014-11-17 15:14:40 -08:00
Atlante45	a8c38aab64	dryFraction factorisation	2014-11-17 14:47:20 -08:00
Atlante45	082b9ff59f	Faster and better Local reverb / no echo	2014-11-17 13:43:55 -08:00
Stephen Birarda	473ae10104	shuffle files with QtGui dependency out of shared	2014-11-17 13:33:07 -08:00
Andrzej Kapolka	f18d4e4a0e	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-17 12:23:22 -08:00
Andrzej Kapolka	5b47b067b7	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-11-17 12:20:14 -08:00
Atlante45	de2b86957b	Proportional dry fraction	2014-11-17 12:04:45 -08:00
Andrzej Kapolka	3f3eae9350	Adjusted distances for new avatar sizes.	2014-11-17 12:02:09 -08:00
Atlante45	46eebe9d40	Give noisy mutes their own packet type	2014-11-17 10:26:47 -08:00
Atlante45	0507edf90f	Merge branch 'master' of https://github.com/highfidelity/hifi into mute_signal	2014-11-17 09:56:55 -08:00
Atlante45	2585013615	JS signal when AM mutes client	2014-11-17 09:54:43 -08:00
ZappoMan	5686ef6e94	Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity	2014-11-16 11:04:36 -08:00
Brad Hefta-Gaub	c5426914ff	Merge pull request #3806 from ctrlaltdavid/fix-bandwidth-dialog-opening Fix Bandwidth Details dialog opening if click meter's pos when UI hidden	2014-11-16 08:49:15 -08:00
Brad Hefta-Gaub	3ab5753ce0	Merge pull request #3803 from stojce/20170 CR for Job #20170 - Add checkbox to boolean item in NewEditEntities.js properties panel	2014-11-16 08:48:59 -08:00
ZappoMan	42e8d4d377	fix warnings in overlays	2014-11-15 20:38:21 -08:00
ZappoMan	05fa3c89a7	Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity	2014-11-15 20:38:07 -08:00
David Rowe	bb15fc138c	Fix Bandwidth Details dialog opening if click meter's pos when UI hidden	2014-11-15 09:28:40 -08:00
Brad Hefta-Gaub	db3755f4a6	Merge pull request #3794 from thoys/20176 CR for Job #20176 - Ability to clone Overlay in Javascript	2014-11-15 08:27:36 -08:00
Stojce Slavkovski	cc487d76ca	Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 Conflicts: examples/libraries/entityPropertyDialogBox.js	2014-11-15 09:50:09 +01:00
ZappoMan	60908ef040	fix some warnings	2014-11-14 22:15:28 -08:00
Andrzej Kapolka	479bea1eb2	Removed heightfield buffer code.	2014-11-14 17:18:34 -08:00
Andrzej Kapolka	bba042e823	Heightfield material paint bits.	2014-11-14 16:52:29 -08:00
ZappoMan	f31b5aba27	use actual background color	2014-11-14 16:31:50 -08:00
ZappoMan	dd349ebfd1	coding standard cleanup, fix warning	2014-11-14 16:03:43 -08:00
ZappoMan	62c64479c2	first cut at text entity	2014-11-14 15:58:12 -08:00
Thijs Wenker	38ed104397	added const to copy constructors	2014-11-15 00:21:50 +01:00
Thijs Wenker	1a9f7c6e21	Merge branch 'master' of https://github.com/worklist/hifi into 20176	2014-11-14 23:01:18 +01:00
Thijs Wenker	ba5491bc8b	moved writeToClone to copy constructor	2014-11-14 22:55:25 +01:00
Atlante45	0227bc742b	Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame	2014-11-14 13:30:04 -08:00
Andrzej Kapolka	6dc4abd286	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-14 13:22:37 -08:00
Brad Hefta-Gaub	8485a07352	Merge pull request #3799 from samcake/temp0 improvement on stereo rendering (but not Occulus....)	2014-11-14 13:06:43 -08:00
Andrzej Kapolka	aae168dd46	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-14 12:43:52 -08:00
Sam Gateau	4f878682a9	fix syntax	2014-11-14 12:38:50 -08:00
Sam Gateau	0973d197cf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 12:25:00 -08:00
Sam Gateau	43a6a0420b	remove useless comments	2014-11-14 12:24:38 -08:00
Andrzej Kapolka	14eb87aefd	Eliminate wacky scales in favor of newfangled "meters."	2014-11-14 12:23:47 -08:00
Atlante45	4c40f5e7de	Changed entity scripts debug	2014-11-14 12:20:20 -08:00
Sam Gateau	d9ae3eb5b6	clean version of the simple stereo ack, not available for Occulus yet	2014-11-14 12:07:59 -08:00
Brad Hefta-Gaub	1d14f94cb0	Merge pull request #3797 from huffman/entity-tool-properties Entity Tools - Properties window, Tool window, Various fixes	2014-11-14 11:48:57 -08:00
Sam Gateau	cc78000641	introduce the concept of side thorugh out the rendering traversal	2014-11-14 11:22:11 -08:00
Thijs Wenker	fa4555a7a2	Merge branch 'master' of https://github.com/worklist/hifi into 20176 Conflicts: interface/src/ui/overlays/Grid3DOverlay.cpp interface/src/ui/overlays/ImageOverlay.cpp interface/src/ui/overlays/Line3DOverlay.cpp interface/src/ui/overlays/LocalVoxelsOverlay.cpp interface/src/ui/overlays/LocalVoxelsOverlay.h interface/src/ui/overlays/Overlay.h interface/src/ui/overlays/Overlay2D.cpp interface/src/ui/overlays/Text3DOverlay.cpp interface/src/ui/overlays/TextOverlay.cpp interface/src/ui/overlays/TextOverlay.h	2014-11-14 20:09:27 +01:00
Thijs Wenker	fa03a7eb0c	fix ubuntu build	2014-11-14 19:53:56 +01:00
Ryan Huffman	28eebd3fa5	Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties	2014-11-14 10:53:18 -08:00
Stephen Birarda	f23b08971c	merge with cuckoo branch, fix makefile OS X support	2014-11-14 10:52:12 -08:00
Ryan Huffman	604b1b620b	Move dock window to ToolWindow	2014-11-14 10:52:08 -08:00
Stephen Birarda	903cd05ff8	put newlines back in interface log	2014-11-14 10:39:45 -08:00
Thijs Wenker	76ae60c5ca	fix Ubuntu build	2014-11-14 19:27:27 +01:00
Andrew Meadows	bd34ac4357	merg upstream/master into andrew/inertia	2014-11-14 10:05:30 -08:00
Sam Gateau	f09b58c255	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 10:05:01 -08:00
Sam Gateau	642f436fba	first draft of factorizing the rendering traversal for both sides in stereo	2014-11-14 09:56:36 -08:00
Andrew Meadows	5ba213f8d1	fix for function override with no return	2014-11-14 09:33:11 -08:00
Andrew Meadows	5eb606c44a	merge upstream/master into andrew/inertia	2014-11-14 09:04:27 -08:00
Andrew Meadows	1a094f2b51	reorder PhysicsWorld and EntityTree in Application	2014-11-14 09:03:41 -08:00
AndrewMeadows	edc599bc2d	Merge pull request #3792 from ZappoMan/bugFixes fix a couple bugs	2014-11-14 08:33:49 -08:00
Andrzej Kapolka	b879471a4b	Cursor rendering on spanners.	2014-11-13 20:55:36 -08:00
Brad Hefta-Gaub	db2b5fc28d	Merge pull request #3791 from ctrlaltdavid/20128 CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints	2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub	27c37f3a4e	Merge pull request #3784 from ctrlaltdavid/20157 CR for Job #20157 - Enable "Get Overlay properties" from javascript	2014-11-13 20:43:38 -08:00
Ryan Huffman	3658d65028	Remove grid tool from menu	2014-11-13 20:02:19 -08:00
Andrzej Kapolka	b2ac33db16	Ray tests for heightfield spanners.	2014-11-13 19:53:16 -08:00
ZappoMan	6a4f1c857f	fix a couple bugs	2014-11-13 18:35:04 -08:00
Andrzej Kapolka	75e1cf8a7b	Migrate getHeightfieldHeight to spanner heightfields.	2014-11-13 18:00:25 -08:00
Ryan Huffman	6b2a497810	Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes	2014-11-13 17:48:17 -08:00
Ryan Huffman	03f155bcd8	Add tool window	2014-11-13 17:47:02 -08:00
Ryan Huffman	55612cc596	Add title to WebWindowClass	2014-11-13 17:46:20 -08:00
Philip Rosedale	4e11191856	Merge pull request #3789 from birarda/lobby use ResourceCache for Sound files so they are cached too	2014-11-13 16:30:06 -08:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
ZappoMan	49ef6f8be0	some cleanup	2014-11-13 14:53:37 -08:00
ZappoMan	3ff89be3fd	actually only pick programs once	2014-11-13 14:51:47 -08:00
Stephen Birarda	e10d132f75	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00

... 13 14 15 16 17 ...

10660 commits