40545 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	0f17d1f12e	add reset userdata to everything	2016-03-17 22:19:20 -07:00
James B. Pollack	c072cd323e	start fish fix	2016-03-17 19:11:12 -07:00
James B. Pollack	855f505ae1	minor adjustments	2016-03-17 17:01:48 -07:00
James B. Pollack	8f00e9ea27	werk	2016-03-17 15:08:35 -07:00
James B. Pollack	0789f869da	tankfix	2016-03-17 11:18:56 -07:00
James B. Pollack	5dbec15ae0	logging	2016-03-17 11:10:28 -07:00
James B. Pollack	78775baf8c	yo;	2016-03-17 11:06:46 -07:00
James B. Pollack	bb18366cbd	clean and log	2016-03-17 10:58:24 -07:00
James B. Pollack	d9526b6506	utils	2016-03-17 10:45:52 -07:00
James B. Pollack	9933690ed6	whitebrd	2016-03-17 10:36:35 -07:00
James B. Pollack	bdcc621996	rotate whiteboard	2016-03-17 10:32:24 -07:00
James B. Pollack	5a6e0e4d80	clean	2016-03-17 10:15:53 -07:00
James B. Pollack	3432e7821f	resets	2016-03-17 10:08:44 -07:00
James B. Pollack	fc3bac7fa5	changes	2016-03-17 09:57:57 -07:00
James B. Pollack	b080dd8c64	cleanup	2016-03-17 09:42:17 -07:00
James B. Pollack	16f2ef48fe	adjust	2016-03-17 09:36:10 -07:00
James B. Pollack	c35e4bc78a	working reset and ping pong	2016-03-17 09:18:12 -07:00
James B. Pollack	ed1913e58d	add ping pong gun and enable some items	2016-03-17 01:03:21 -07:00
James B. Pollack	4dd3f2a097	moar	2016-03-16 18:37:21 -07:00
James B. Pollack	0193889690	line endings	2016-03-16 17:49:20 -07:00
James B. Pollack	8477b721a4	add kinetic objects	2016-03-16 15:48:17 -07:00
James B. Pollack	b6955ec77f	refs	2016-03-14 18:59:15 -07:00
James B. Pollack	432810704e	tidy	2016-03-14 18:53:29 -07:00
James B. Pollack	8877a6c570	tidyyy guy!	2016-03-14 17:58:12 -07:00
James B. Pollack	2c8f13b538	entity script reset	2016-03-14 16:47:18 -07:00
James B. Pollack	169cd70a8c	Merge branch 'homeswitches' into homereset	2016-03-14 16:00:19 -07:00
Brad Hefta-Gaub	830f53cc46	Merge pull request #7345 from sethalves/delete-parentless-entities-redux ... Delete parentless entities redux	2016-03-14 10:04:22 -07:00
Chris Collins	e577658315	Merge pull request #7333 from PhilipRosedale/testSound ... playTestSound.js - better clip for testing/showing audio	2016-03-14 08:44:28 -07:00
Brad Hefta-Gaub	7f4cbeda00	Merge pull request #7343 from jherico/procedural_time ... Fix iDate uniform in procedurals to be continuous	2016-03-13 22:08:54 -07:00
Brad Hefta-Gaub	9e0d9f5748	Merge pull request #7337 from sethalves/disable-oculus-legacy-on-linux ... don't build oculus-legacy plugin on Linux	2016-03-13 12:26:37 -07:00
Brad Hefta-Gaub	27fec45e95	Merge pull request #7342 from imgntn/consoleversion2 ... Add version number and make adding new menu items to Server Console easier	2016-03-13 12:25:04 -07:00
Brad Davis	798d2a73db	Merge pull request #7326 from ZappoMan/toggleOverlay ... Various Overlay, Menu, and Away Mode bug fixes	2016-03-13 11:44:19 -07:00
Brad Hefta-Gaub	d4d113d47d	Merge pull request #7346 from sethalves/fix-crash ... fix a crash	2016-03-13 11:18:35 -07:00
Seth Alves	dbd548a8c7	fix a crash	2016-03-13 11:01:11 -07:00
Seth Alves	7641b1e99d	remove debug print	2016-03-13 08:45:23 -07:00
Seth Alves	415f21c189	be more aggressive about putting entities into the missing-its-parent list	2016-03-13 08:35:21 -07:00
Seth Alves	0a2fb77698	delete child entities when parent is deleted	2016-03-13 07:04:50 -07:00
Eric Levin	8d2ab50616	Merge pull request #7344 from jherico/vive_crash ... Fix vive crash on deactivate	2016-03-12 22:03:38 -08:00
Brad Davis	27033e5bb5	Fix vive crash on deactivate	2016-03-12 21:48:36 -08:00
Brad Davis	27ecdffeb3	Fix iDate uniform in procedurals to be continuous	2016-03-12 16:46:15 -08:00
James B. Pollack	b929089af7	options	2016-03-12 15:01:34 -08:00
James B. Pollack	98d4f34d64	enable	2016-03-12 14:59:54 -08:00
James B. Pollack	03a109b60f	menu	2016-03-12 14:54:10 -08:00
James Pollack	50e7bd7742	claenup	2016-03-12 13:42:18 -08:00
James B. Pollack	f409127f1d	start	2016-03-12 12:18:54 -08:00
Seth Alves	29fd3e4ea6	Merge branch 'master' of github.com:highfidelity/hifi into disable-oculus-legacy-on-linux	2016-03-12 08:59:29 -08:00
Brad Hefta-Gaub	8420e67b54	Merge pull request #7338 from highfidelity/revert-7331-consoleversion ... Revert "Show Server Console Version"	2016-03-12 08:54:14 -08:00
Brad Hefta-Gaub	90f5dd50a5	Revert "Show Server Console Version"	2016-03-12 08:38:41 -08:00
Seth Alves	d036e0618d	don't build oculus-legacy plugin on linux	2016-03-12 07:54:59 -08:00
Brad Hefta-Gaub	c93ed7c6f7	Merge pull request #7321 from ctrlaltdavid/20829 ... Restyle HMD menus	2016-03-11 20:43:27 -08:00