30298 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	b19f1e0631	Merge pull request #5658 from ctrlaltdavid/20653 ... Add Desktop object to JavaScript with width and height properties	2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub	1cd699de9d	Merge pull request #5657 from birarda/master ... fix for 0 entity avg ping	2015-08-25 22:27:44 -07:00
Brad Hefta-Gaub	029c59fb77	Merge pull request #5654 from jherico/barney ... Fix stereo modes aspect ratio	2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub	5d5c1584c3	Merge pull request #5659 from jherico/nelson ... Fix UserInputMapper event generation	2015-08-25 22:14:37 -07:00
samcake	fda9827100	Merge pull request #5529 from SeijiEmery/gputest ... gputest	2015-08-25 20:03:08 -07:00
Brad Davis	073567558e	Fix UserInputMapper event generation	2015-08-25 19:15:06 -07:00
Brad Davis	f176003dad	Fixing aspect ratio on stereo plugins	2015-08-25 19:05:31 -07:00
Seiji Emery	d29a368688	removed debug	2015-08-25 16:50:09 -07:00
Seiji Emery	140edd0589	try removing quotes...	2015-08-25 16:21:38 -07:00
David Rowe	9d3d104ec3	Add Desktop object to JavaScript with width and height properties	2015-08-25 16:13:36 -07:00
Seiji Emery	248d0729a6	test	2015-08-25 15:29:36 -07:00
Seiji Emery	62dc83fa32	test	2015-08-25 15:00:21 -07:00
Seiji Emery	3d59f8d7e8	changed setup_project to only use the generated shader source files	2015-08-25 14:40:52 -07:00
Seiji Emery	316ddd68ef	force cmake autoscribe to use full paths	2015-08-25 13:46:50 -07:00
Stephen Birarda	6f14eb2206	fix for 0 entity avg ping	2015-08-25 12:35:34 -07:00
Clément Brisset	08ee5cbc17	Merge pull request #5656 from howard-stearns/fix-direct-url-avatars ... fix direct-url avatars	2015-08-25 21:30:05 +02:00
Howard Stearns	6508d5943a	textChanged has to do something	2015-08-25 11:29:27 -07:00
Philip Rosedale	ff3a0480fe	Merge pull request #5652 from birarda/master ... tweaks to domain-server web interface	2015-08-24 21:36:52 -07:00
Brad Davis	f9f5743fd7	Merge pull request #5650 from ZappoMan/fixCrashInController ... Fix a couple crashes in the Controller scripting interface	2015-08-24 18:49:50 -07:00
Stephen Birarda	17befac262	use fixed width for stats tables	2015-08-24 18:10:21 -07:00
Stephen Birarda	b8ac9aa5eb	update jquery and bootstrap in DS	2015-08-24 18:02:26 -07:00
Brad Hefta-Gaub	34e32ddaeb	Merge pull request #5636 from howard-stearns/marketplace-avatars ... marketplace avatars	2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub	5ea6d2704a	Merge pull request #5628 from ctrlaltdavid/webwindow-external-links ... Make WebWindow hyperlinks with target="_blank" open in user's browser	2015-08-24 17:45:35 -07:00
Brad Hefta-Gaub	53ae958c74	Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix ... Fix for RenderableParticleEffectEntity crash.	2015-08-24 17:44:39 -07:00
Brad Hefta-Gaub	c6174ad88a	Merge pull request #5647 from jherico/homer ... Removing tabs from our javascript	2015-08-24 17:33:57 -07:00
Brad Hefta-Gaub	13a9dc4df2	cleanup controller interface, add getActionNames() and getDeviceNames()	2015-08-24 15:35:55 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Seiji Emery	4d9f45475e	Merge branch 'master' of https://github.com/highfidelity/hifi into gputest	2015-08-24 14:38:26 -07:00
Brad Hefta-Gaub	6549e47dbc	fix crash in Controller when asking for device name out of bounds	2015-08-24 14:35:19 -07:00
Seiji Emery	bd18951be8	fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/	2015-08-24 13:13:24 -07:00
Seiji Emery	691cb48a08	Fixed to use standard shaders from render-utils	2015-08-24 11:26:56 -07:00
Anthony J. Thibault	47b8ab373c	Fix for RenderableParticleEffectEntity crash. ... The render item payload now keeps a shared_ptr to the entity.	2015-08-24 11:15:30 -07:00
Brad Hefta-Gaub	275cdf9d8f	Merge pull request #5581 from larsnaesbye/master ... Preliminary da_DK translation of Interface	2015-08-24 10:36:30 -07:00
Brad Davis	78a08ed7c7	Merge pull request #5641 from thoys/20660 ... CR for Job #20660 - Render the world Axis markers into negative space, add view option	2015-08-24 10:16:56 -07:00
Howard Stearns	bb91b17314	Merge pull request #5634 from hyperlogic/tony/animation-resource-fix ... Fix for animation resources	2015-08-24 08:13:33 -07:00
Nex Pro	8d8a9535a0	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-24 16:07:38 +01:00
Nex Pro	3f4323e084	Added overload for renderDashedLine	2015-08-24 16:07:07 +01:00
Andrew Meadows	1d7d5071ae	Merge pull request #5633 from howard-stearns/restore-body-indicators ... Restore body indicators (e.g., lookAt vectors).	2015-08-23 15:46:57 -07:00
Brad Hefta-Gaub	0eaeb99064	Merge pull request #5640 from jherico/maggie ... Fixing build problem with 3d connexion	2015-08-23 13:46:49 -07:00
Thijs Wenker	bbd6f25ff7	style fixes	2015-08-23 20:01:58 +02:00
Thijs Wenker	0f8cf80d45	Merge branch 'master' of https://github.com/worklist/hifi into 20660	2015-08-23 19:53:50 +02:00
Thijs Wenker	63f0173665	extend world boundaries	2015-08-23 19:52:29 +02:00
Brad Davis	b7237fb5ca	Fixing build problem with 3d connexion	2015-08-23 09:32:58 -07:00
Nex Pro	53a63fed79	Changed constants red, green, blue and grey to uppercase as per style guide.	2015-08-23 17:16:23 +01:00
Thijs Wenker	748625399e	"View -> World Axes" menu option	2015-08-23 17:59:58 +02:00
Thijs Wenker	b7f9bc13da	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-23 17:52:51 +02:00
Nex Pro	0ef2def56e	changed default DASH_LENGTH and GAP_LENGTH to 1.0f	2015-08-23 16:52:12 +01:00
Thijs Wenker	9de35511fc	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-23 17:50:28 +02:00
Nex Pro	3e8970cc1e	corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide.	2015-08-23 16:49:39 +01:00
Thijs Wenker	90c8200d66	Merge branch '20660' of github.com:thoys/hifi into 20660	2015-08-23 17:44:43 +02:00