34343 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	0ea901fd72	fix various warnings	2015-11-10 08:34:58 -08:00
Brad Hefta-Gaub	fce6fdcc5e	Merge pull request #6356 from Atlante45/master ... Fix warnings on OS X	2015-11-10 08:15:19 -08:00
Brad Davis	1d693ffd66	Merge pull request #6359 from ZappoMan/fixRenderItemLeak ... fix render item leak on Model::reset()	2015-11-09 17:34:18 -08:00
Brad Hefta-Gaub	021a6e689d	added some asserts to test future mistakes that would cause render item leaks	2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub	e47b049200	fix render item leak on Model::reset()	2015-11-09 16:41:40 -08:00
Anthony Thibault	684b9f5f10	Merge pull request #6354 from AndrewMeadows/fix-hip-shift ... fix hips shift when using HMD	2015-11-09 14:28:37 -08:00
Atlante45	767a7a7f1e	Fix warnings on OS X	2015-11-09 14:26:23 -08:00
U-GAPOS\andrew	390310f822	swap the order of checks	2015-11-09 14:15:09 -08:00
U-GAPOS\andrew	c07b97920e	fix for avatars created with blender	2015-11-09 14:11:45 -08:00
U-GAPOS\andrew	2716a9f2b4	fix IK for feet targets	2015-11-09 13:11:03 -08:00
James B. Pollack	4cb5e710a3	Merge pull request #6352 from imgntn/pinghull ... Fix compound shape link	2015-11-09 12:20:52 -08:00
James B. Pollack	36dfe81fde	fix link	2015-11-09 12:19:23 -08:00
Eric Levin	7700e67734	Merge pull request #6326 from imgntn/entity_params ... Add Ability to Pass Parameters When Calling Methods on Entities	2015-11-09 12:17:58 -08:00
Eric Levin	4b684c0e63	Merge pull request #6350 from imgntn/pongupdates ... Add New Collision Hull and Collision Sound to Ping Pong Gun	2015-11-09 11:34:37 -08:00
James B. Pollack	1812444614	Merge pull request #6278 from ericrius1/particleSorting ... Added additiveBlending property to particle effect entity	2015-11-09 11:32:44 -08:00
James B. Pollack	ef7caa8da9	Add new collision hull and sound to ping pong gun	2015-11-09 10:48:12 -08:00
Eric Levin	8e039fe465	Merge pull request #6338 from imgntn/string_polyfills ... Add More Methods to stringHelpers.js	2015-11-09 10:25:13 -08:00
Eric Levin	ceba1c4b02	Merge pull request #6340 from imgntn/usertiming ... Adapt UserTiming library and Add Example	2015-11-09 10:25:04 -08:00
Brad Hefta-Gaub	53b231987c	Merge pull request #6349 from jherico/marge ... Prevent sixense manager from triggering continuous reset	2015-11-09 09:52:16 -08:00
Seth Alves	030bb71f19	Merge pull request #6337 from howard-stearns/fix-agent-avatar ... fix agent avatar animation	2015-11-09 09:38:27 -08:00
Brad Davis	07be03dc7e	Bad merge fix, PR feedback	2015-11-09 09:30:18 -08:00
Brad Davis	2ecc4f8a5c	Prevent sixense manager from triggering continuous reset	2015-11-09 09:16:32 -08:00
Ryan Downe Karpf	78228da64a	Merge pull request #6342 from imgntn/bballsounds ... Add Collision Sounds to Basketballs in Toybox	2015-11-09 09:07:39 -08:00
James B. Pollack	f9f017b787	Merge pull request #6348 from imgntn/readdrightclick ... re-add right click example	2015-11-06 22:56:35 -08:00
James B. Pollack	bf4320e5cc	re-add this example	2015-11-06 22:55:33 -08:00
James B. Pollack	34d98cac5e	Update usertiming.js	2015-11-06 22:12:03 -08:00
James B. Pollack	369eec2abd	Update usertimingExample.js	2015-11-06 22:05:30 -08:00
James B. Pollack	4fbff5d667	Update usertimingExample.js	2015-11-06 21:39:53 -08:00
Clément Brisset	2c27d18922	Merge pull request #6282 from jherico/externals ... Runtime plugins fixes	2015-11-06 19:30:40 -08:00
Clément Brisset	517ef7dfc8	Merge pull request #6336 from ericrius1/avatarMover ... Restores the avatar mover app after its loss in S3	2015-11-06 19:30:24 -08:00
Brad Davis	e84f3af483	Merge pull request #6343 from Atlante45/sixense ... Sixense cleanup	2015-11-06 17:50:12 -08:00
Atlante45	68a72b0f41	Bit of cleanup	2015-11-06 17:28:51 -08:00
Brad Davis	6122fa145d	More PR feedback	2015-11-06 17:17:26 -08:00
Atlante45	137a2c1c48	Fix file headers	2015-11-06 17:15:34 -08:00
samcake	07fb3a0532	Merge pull request #6341 from howard-stearns/for-sam ... Make life easier for Sam.	2015-11-06 17:13:22 -08:00
James B. Pollack	d8f169bd4e	add collision sounds to bballs	2015-11-06 17:04:55 -08:00
Howard Stearns	314c11e8d4	Make life easier for Sam.	2015-11-06 16:59:46 -08:00
Brad Davis	37a9538f10	PR feedback, ensure destruction of shared objects	2015-11-06 16:57:31 -08:00
Brad Davis	11733c039f	Allow shared libraries to access core global objects	2015-11-06 16:57:31 -08:00
Brad Davis	0c60538952	Ensure that dependencies of runtime plugins are included in the DLL copy	2015-11-06 16:57:30 -08:00
Atlante45	6323728d7a	Added perfect forwarding of arguments	2015-11-06 16:56:48 -08:00
Atlante45	d95709ee73	Added input plugins logging category	2015-11-06 16:45:23 -08:00
Atlante45	0a65bb145b	Some more code cleanup	2015-11-06 16:44:28 -08:00
samcake	7890aa6ec1	Merge pull request #6333 from jherico/rec2 ... Adding clip serialization implementation, tests	2015-11-06 16:38:39 -08:00
Atlante45	6ad20e417b	Typo	2015-11-06 16:33:36 -08:00
Atlante45	e3b54f0272	Cleanup	2015-11-06 16:33:29 -08:00
Atlante45	503e03d4a8	Remove unused using	2015-11-06 16:33:22 -08:00
Atlante45	96aa5be457	Implement all Sixense methods for OS X	2015-11-06 16:33:16 -08:00
Atlante45	298ac650d8	Isolate sixense dynamic linking for OSX	2015-11-06 16:33:07 -08:00
James B. Pollack	f478261ed0	cleanup	2015-11-06 16:21:53 -08:00