41000 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	ad5a111b85	simple baton	2016-03-22 17:04:47 -07:00
ericrius1	dfffe5f431	more removal	2016-03-22 15:02:44 -07:00
ericrius1	a0e8e00357	removed cache defeating code and fixed whitespace	2016-03-22 15:02:00 -07:00
ericrius1	918c61c166	removed extra code from virtualBaton	2016-03-22 10:34:10 -07:00
ericrius1	c9c5d3d8bc	removed VRVJ files	2016-03-22 10:32:04 -07:00
ericrius1	94283904b8	update	2016-03-22 10:26:13 -07:00
ericrius1	1c876fe110	update	2016-03-22 10:16:49 -07:00
ericrius1	f043b27a56	hardcoded num avatars	2016-03-22 10:12:44 -07:00
ericrius1	130eb6b619	working for one;	2016-03-22 10:07:59 -07:00
ericrius1	bc8a8ac703	fix syntax error	2016-03-22 10:00:44 -07:00
ericrius1	2bb11c5dc6	unload baton	2016-03-22 09:59:10 -07:00
ericrius1	2dce75bfb0	baton sound	2016-03-21 17:22:18 -07:00
ericrius1	adeaa9475e	num	2016-03-21 16:49:55 -07:00
ericrius1	9c18d6c016	change name	2016-03-21 16:47:51 -07:00
ericrius1	efd56ac22a	spawner	2016-03-21 16:45:23 -07:00
ericrius1	51508b467c	uupdate	2016-03-21 15:59:03 -07:00
ericrius1	98e43a8d0f	more logging	2016-03-21 15:54:47 -07:00
ericrius1	b4509e428b	bugs	2016-03-21 15:37:20 -07:00
ericrius1	81901dc73d	log change	2016-03-21 15:04:57 -07:00
ericrius1	b8cb71e16a	debug	2016-03-21 15:02:39 -07:00
ericrius1	7659aed97a	dont delete the entity when spawner script shutdown	2016-03-21 14:42:53 -07:00
ericrius1	b4e400f3aa	baton sound logging updates	2016-03-21 14:42:28 -07:00
ericrius1	493a91fa27	with debug box	2016-03-21 14:32:22 -07:00
ericrius1	e5b2483604	sound seems to be working"	2016-03-21 14:09:02 -07:00
ericrius1	68dc5a8251	just playing on start update	2016-03-21 13:57:54 -07:00
ericrius1	b7534fbd57	basics of virtual baton	2016-03-21 13:52:26 -07:00
ericrius1	6c5ad187a0	Merge remote-tracking branch 'upstream/master'	2016-03-21 11:51:38 -07:00
Brad Hefta-Gaub	091e34e792	Merge pull request #7396 from AndrewMeadows/do-not-trust ... prevent crash in SwingTwistConstraint	2016-03-21 11:13:41 -07:00
Andrew Meadows	fa7371aff8	Merge pull request #7408 from highfidelity/revert-7387-fixBlenderCrash ... Revert "Fix ModelBlender crash"	2016-03-21 10:54:01 -07:00
Brad Hefta-Gaub	f274cdcc7f	Revert "Fix ModelBlender crash"	2016-03-21 10:47:31 -07:00
Andrew Meadows	cd802a6549	Merge pull request #7406 from hyperlogic/tony/transparent-texture-fix ... Model: fix for avatars with late loaded transparent textures.	2016-03-21 09:19:33 -07:00
Andrew Meadows	d7d428d1b2	Merge pull request #7387 from ZappoMan/fixBlenderCrash ... Fix ModelBlender crash	2016-03-21 09:14:11 -07:00
Brad Hefta-Gaub	6822f0643b	Merge pull request #7397 from zzmp/fix/ambient-url-listener ... Add back ambientURL listener in editor	2016-03-21 08:49:43 -07:00
Brad Hefta-Gaub	2e7bc5f430	Merge pull request #7405 from sethalves/fix-voxels-js ... make voxels.js buttons work, again	2016-03-21 08:46:29 -07:00
Anthony Thibault	b06f027f2e	Model: fix for avatars with late loaded transparent textures.	2016-03-20 18:20:03 -07:00
Seth Alves	b600000307	refactor code a bit	2016-03-20 17:59:15 -07:00
Brad Hefta-Gaub	92c9dbc1aa	Merge pull request #7404 from sethalves/quiet-invisible-zone ... don't spam log when a zone is invisible	2016-03-20 17:56:15 -07:00
Seth Alves	21c688390c	make voxels.js buttons work, again	2016-03-20 17:40:03 -07:00
Seth Alves	f8b8877369	coding standard	2016-03-20 17:37:06 -07:00
Brad Hefta-Gaub	5b3be03098	Merge pull request #7402 from hyperlogic/tony/empty-geometry-crash ... NetworkGeometry: Fix crash for empty geometry/bad FBX versions	2016-03-20 17:25:27 -07:00
Seth Alves	d4ed9993b2	don't spam log when a zone is invisible	2016-03-20 15:06:17 -07:00
Brad Hefta-Gaub	9d4d396db4	Merge pull request #7403 from hyperlogic/tony/disable-watchdog-for-debug ... Application: disable deadlock watchdog for debug builds	2016-03-20 12:37:50 -07:00
Anthony Thibault	b71a56de38	Application: disable deadlock watchdog for debug builds ... Cause it will cause a crash if you sit on a breakpoint for too long.	2016-03-20 12:18:33 -07:00
Anthony Thibault	6e872edcae	NetworkGeometry: Fix crash for empty geometry/bad FBX versions ... Interpret empty geometry as an error.	2016-03-20 12:13:54 -07:00
Brad Hefta-Gaub	b8929c4416	Merge pull request #7384 from zzmp/fix/bugsplat-1836 ... Check qml gl context on create	2016-03-20 11:26:09 -07:00
Zach Pomerantz	12aa057ff6	Always log if gl context fails	2016-03-18 18:37:14 -07:00
Zach Pomerantz	105b4e16a9	Add back ambientURL listener in editor	2016-03-18 16:18:41 -07:00
Andrew Meadows	e81e49b32e	prevent crash in SwingTwistConstraint	2016-03-18 15:59:25 -07:00
Brad Hefta-Gaub	c3c7d3d776	Merge pull request #7394 from howard-stearns/safer-early-exit-for-obj-subresources ... Safer early-bail for fetch of subresources of .obj models.	2016-03-18 15:42:33 -07:00
howard-stearns	b9a3e130cb	Safer early-bail for fetch of subresources of .obj models.	2016-03-18 15:02:30 -07:00