2027 commits

Author	SHA1	Message	Date
Bradley Austin Davis	b56fbd4744	Working on SDK 0.6	2015-06-07 13:56:06 -07:00
Brad Davis	f614268667	Moving windows to SDK 0.6 ... Working on SDK 0.6 for windows Working on SDK 0.6 for windows	2015-06-07 01:40:44 -07:00
Seth Alves	edb3622c85	Merge pull request #5037 from AndrewMeadows/inertia ... collision groups for physical objects	2015-06-05 10:26:28 -07:00
Andrew Meadows	ec0b4a956a	move collision group consts to shared lib	2015-06-03 14:13:51 -07:00
Andrew Meadows	a989998816	fix typo in comment	2015-06-03 14:13:30 -07:00
Howard Stearns	c036b5fd4b	Actually commit the changes this time!	2015-06-03 10:19:28 -07:00
Andrew Meadows	2702e07863	Merge pull request #5015 from sethalves/polyvox ... PolyVox improvements -- depends on #5008	2015-06-02 14:34:49 -07:00
Eric Levin	55ffb7f1c0	code style changes	2015-06-02 12:51:45 -07:00
Seth Alves	11eb073bcf	fix comment	2015-06-02 10:04:39 -07:00
Seth Alves	d201f7791e	oops	2015-06-02 10:01:43 -07:00
Seth Alves	20d3814c1b	code review	2015-06-02 10:00:07 -07:00
Eric Levin	5cce4edec8	fix merge conflicts attemp 1	2015-06-01 11:18:33 -07:00
Eric Levin	7b08537574	code standards fixes	2015-06-01 09:51:24 -07:00
Seth Alves	d04b61d6a8	oops	2015-06-01 07:16:16 -07:00
Seth Alves	00af0a4376	trying to make thing behave when voxel-space is resized	2015-06-01 07:15:37 -07:00
Eric Levin	cb72b620cf	printing bytes out correctly	2015-05-29 19:42:07 -07:00
Seth Alves	96a40bd673	basic collisions with cubic polyvoxes	2015-05-29 18:50:26 -07:00
Brad Davis	77b45e2b4a	Adding missing files	2015-05-29 12:59:55 -07:00
Eric Levin	2d66696675	line working from array of points	2015-05-28 14:18:57 -07:00
Eric Levin	8886e93d5f	changed qVector to qVectorVec3	2015-05-28 11:26:41 -07:00
Eric Levin	72af4e4e67	latest pointer	2015-05-28 10:44:44 -07:00
Seth Alves	d71921fd03	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-26 10:46:02 -07:00
Seth Alves	9735174036	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-25 15:37:23 -07:00
Andrew Meadows	461d08c0a9	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
Clément Brisset	e276926608	Add include/remove duplicate type	2015-05-22 18:23:42 +01:00
Atlante45	c6ce5e7680	PerformanceTimer deactivated when not in use	2015-05-22 18:54:40 +02:00
Andrew Meadows	466af03fa9	support for ShapeInfo::offset	2015-05-21 16:25:05 -07:00
Andrew Meadows	67f5d0773d	some list management of AvatarMotionStates	2015-05-21 14:40:47 -07:00
Seth Alves	72e227eefe	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-21 09:55:14 -07:00
Seth Alves	52ce26d80d	Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux	2015-05-21 09:20:56 -07:00
Stephen Birarda	6306b69ec8	add a version and handle remapping for restricted access	2015-05-20 16:27:53 -07:00
Seth Alves	4b263cf5c8	derieve PolyVox Entity from Model Entity	2015-05-19 21:40:05 -07:00
Seth Alves	f9d46b0cb5	interface decides on entityIDs rather than bouncing a temporary id through the entity server	2015-05-19 14:25:23 -07:00
Seth Alves	baf4157da0	Merge pull request #4859 from ZappoMan/typeSafePropertyCleanup ... Clean up Entity Properties and Macros to be more type-safe friendly and consistent	2015-05-13 20:52:03 -07:00
Brad Hefta-Gaub	77019eafa7	Merge pull request #4831 from jherico/plugins_pt2 ... Display plugins part 2	2015-05-13 20:40:33 -07:00
ZappoMan	095b7701d8	Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup	2015-05-13 12:12:12 -07:00
Philip Rosedale	349886c146	Merge pull request #4847 from birarda/domain-paths ... add initial support for local paths in domain	2015-05-12 17:09:13 -07:00
ZappoMan	67df6e3c62	make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe	2015-05-12 16:24:16 -07:00
Stephen Birarda	0562fee82a	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths	2015-05-12 12:39:05 -07:00
Stephen Birarda	c66bd9b1aa	complete addition of paths to DS settings	2015-05-12 11:58:55 -07:00
Seth Alves	f647db3bf0	Merge branch 'master' of github.com:highfidelity/hifi into line-entity	2015-05-12 11:36:56 -07:00
Clément Brisset	9bf4cf1262	Merge pull request #4830 from ZappoMan/moreZoneProperties ... New Zone Features	2015-05-12 14:28:01 +02:00
Seth Alves	4881b0c53c	copy box to make a new type of line entity item	2015-05-11 19:25:14 -07:00
ZappoMan	73428ec12d	add support to not displace very large clipboards on import	2015-05-11 14:21:58 -07:00
Brad Davis	332d2091e5	Fixing license	2015-05-11 13:22:43 -07:00
Brad Davis	abab54aed8	Working on display plugins	2015-05-11 13:08:53 -07:00
Stephen Birarda	8c6715e4fc	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -07:00
Stephen Birarda	ebeba81233	make sure an ACM asks for PID in log	2015-05-08 17:37:48 -07:00
Stephen Birarda	acac2f5a22	don't init if Settings not init	2015-05-08 16:51:27 -07:00
Stephen Birarda	ddb52348bc	don't force use of Settings to all QCoreApplication	2015-05-08 16:24:39 -07:00