Stephen Birarda dfb02aea0c resolve conflicts on merge, add cstring inc		2015-01-05 09:25:30 -08:00
..
animation	clamp frame index between 0 and 100,000	2014-12-29 21:07:04 -08:00
audio	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
avatars	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
entities-renderer	evaluate entity scripts in a sandbox before constructing	2014-12-31 09:58:18 -08:00
fbx	merging with upstream master and origin temp0	2014-12-22 10:38:11 -08:00
gpu	fixed pointers which were using 0 instead of NULL and syntax in resource.h	2014-12-22 11:20:04 -08:00
metavoxels	Scale back on first dropped packet, use Qt send/receive buffer size options	2014-12-30 12:30:38 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
octree	merge upstream/master into andrew/inertia	2014-12-29 09:15:49 -08:00
physics	easier to read Bullet to GLM conversions and back	2014-12-30 13:15:57 -08:00
render-utils	Merge pull request #4029 from Atlante45/new_glm_fix	2015-01-04 11:26:37 -08:00
script-engine	resolve conflicts and merge with upstream master	2014-12-29 10:59:42 -07:00
shared	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
voxels	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00