43153 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	1ec9ef560e	Fixing the srgb color format conversion for web entities	2016-05-11 10:46:54 -07:00
samcake	e40a795a27	Trying to clean up for pr	2016-05-10 19:25:22 -07:00
samcake	303cade547	Merge branch 'master' of https://github.com/highfidelity/hifi into lemon	2016-05-10 09:56:05 -07:00
Brad Hefta-Gaub	d7eee98acc	Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum ... resurrection of threadsafe ViewFrustum	2016-05-10 09:06:38 -07:00
Brad Hefta-Gaub	466b535e4e	Merge pull request #7852 from ZappoMan/fixUpdateDialogFormatting ... fix the update dialog to not show blank lines for missing version numbers	2016-05-10 08:18:38 -07:00
Brad Hefta-Gaub	573f6f3faa	Merge pull request #7843 from sethalves/fix-stanard-library-include-some-more ... make Script.include(/~/system/libraries/utils.js) work from web again	2016-05-10 08:17:08 -07:00
Brad Hefta-Gaub	20b7e5f0a9	Merge pull request #7851 from Atlante45/remove-deadlock-status ... Remove Deadlock status	2016-05-10 07:53:50 -07:00
Andrew Meadows	db9a4d6b8f	cleanup for code review	2016-05-10 07:49:11 -07:00
Brad Hefta-Gaub	6f84268593	Merge pull request #7850 from sethalves/nbody-example ... Philip's gravity example	2016-05-10 07:48:25 -07:00
Seth Alves	68201746aa	Merge branch 'master' of github.com:highfidelity/hifi into fix-stanard-library-include-some-more	2016-05-09 18:39:37 -07:00
samcake	00f2e34aa9	Changing emissive to unlit	2016-05-09 17:18:07 -07:00
samcake	615f4028c4	fixing the web enitites lighting, still need to solve the sRGB for it, starting to introduce the unlit feature to the overlays	2016-05-09 17:17:16 -07:00
Brad Hefta-Gaub	7bb21d3700	fix the update dialog to not show blank lines for missing version numbers	2016-05-09 16:19:03 -07:00
Brad Hefta-Gaub	0de721e8f4	Merge pull request #7838 from zzmp/refactor/script-sleep ... Use sleep_until for ScriptEngine	2016-05-09 15:58:22 -07:00
Atlante45	5c196f3df5	Remove Deadlock status	2016-05-09 15:53:45 -07:00
Andrew Meadows	59c6a6dfea	Merge pull request #7825 from sethalves/linux-qol ... Linux qol	2016-05-09 15:34:10 -07:00
Andrew Meadows	ffc3123467	Merge pull request #7658 from sethalves/grab-fixes ... Grab fixes	2016-05-09 15:30:37 -07:00
Seth Alves	9fe827a93b	d'oh	2016-05-09 15:28:25 -07:00
Brad Hefta-Gaub	22081a8606	Merge pull request #7833 from zzmp/fix/scriptable-resource ... Fix prefetching	2016-05-09 15:09:20 -07:00
Zach Pomerantz	7db082b915	Amend comment that was not a busy wait	2016-05-09 15:05:13 -07:00
Seth Alves	7ab52b8869	don't check fbx files into sourc	2016-05-09 14:58:26 -07:00
Seth Alves	ced7a56e39	Philip's gravity example	2016-05-09 14:43:24 -07:00
Brad Hefta-Gaub	2c0204b0d6	Merge pull request #7821 from Atlante45/fix/collision-sound ... Fix avatar/entity collision sound	2016-05-09 14:24:19 -07:00
Brad Hefta-Gaub	343bc2a747	Merge pull request #7841 from jherico/mac_oculus ... OSX Rift functionality	2016-05-09 13:12:46 -07:00
samcake	37f16e9c86	Merging with master	2016-05-09 12:01:58 -07:00
Brad Hefta-Gaub	312ea20e15	Merge pull request #7797 from zzmp/fix/cache-thread-safety ... Make ResourceCache::resetResourceCounters threadsafe	2016-05-09 11:52:57 -07:00
Brad Hefta-Gaub	ab0a77c82b	Merge pull request #7830 from ZappoMan/removeusleeps ... switch OctreeSendThread and OctreePersistThread to use std::this_thread::sleep_for() instead of usleep()	2016-05-09 11:47:40 -07:00
Brad Hefta-Gaub	39a4e38485	Merge pull request #7837 from samcake/hdr ... Fixing the bad color format for skymaps	2016-05-09 11:47:02 -07:00
samcake	0bfad4a549	Merge branch 'master' of https://github.com/highfidelity/hifi into lemon	2016-05-09 11:33:47 -07:00
Chris Collins	91a5d82af5	Merge pull request #7826 from zzmp/perf/mipmap ... Defer mipmap gen to gpu	2016-05-09 10:52:49 -07:00
Chris Collins	4f22e0ad5a	Merge pull request #7828 from sethalves/show-other-sim-owner ... show with debug icons when someone else is the simulation owner	2016-05-09 10:49:30 -07:00
Brad Davis	335841bf0f	Fix plugin loading on OSX	2016-05-08 23:35:18 -07:00
Seth Alves	b0a5d8b719	make Script.include(/~/system/libraries/utils.js) work from web again	2016-05-08 08:45:58 -07:00
Bradley Austin Davis	0f768b13b9	Working on OSX Rift functionality	2016-05-07 20:17:31 -07:00
Seth Alves	f8f86a0d45	only _exit if not DEBUG	2016-05-07 11:05:38 -07:00
Seth Alves	4b1274cb0f	Merge branch 'master' of github.com:highfidelity/hifi into linux-qol	2016-05-07 11:04:50 -07:00
Zach Pomerantz	173d2a590c	Use sleep_until for ScriptEngine	2016-05-06 19:30:37 -07:00
samcake	1fec984ead	fixing the linear COlor FOrmat flag	2016-05-06 19:07:07 -07:00
samcake	da75c27188	fixing bad color format assignment code and bad color format for the cubemaps	2016-05-06 18:57:19 -07:00
samcake	a8347cac6e	Getting the unlit to work from the pipeline, and found the isLinear for texture bug!	2016-05-06 18:36:55 -07:00
Clément Brisset	b234d94d25	Merge pull request #7832 from birarda/session-location ... repairs to user heartbeats	2016-05-06 15:15:52 -07:00
Zach Pomerantz	0fbbbaa985	Add tex loadPerfTest.js	2016-05-06 15:08:45 -07:00
Zach Pomerantz	3f4f10a27e	Fix prefetch state changes	2016-05-06 15:08:45 -07:00
Zach Pomerantz	eee487723c	Fix headers of scriptableResource tests	2016-05-06 15:08:44 -07:00
Zach Pomerantz	83fad4c52f	Fix equalities in scriptableResource tests	2016-05-06 15:08:44 -07:00
Chris Collins	8eb61e9470	Merge pull request #7820 from imgntn/usersJS ... Add users.js to default, start visible to friends only	2016-05-06 16:07:23 -06:00
Brad Hefta-Gaub	6d97ad609b	Merge pull request #7818 from zzmp/fix/colliding-fbx-paths ... Fix colliding fbx tex names	2016-05-06 15:03:58 -07:00
Stephen Birarda	6f6221840e	put back the correct metaverse API url in NetworkingConstants	2016-05-06 13:26:23 -07:00
Stephen Birarda	fb09efc0c9	send location updates immediately on mode change and startup	2016-05-06 12:01:03 -07:00
Stephen Birarda	258c5308db	don't require an active domain connection for location update	2016-05-06 11:57:25 -07:00