overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-09 01:00:57 +02:00

Author	SHA1	Message	Date
ericrius1	0373a481f8	Using EntityItemIDs instead of QUuids	2015-10-20 09:22:16 -07:00
Seth Alves	37923e81bb	make SpatiallyNestable::_transform private	2015-10-18 08:18:10 -07:00
Seth Alves	7977f4640d	new class: SpatiallyNestable	2015-10-18 07:27:22 -07:00
Brad Davis	57be59935d	Move controller test to app	2015-10-17 19:13:38 -07:00
Brad Davis	5bac1aae2d	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-16 17:23:30 -07:00
David Rowe	8c22db17cc	Fix reading of QVector<float> from models files - polyline strokeWidths	2015-10-16 15:43:23 -07:00
ericrius1	47c3df7587	Cleaned up spacing	2015-10-12 17:38:52 -07:00
ericrius1	f93b1d3325	Correctly whitelisting entities for ray picking	2015-10-12 17:05:34 -07:00
Brad Davis	80c95cd8eb	Fixing access to second based timestamp	2015-10-10 16:07:26 -07:00
Brad Davis	9e4a7a6226	Working on controller refactoring	2015-10-10 03:05:42 -07:00
Anthony J. Thibault	b5ba621f78	Merge branch 'master' into tony/hmd-rest-detection	2015-10-09 14:36:18 -07:00
Andrew Meadows	7a918eb288	fix variable names in header	2015-10-07 15:25:07 -07:00
Andrew Meadows	464ef2293d	more descriptive variable names	2015-10-07 14:19:15 -07:00
Andrew Meadows	0680be0422	save sixense settings and some UI cleanup	2015-10-07 14:19:15 -07:00
Anthony J. Thibault	2dabe69341	When HMD is at rest, re-center the body under the avatar. This should help the case when a user avatar is stuck in an uncomfortable pose for a long period of time. If they stop moving their head, the body should recenter itself and appear more natural. Added an AtRestDetector class. That tracks the average and variance of both position and rotation (quaternion logarithms), then detects when the variance falls under a threshold. Also, renamed variables with the straighting prefix to straightening.	2015-10-06 20:37:51 -07:00
Thijs Wenker	f6afb4cb02	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-06 19:56:22 +02:00
Atlante45	598aab884e	Make log more readable	2015-10-05 14:59:28 -07:00
Anthony J. Thibault	fc7b6dee84	Merge branch 'master' into transmit-joint-translation	2015-10-02 11:40:33 -07:00
Andrew Meadows	50b2c8ae37	remove warnings in linux	2015-10-02 09:39:34 -07:00
Howard Stearns	53e7d5fd7c	Merge pull request #5975 from AndrewMeadows/cleanup-legacy-constraints remove cruft relating to old verlet avatar skeleton simulation	2015-10-01 16:48:33 -07:00
David Rowe	e56d2d9b43	Add asserts	2015-10-01 15:48:37 -07:00
Andrew Meadows	09ac01a5e7	remove cruft from old verlet avatar simulation	2015-10-01 13:44:50 -07:00
David Rowe	c56ac24602	Improve particle property interpolation Use Bezier interpolation instead of cubic so that values don't overshoot.	2015-09-30 11:37:22 -07:00
Seth Alves	d0a1e206ca	Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation	2015-09-29 13:55:13 -07:00
Seth Alves	ddeed8b4ee	code review	2015-09-29 06:51:24 -07:00
Brad Hefta-Gaub	3e758f3c6b	fix Triangle::getNormal, add normal display to rayPickExample	2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub	ce3da099f6	normalize the surface normal from the triangle, coding standard fix, update example	2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub	430cbcca7e	first cut at adding surface normals to ray intersection	2015-09-27 21:57:50 -07:00
Seth Alves	50dd8eba45	Relay joint translations across network. Apply animation's root-joint translation to avatar.	2015-09-26 11:40:39 -07:00
David Rowe	d063f3488d	Back out fromSpherical code addition	2015-09-24 19:14:26 -07:00
Brad Hefta-Gaub	ba73acf3b4	Merge pull request #5843 from ctrlaltdavid/20681 Replace point and vector particle emitter with spheroid emitter	2015-09-24 08:19:49 -07:00
Brad Hefta-Gaub	d14820d3ef	Merge pull request #5880 from thoys/20668 Worklist job #20668 - JS: Add option to listen audio from camera	2015-09-23 20:40:32 -07:00
Anthony J. Thibault	a9848cd157	Merge branch 'master' into tony/lean-threshold	2015-09-23 10:54:12 -07:00
David Rowe	eb01ba9812	Merge branch 'master' into 20681	2015-09-23 09:42:56 -07:00
Brad Hefta-Gaub	02e1de3ba3	more warnings fixes	2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub	9436d2922f	more warnings fixes	2015-09-22 21:18:04 -07:00
Anthony J. Thibault	d04f4d4b2b	Added shared DebugDraw singleton.	2015-09-22 19:57:23 -07:00
Thijs Wenker	617f048883	Added JS interface to change audio listening position / orientation in Interface - MyAvatar.audioListenerMode change using: MyAvatar.FROM_HEAD , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM - MyAvatar.customListenPosition and MyAvatar.customListenOrientation are for manual listening positions	2015-09-22 13:40:33 +02:00
Brad Hefta-Gaub	dc9c774eb5	merge model part quads and triangles together to reduce the number of draw calls	2015-09-21 13:09:43 -07:00
David Rowe	812ab9b7c6	Merge branch 'master' into 20681 Conflicts: libraries/entities/src/EntityItemProperties.cpp	2015-09-18 16:44:04 -07:00
Brad Hefta-Gaub	4e2cb00ec3	first cut at only returning type specific properties in getEntityProperties	2015-09-17 17:33:53 -07:00
David Rowe	12e2cf3ce9	Emit in all directions from a point or the surface of a spheroid	2015-09-17 17:14:35 -07:00
Stephen Birarda	302fd923b8	Merge branch 'master' of https://github.com/highfidelity/hifi into phrc	2015-09-14 11:21:37 -07:00
Stephen Birarda	f7f54010f5	fixes for portable hrc class on win	2015-09-14 11:21:25 -07:00
Stephen Birarda	2737e74432	fix includes for portable hrc	2015-09-14 11:21:18 -07:00
Stephen Birarda	9b926f6f04	add an hrc with proper resolution for < VC2015	2015-09-14 11:21:08 -07:00
Seth Alves	93dc0714f7	quiet compiler	2015-09-12 10:10:53 -07:00
Seth Alves	e65ef93663	Merge pull request #5778 from jherico/homer Fixing some entity race condition crashes	2015-09-11 17:54:53 -07:00
Andrew Meadows	94b0074165	Merge pull request #5765 from ctrlaltdavid/20669-tidy Move cubic interpolation method to shared library	2015-09-11 16:58:22 -07:00
Brad Davis	9b81842850	Merge branch 'master' into homer Conflicts: assignment-client/src/octree/OctreeSendThread.cpp interface/src/Application.cpp libraries/entities-renderer/src/EntityTreeRenderer.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTreeElement.cpp libraries/entities/src/EntityTreeElement.h libraries/entities/src/EntityTreeHeadlessViewer.cpp libraries/entities/src/RecurseOctreeToMapOperator.cpp libraries/octree/src/Octree.h libraries/physics/src/EntityMotionState.cpp	2015-09-11 16:31:18 -07:00
Brad Davis	e458eb7ae9	Merge pull request #5734 from sethalves/octree-shared-pointers octree uses shared pointers	2015-09-11 16:00:04 -07:00
Brad Hefta-Gaub	5c6d8da97b	Revert "Make sure all entity script callbacks happen on the Entities script engine thread"	2015-09-11 11:55:36 -07:00
Brad Davis	244795b629	Merge branch 'homer' into temp Conflicts: interface/src/Application.cpp	2015-09-11 11:21:29 -07:00
Brad Davis	3bc9e8c98d	Fixing some entity race condition crashes	2015-09-10 20:43:41 -07:00
Brad Hefta-Gaub	8eacdbf1c4	first cut at making sure entity scripts are called on the entities script engine thread	2015-09-10 13:02:02 -07:00
David Rowe	016f3964ed	Fix typo	2015-09-10 10:03:27 -07:00
David Rowe	fa959c4554	Move cubic interpolation method to shared library	2015-09-10 08:53:16 -07:00
Howard Stearns	3f5744712f	Remove optional "parent" argument. GenericThread used to accept an optional "parent" argument, defaulting to nullptr. This was odd, because the moveToThread() in GenericThread::initialize() would become a no-op if the instance ever inits QObject(someNonNullParentQObject). (The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent", and things would end up in the same thread that created the instance.) As it turns out, all the subclasses of GenericThread do not init GenericThread(parent), so things worked as expected.	2015-09-09 11:04:17 -07:00
Seth Alves	9c4fdfd653	merge from upstream	2015-09-08 18:01:07 -07:00
Seth Alves	31fcd55d47	octree uses shared pointers	2015-09-08 11:59:48 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Anthony J. Thibault	df28c7bf1a	Merge branch 'master' into ajt/new-anim-system	2015-09-04 09:27:02 -07:00
Anthony J. Thibault	3716d5612b	Merge branch 'master' into ajt/new-anim-system	2015-09-03 19:20:06 -07:00
Brad Hefta-Gaub	063320771c	fix a bug in entity script includes and file based includes on windows	2015-09-03 16:37:24 -07:00
Brad Davis	8dc3905767	Add common vector constants to JS, add some missing quaternion functionality	2015-09-03 11:51:35 -07:00
Brad Davis	1f83d04423	Fix oculus crash on switching display plugin to something else	2015-09-02 18:28:43 -07:00
Brad Davis	54b7a063e2	Support HTML colors in overlays	2015-09-02 15:56:37 -07:00
Anthony J. Thibault	d151474446	Merge branch 'master' into ajt/new-anim-system	2015-09-02 10:00:36 -07:00
Stephen Birarda	33f6933544	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-01 14:36:16 -06:00
Stephen Birarda	4824b38465	move UUID back to shared	2015-09-01 10:17:07 -06:00
Stephen Birarda	de2bfd0d0d	some QThread cleanup and fix in Socket	2015-08-31 11:30:31 -07:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Anthony J. Thibault	54aa0677f6	Merge branch 'master' into ajt/new-anim-system	2015-08-31 10:47:50 -07:00
Brad Davis	08e4fe2dc2	Revert "Add common vector constants to JS"	2015-08-28 16:26:56 -07:00
Brad Hefta-Gaub	1e2374da87	Merge pull request #5677 from jherico/bart Add common vector constants to JS	2015-08-28 13:43:13 -07:00
Brad Davis	2aa1976b5d	Add common vector constants to JS, add some missing quaternionin functionality	2015-08-28 13:05:39 -07:00
Andrew Meadows	614fad0811	remove warnings from linux build	2015-08-27 19:12:25 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Brad Hefta-Gaub	79a9694d4a	Merge pull request #5648 from ctrlaltdavid/20663 Clean Interface.ini after a crash	2015-08-27 10:52:25 -07:00
Anthony J. Thibault	a04f356857	Merge branch 'master' into ajt/new-anim-system	2015-08-27 09:32:53 -07:00
Anthony J. Thibault	b7a9b54628	Better AnimDebugDraw rendering	2015-08-26 16:42:08 -07:00
Brad Davis	270f2f7a3b	Fixing framerate limit, moving vsync to 2d plugin	2015-08-26 15:47:45 -07:00
Anthony J. Thibault	c1333e16ed	Merge branch 'master' into ajt/new-anim-system	2015-08-26 11:59:03 -07:00
Andrew Meadows	f857ccfe16	fix Vectors::MIN	2015-08-26 11:46:50 -07:00
Anthony J. Thibault	46c1e008bc	Merge branch 'master' into ajt/new-anim-system	2015-08-26 10:37:39 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
David Rowe	a98a867b06	Delete Interface.ini.lock before accessing to check crash option	2015-08-25 11:07:20 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Anthony J. Thibault	fa5256eefd	Merge branch 'master' into ajt/new-anim-system	2015-08-24 14:32:28 -07:00
David Rowe	f6cf77ae68	Add Developer > Display Crash Options menu item Is enabled by default. Disabling it stops the display of the crash handling options dialog at start-up.	2015-08-24 13:24:31 -07:00
Stephen Birarda	fd43c48eac	resolve conflicts on merge with birarda/protocol	2015-08-18 11:48:36 -07:00
Andrew Meadows	9ee49c3e1e	Merge pull request #5551 from sethalves/quiet-compiler Quiet compiler	2015-08-18 09:54:29 -07:00
Stephen Birarda	47d1710208	remove msecTimestampNow that is not used	2015-08-17 16:39:29 -07:00
Brad Hefta-Gaub	b726769f15	Merge pull request #5402 from highfidelity/plugins New plugins architecture	2015-08-11 11:11:27 -07:00
Seth Alves	b25f6df7af	quiet compiler	2015-08-11 10:22:56 -07:00
Howard Stearns	295d655eec	Merge pull request #5545 from AndrewMeadows/chlorine rotation constraints in preparation for inverse kinematics	2015-08-11 09:19:16 -07:00
Andrew Meadows	4655bd21dd	added some comments to clarify algorithm	2015-08-10 23:08:10 -07:00
Brad Davis	19d31938d3	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-10 21:25:35 -07:00
Andrew Meadows	f9a4b82edd	add swing-twist decomposition util with unit-tests	2015-08-10 14:47:15 -07:00
Brad Davis	ccc4a59992	Cleanup and PR comments	2015-08-08 13:54:37 -07:00
ericrius1	205a2d53b6	no longer returning early on NaN	2015-08-07 16:15:51 -07:00
ericrius1	3910cb0d69	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
Bradley Austin Davis	7e60aee1bf	Merge branch 'master' into plugins Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp	2015-08-06 11:03:37 -07:00
Sam Gondelman	513c652ab3	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
Stephen Birarda	0fe3213d38	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-08-05 11:16:34 -07:00
Andrew Meadows	5be8583b7d	Merge pull request #5494 from sethalves/gzip-json-entity-persist-files gzip json entity persist files	2015-08-05 10:56:03 -07:00
Atlante45	dfaa16d15c	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-08-05 10:39:02 -07:00
Seth Alves	eb87023416	code review	2015-08-05 10:16:45 -07:00
Anthony J. Thibault	b8bae7cc3f	Debug rendering of MyAvatar’s skeletonModel skeleton	2015-08-04 18:14:47 -07:00
Anthony J. Thibault	f5dee717a1	Added fbx loading via animation cache. * added AnimPose::copyFromNetworkAnim() which should, re-map bone ids to match the current skeleton, and fill in missing bones with bind pose frames. * added ability to set a skeleton on a node. I might need to add a recursive version of this. * it compiles! * tests run!	2015-08-04 18:14:46 -07:00
Anthony J. Thibault	da809efcd6	WIP commit, DOES NOT BUILD. * Added AnimSkeleton class * Attempt to copy animation frames when _networkAnimation has finished loading. Fill in the holes with bind pose.	2015-08-04 18:14:46 -07:00
samcake	59b69be251	Merge pull request #5501 from jherico/lisa CORE PROFILE: Working on HMD crash on mac	2015-08-04 16:27:37 -07:00
Bradley Austin Davis	241ee00ca5	Working on HMD crash on mac	2015-08-04 15:18:01 -07:00
Seth Alves	fb9fa76018	adjust comments	2015-08-04 08:26:28 -07:00
Seth Alves	adcd91e3ff	Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.	2015-08-04 07:23:24 -07:00
ericrius1	47bc8f50ab	cleaning	2015-08-03 08:45:14 -07:00
Stephen Birarda	d340515ab3	complete the initial version of UDTTest	2015-07-30 17:09:25 -07:00
Andrew Meadows	0a5ada3c09	remove legacy shapes	2015-07-29 09:02:24 -07:00
Andrew Meadows	ef5e7e9ccc	remove PlaneShape dependency from GeometryUtils also add unit tests for indRayRectangleIntersection()	2015-07-28 15:45:48 -07:00
Atlante45	82545df266	Added msecTimestampNow as usecTimestampNow narrowing	2015-07-23 15:01:46 -07:00
Bradley Austin Davis	1db4162371	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07:00
Bradley Austin Davis	114ab9e47f	Merge branch 'master' into plugins	2015-07-22 11:47:56 -04:00
Brad Davis	5744200f64	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Application.h interface/src/avatar/MyAvatar.h	2015-07-20 19:21:02 -07:00
SamGondelman	a4cbb7f412	const references in glmhelpers	2015-07-20 17:30:23 -07:00
Anthony J. Thibault	80dea6831c	Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers Conflicts: interface/src/Application.cpp libraries/input-plugins/src/input-plugins/SixenseManager.cpp	2015-07-20 15:18:23 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Brad Davis	5159452335	Fixing invalid vector usage and strange picking crash	2015-07-19 23:03:46 -07:00
Brad Davis	c446bb307d	Adding convenience return *this to many transform methods	2015-07-18 16:56:32 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
Stephen Birarda	7d2495e289	set the generic thread priority once it's actually started	2015-07-17 09:24:00 -07:00
Anthony J. Thibault	e8da4b9586	merge with plugins, needs testing	2015-07-16 18:47:39 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
Atlante45	b4121eb464	Remove unnecessary move	2015-07-16 13:14:17 -07:00
Stephen Birarda	61f23f6a5e	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-16 11:56:26 -07:00
ZappoMan	5165210e11	fix Sams comment about comments	2015-07-15 16:35:20 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
ZappoMan	d1e511efcb	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
samcake	9df26c8488	removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs	2015-07-15 00:24:43 -07:00
Anthony J. Thibault	dbc18ce51f	merge with plugins	2015-07-14 12:30:47 -07:00
Stephen Birarda	821c16cbc4	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
ericrius1	0ce6737b34	merged and normals flipping	2015-07-13 09:43:15 -07:00
Seth Alves	c17c9f1818	quiet compiler	2015-07-12 10:29:43 -07:00
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
Brad Davis	c1b72db18d	Still trying to get jenkins builds to work	2015-07-10 16:00:51 -07:00
Brad Davis	2ce8dba819	Removing heap allocation from property flag parsing, adding some manual tests	2015-07-10 15:08:10 -07:00
Stephen Birarda	1b4e333c49	Merge pull request #3 from birarda/atp initial networking API changes for new protocol	2015-07-09 16:51:37 -04:00
Stephen Birarda	2417981c9d	resolve conflicts on merge with clement/protocol	2015-07-09 13:27:59 -07:00
Stephen Birarda	893e1864fd	cleanup _newestEntryAtIndex calc in RBH insert	2015-07-09 13:22:41 -07:00
Atlante45	c0b8f83ca0	Better ring index compute	2015-07-09 13:22:09 -07:00
Stephen Birarda	14b73ae00f	remove qtimespan that isn't used anymore	2015-07-09 12:45:32 -07:00
Brad Hefta-Gaub	489a8b4b3d	Merge pull request #5285 from jherico/homer Move log file writing to a separate thread	2015-07-09 12:22:13 -07:00
Brad Hefta-Gaub	fb07956689	Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix fix for mirror rendering on windows	2015-07-09 08:38:55 -07:00
Stephen Birarda	19c5f0b67c	resolve conflicts on merge with upstream/master	2015-07-08 22:54:36 -07:00
Brad Davis	63dfd570f1	Adding priority support to GenericThread	2015-07-08 22:54:31 -07:00
Brad Davis	08d1364f81	Move file log persistence to a separate thread	2015-07-08 22:35:23 -07:00
Anthony J. Thibault	1be0e7ebc3	fix for mirror rendering on windows * added preScale to Transform class. * preScale by -1 about the xAxis instead of post scale. I think this was working on Mac due to the different code paths in GLBackendTransform::updateTransform for core vs legacy gl profile.	2015-07-08 21:33:27 -07:00
Brad Davis	f2beb79d23	Updating buffer parser to use new heapless API	2015-07-08 18:54:38 -07:00
Stephen Birarda	da3502eb6c	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
Brad Davis	49a14e3446	Merge remote-tracking branch 'upstream/master' into entity_parsing	2015-07-08 18:37:41 -07:00
Brad Davis	625cc86f83	Merge pull request #5283 from ZappoMan/optimizeByteCountCoded Optimize ByteCountCoded<> to not do extra heap allocations	2015-07-08 18:35:02 -07:00
ZappoMan	7790e35d24	added bytes consumed result to decode, and exit early after bytes consumed	2015-07-08 18:19:12 -07:00
Brad Davis	600e9cbf52	Fixing template specialization compilation error on gcc/clang	2015-07-08 18:17:03 -07:00
ZappoMan	c0cdf3256c	comment and dead code	2015-07-08 17:34:36 -07:00
ZappoMan	e885ac1821	improved performance of ByteCountCoding<> decode	2015-07-08 17:32:51 -07:00
Brad Davis	98e0688e98	Reducing heap allocation in network packet parsing	2015-07-08 17:21:38 -07:00
ZappoMan	6a9344a3f6	fix bug in old version of decode	2015-07-08 15:14:24 -07:00
Atlante45	6bf05fbf1f	Pointer fixes	2015-07-08 10:50:51 -07:00
Atlante45	737d85c597	Compile fixes	2015-07-07 18:22:06 -07:00
Andrew Meadows	e9df8cacc7	make some arguments const, cleanup some #includes	2015-07-07 17:50:08 -07:00
Atlante45	fa43c62722	RingBufferHistory handles unique_ptr	2015-07-07 16:45:43 -07:00
Howard Stearns	1c2972bd7c	Expose avatar collisions to scripts, and include velocityChange in exposed collision data.	2015-07-07 11:49:55 -07:00
Anthony J. Thibault	5293effc2e	more work in progress vive room tracking Found and disabled torso twist use an old copy of the hmd pose before physics, and the most up to date one after physics.	2015-07-07 00:12:48 -07:00
Anthony J. Thibault	834b75f4c4	work in progress room scale tracking work. sensor to world matrix stored in MyAvatar override setPosition and setOrientation to move sensor to world matrix.	2015-07-06 18:25:42 -07:00
Brad Hefta-Gaub	2a03f62bf2	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership Actions over wire and improved simulation ownership	2015-07-02 14:57:27 -07:00
ericrius1	ad97b28734	fixed merge conflicts	2015-07-02 11:01:40 -07:00
ericrius1	feeba2a029	testing for serialization	2015-07-01 23:03:03 -07:00
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Brad Davis	59027959b8	CR comments and fixing the average calculation	2015-07-01 16:30:42 -07:00
Clément Brisset	93d51717ce	Merge pull request #5201 from ctrlaltdavid/20590 QA for #20590 - Delete Interface.ini.lock file at start-up if it exists	2015-07-01 13:54:02 -07:00
Seth Alves	5e2f7204b4	responses to code review	2015-07-01 10:29:42 -07:00
Seth Alves	6e7973f5b9	coding-standard / code-review	2015-06-30 19:28:22 -07:00
ericrius1	ff77c3e0d8	added stroke width entity	2015-06-30 18:38:40 -07:00
Seth Alves	1d122060a6	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
Seth Alves	0970f010a4	provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are	2015-06-27 13:31:00 -07:00
Andrew Meadows	b6d5adaef8	move global into function that uses it	2015-06-26 21:57:04 -07:00
Andrew Meadows	c87e7c99ce	bid for ownership on script-change phys properties	2015-06-26 21:57:04 -07:00
Seth Alves	0f3ac976c3	don't try to convert a vec3 containing NaN to a script value	2015-06-26 17:53:28 -07:00
Stephen Birarda	c6df573933	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
Atlante45	85b2771c4a	Extend Extents	2015-06-24 15:44:48 -07:00
David Rowe	33b48947a5	Delete Interface.ini.lock file at start-up if it exists Otherwise Interface freezes.	2015-06-23 17:36:19 -07:00
Seth Alves	4bf4e9f5da	Merge pull request #5164 from ericrius1/lineBounds Line bounds	2015-06-23 10:47:38 -07:00
ericrius1	0e177a3e31	deleted unnessary line break	2015-06-18 18:23:09 -07:00
Brad Davis	48b27acc79	Merge remote-tracking branch 'upstream/master' into overlay Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-18 18:17:59 -07:00
ericrius1	7293330ced	fixed indentation and lines delete when user exits to help with large model.svo/json file size	2015-06-18 18:17:02 -07:00
ericrius1	6a5deaaef1	returning true from set line points	2015-06-18 16:54:39 -07:00
ericrius1	2b4146125f	adding logic to check points of line are inside bounds	2015-06-18 16:27:06 -07:00
Seth Alves	021dc64789	merge from upstream	2015-06-18 15:03:09 -07:00
Brad Hefta-Gaub	b008b810e1	Merge pull request #5145 from Atlante45/text Bring back display names	2015-06-18 11:25:45 -07:00
Seth Alves	b258aeaa3d	merge from master	2015-06-18 10:04:14 -07:00
ZappoMan	673e1ee0cc	first cut and removing openGl dependency in shared	2015-06-18 09:30:34 -07:00
Atlante45	1cab853f18	Better guard Transform scale	2015-06-18 15:23:50 +02:00
Atlante45	254f05072f	Fix inverted if	2015-06-18 15:23:49 +02:00
Brad Davis	d9452cfd2e	Merge branch 'gpu-error-tweak' into overlay	2015-06-18 00:54:48 -07:00
Brad Davis	a83a4fb0a1	Merge remote-tracking branch 'upstream/master' into overlay Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-17 19:53:31 -07:00
Seth Alves	eb89835d42	Merge branch 'master' of github.com:highfidelity/hifi into fix-line-data-handling	2015-06-17 18:35:00 -07:00
Seth Alves	8735fa1eac	have variantMapToScriptValue handle lists.	2015-06-17 18:33:43 -07:00
Brad Hefta-Gaub	4501fb1d61	Merge pull request #5073 from jherico/ovr6 Support Oculus SDK version 0.6 on windows only	2015-06-17 18:17:34 -07:00
Bradley Austin Davis	4633cabcec	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-17 17:07:43 -07:00
Brad Davis	ae1c9603b9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00
Seth Alves	68df6b662d	fix ifdefs around asserts	2015-06-17 15:03:09 -07:00
Seth Alves	44bb220130	fix debug build	2015-06-17 14:54:13 -07:00
Seth Alves	9a51a4c5b1	fix debug build	2015-06-17 14:48:37 -07:00
ZappoMan	58ee5217e3	fix some warnings	2015-06-17 14:08:02 -07:00
Bradley Austin Davis	2172445db7	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-17 12:56:41 -07:00
Brad Davis	5ded9e7eb9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 10:50:01 -07:00
Sam Gateau	5c547037f2	Migrating the overaly 3d rendering in their own job and their own shader	2015-06-17 15:54:20 +02:00
Seth Alves	508ae276c6	enable -Wdouble-promotion	2015-06-16 18:23:10 -07:00
Brad Davis	4f8ea3f624	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-16 09:58:20 -07:00
Brad Davis	ba13b7820c	Working on overlay refactor	2015-06-16 09:58:03 -07:00
Andrew Meadows	0e12cdc39e	woops, forgot to include this in last commit	2015-06-10 12:41:15 -07:00
Brad Davis	5680d58a19	Removing oglplus requirement for linux and mac	2015-06-09 03:09:10 -07:00
Brad Davis	6147844f93	Merge branch 'master' into ovr6 Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.h	2015-06-09 00:44:06 -07:00
ZappoMan	24c8e7d0e6	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
Stephen Birarda	666830c04d	add a sound once first AM packet received	2015-06-08 11:30:12 -07:00
Bradley Austin Davis	5a52a389be	Working on SDK 0.6	2015-06-07 23:23:21 -07:00
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
ZappoMan	f8a2fff5a7	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 11:06:10 -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
ZappoMan	807cc3db24	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 09:37:39 -07:00
Clément Brisset	f19c0d8eec	Some renaming for windows compiler	2015-06-05 13:23:58 +01:00
Atlante45	93b44e6846	Collect stats on translucent/opaque mesh parts	2015-06-04 18:46:47 +02:00
Atlante45	a4340b17e9	Remove deprecated render stats	2015-06-04 14:47:04 +02: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
Atlante45	7654533888	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
Howard Stearns	c036b5fd4b	Actually commit the changes this time!	2015-06-03 10:19:28 -07:00
ZappoMan	7c40b666e8	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-06-03 09:52:40 -07:00
Atlante45	9df1b05184	Introduce outsideEngineDetails	2015-06-03 18:08:43 +02:00
Atlante45	bbf1837796	Introduced RenderDetails/Stats don't pull details - Regrouped everything stat in a struct - Details are set into the stats	2015-06-03 16:14:23 +02:00
ZappoMan	647d132d57	store part boxes in model space and translate to world space on request	2015-06-02 21:50:33 -07:00
Sam Gateau	3c7eb4de6d	merging with upstream	2015-06-02 14:48:53 -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
Atlante45	9d4ded1fb3	Add shouldRender functor to render args	2015-06-02 16:09:05 +02:00
Sam Gateau	cd7914ad9d	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-06-01 17:31:39 -07:00
Sam Gateau	bd7c22e715	Trying to transfer the rnedering from displaySide to RenderDeferredTask	2015-06-01 17:31:00 -07:00
ZappoMan	d4af454834	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-01 14:42:35 -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
Atlante45	75788a3c51	Reactivate Transform asserts	2015-05-29 17:05:56 +02:00
Eric Levin	2d66696675	line working from array of points	2015-05-28 14:18:57 -07:00
ZappoMan	a0e51469d3	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-28 12:36:34 -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
ZappoMan	20ceb72d92	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-26 15:01:26 -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
Brad Hefta-Gaub	910c8549fc	Merge pull request #4951 from huffman/ctx Team Teaching - Add gpu::context to RenderArgs and use RenderArgs in more render() methods	2015-05-22 22:20:45 -07:00
Ryan Huffman	43317bc829	Temporarily remove isValidScale assert	2015-05-22 17:00:39 -07:00
Ryan Huffman	7be646d62e	Make gpu::context the first RenderArgs ctor parameter	2015-05-22 16:02:10 -07:00
Ryan Huffman	d1a5662ca7	Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx Conflicts: libraries/entities-renderer/src/EntityTreeRenderer.cpp	2015-05-22 15:33:40 -07:00
ZappoMan	160898ce96	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-22 14:55:29 -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
Ryan Huffman	4a4c9c75fc	Add gpu::context to RenderArgs and start using RenderArgs in place of the flags	2015-05-22 09:50:51 -07:00
Atlante45	314486ab88	Ignore scale in Transform when 0.0f Also cleaned up some coding standard	2015-05-22 16:21:12 +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
ZappoMan	c7fb8fab85	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-21 10:36:22 -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
Atlante45	4725d5e676	Merge branch 'primitives_batch' into remove_gl_transform	2015-05-16 05:22:12 +02:00
Atlante45	7185589407	Add optional Batch to RenderArgs	2015-05-16 04:42:15 +02:00
Atlante45	92d4b08c38	Init _transform with correct values	2015-05-15 17:52:06 +02: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
Brad Hefta-Gaub	bfb2b278ee	Merge pull request #4791 from jherico/scale Fixing scale resolution issues	2015-05-08 15:54:24 -07:00
Stephen Birarda	78942b0a87	let QSettings destructor call Setting::Manager sync	2015-05-08 15:49:28 -07:00
Bradley Austin Davis	0751443a01	Merge branch 'master' into scale	2015-05-08 15:03:24 -07:00
Stephen Birarda	0a295bada1	add debugging to catch AC kill hang	2015-05-08 14:32:16 -07:00
Stephen Birarda	3d06a86670	drop packets on floor when shutting down	2015-05-08 11:57:25 -07:00
Bradley Austin Davis	c31d36be59	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00
Seth Alves	d52a45b57e	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-07 11:30:46 -07:00
Atlante45	faabf29e84	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 19:58:26 +02:00
Atlante45	00571dad00	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 10:13:59 +02:00
ZappoMan	496da6fcd5	wire up the skybox color property to the new skybox renderer	2015-05-06 20:36:06 -07:00
Seth Alves	fe06ce2931	pull from upstream	2015-05-06 14:31:22 -07:00
Bradley Austin Davis	fc73676b4d	Merge branch 'master' into plugins_pt1	2015-05-06 11:43:25 -07:00
Andrew Meadows	aa5a59c3dc	merge upstream/master into andrew/nova Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/PhysicsEngine.cpp	2015-05-05 10:24:17 -07:00
Atlante45	6fdb594dfd	Forgot member initialisation	2015-05-05 16:40:16 +02:00
Atlante45	aa10dc3991	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-05 15:04:11 +02:00
Andrew Meadows	96acf96b76	entity-entity collision events emit signals again	2015-05-04 13:32:57 -07:00
Stephen Birarda	87e586dfe6	remove a stray space	2015-05-04 10:42:58 -07:00
Atlante45	12fcb35717	Made RenderArgs a default ctor	2015-05-04 17:22:46 +02:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07:00
Stephen Birarda	475861c4be	move KILO_PER_MEGA to numerical constants	2015-05-01 16:30:25 -07:00
Stephen Birarda	edade7baba	resolve conflicts on merge with upstream master	2015-05-01 16:24:16 -07:00
Stephen Birarda	94739cf8d3	move number constants out of SharedUtil to NumericalConstants	2015-05-01 10:26:53 -07:00
Seth Alves	f75b599288	don't save default values in json file	2015-04-30 11:28:27 -07:00
Stephen Birarda	85919972e3	resolve conflicts on merge with upstream/master	2015-04-29 10:45:25 -07:00
Stephen Birarda	1995fa6a5e	fix return value comment in SimpleMovingAverage	2015-04-28 18:28:12 -07:00
Stephen Birarda	c52426385d	code review comments for #4713	2015-04-28 18:28:05 -07:00
Stephen Birarda	f2dcacffd0	show avatar data receive rate by default with display name	2015-04-28 18:27:42 -07:00
Stephen Birarda	4e6979cac8	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling	2015-04-28 16:50:07 -07:00
Stephen Birarda	b917afa3cc	show avatar data receive rate by default with display name	2015-04-28 09:47:19 -07:00
Brad Davis	897e47e8e6	Removing debug hack to load resources from source folder	2015-04-27 23:17:56 -07:00
Seth Alves	bdc6bb3c2d	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 12:20:58 -07:00
Brad Davis	a12bfd95f4	Merge remote-tracking branch 'upstream/master' into ui-refactor Conflicts: libraries/render-utils/src/MatrixStack.h	2015-04-27 10:59:57 -07:00
Seth Alves	2cdbe8bf7b	merge from upstream	2015-04-27 09:57:36 -07:00
Seth Alves	e007617112	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 09:56:24 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Atlante45	0b1d4fb1d6	Merge branch 'master' of https://github.com/highfidelity/hifi into zones	2015-04-23 21:16:11 +02:00
Atlante45	b340cd06bf	Fix volume formula for capsules	2015-04-23 19:14:07 +02:00
Atlante45	83490051d9	Move shape related contains() to ShapeInfo	2015-04-23 18:55:20 +02:00
Atlante45	6be0910966	Fix contain for collision hulls	2015-04-23 15:58:18 +02:00
Brad Davis	c4d2bd2cda	More coding standard fixes	2015-04-22 19:18:09 -07:00
Atlante45	955723acf1	RenderableEntityItem uses collision hull in contains	2015-04-22 21:03:55 +02:00
Brad Davis	ce6b7e7aec	Merge branch 'master' into offscreen Conflicts: interface/src/Menu.cpp	2015-04-16 14:02:40 -07:00
Bradley Austin Davis	36ca9132cc	More build failure fixes	2015-04-16 01:02:13 -07:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
Andrew Meadows	da9091a99d	remove SHAPE_TYPE_CONVEX_HULL from libs and tests	2015-04-14 14:54:43 -07:00
Seth Alves	3cfafea5ca	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 15:09:50 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Seth Alves	bc9e818b95	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 11:12:16 -07:00
Seth Alves	ef5dffecf6	fix filenames in comments	2015-04-07 10:03:14 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Seth Alves	fb607e2b26	logging groups for library/shared and interface	2015-04-06 18:45:06 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
Seth Alves	9ef9452cf6	make filename extension checking less wrong	2015-04-03 16:39:45 -07:00
Seth Alves	bfab522ee7	debuging render mode	2015-04-01 17:52:30 -07:00
Sam Gateau	0d721ec1e9	merging	2015-03-31 17:47:05 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -07:00
Andrew Meadows	7fb9427f29	Merge pull request #4549 from jherico/dbg_macro Enabling the use of #ifdef DEBUG as a platform neutral idiom	2015-03-31 17:08:12 -07:00
Brad Hefta-Gaub	d77333953e	Merge pull request #4552 from sethalves/island Fix various collision-model related bugs	2015-03-31 15:47:53 -07:00
Seth Alves	55d506bb53	formatting	2015-03-31 14:04:49 -07:00
Bradley Austin Davis	02b69f4a70	Enabling the use of #ifdef DEBUG as a platform neutral idiom	2015-03-31 13:32:13 -07:00
Brad Hefta-Gaub	e27a89b7c3	Merge pull request #4539 from birarda/settings-thread-delete-later fix for cleanup of SettingsManager thread	2015-03-31 13:09:06 -07:00
Seth Alves	52fc75a114	merge upstream	2015-03-31 07:18:04 -07:00
Philip Rosedale	5325478940	Merge pull request #4528 from ZappoMan/avatarUI Support for Auto-detecting FST type, and adding type hint to FST files when packaged	2015-03-30 21:31:22 -07:00
Stephen Birarda	7d5b8c430a	remove extra added space	2015-03-30 18:06:51 -07:00
Stephen Birarda	b7174b5170	fix for cleanup of SettingsManager thread	2015-03-30 18:03:18 -07:00
Seth Alves	071b6a21de	Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs	2015-03-30 13:44:39 -07:00
Andrew Meadows	10af59296d	Merge pull request #4499 from sethalves/multi-hull-collisions Multi hull collisions	2015-03-30 12:11:56 -07:00
Seth Alves	26230cf493	uninitialized variable (quiet valgrind)	2015-03-29 05:40:39 -07:00
ZappoMan	baa2f947e5	classifying FSTReader and moving ModelType into that class	2015-03-27 16:30:00 -07:00
Seth Alves	0d4b0ad11e	Merge branch 'multi-hull-collisions' of github.com:sethalves/hifi into vhacd-knobs	2015-03-26 06:37:35 -07:00
Seth Alves	dd9290bd59	clear points for non-hull shapes	2015-03-25 15:21:28 -07:00
Seth Alves	c68f5dd1fa	added various controls for the convex hull generator	2015-03-25 15:13:40 -07:00
Seth Alves	c8ad82917e	clean up some debugging spew. take dimensions into account when scaling points used for collision hull creation	2015-03-23 16:54:36 -07:00
Seth Alves	bfc5cf99d6	more code for compound hull collisions	2015-03-21 16:11:47 -07:00
Seth Alves	769194f046	first stab at compound hull collisions	2015-03-20 13:41:14 -07:00
Brad Davis	7079b5f978	type & squish again	2015-03-19 17:29:57 -07:00
Brad Davis	bf607e4c9c	Fixing indentation and usage	2015-03-19 15:53:16 -07:00
Brad Davis	2552afffe7	Merge branch 'master' into avatar	2015-03-19 09:47:36 -07:00
Andrew Meadows	c032b29633	proper shape management for ConvexHull shapes	2015-03-18 16:29:57 -07:00
Brad Davis	160f666d89	Merge branch 'master' into avatar	2015-03-18 12:55:56 -07:00
Andrew Meadows	517b2648ca	Merge pull request #4465 from sethalves/avatars-can-collide One convex hull shape for models that provide decomposition data.	2015-03-18 12:52:52 -07:00
Seth Alves	2dd75fef2c	remove some unneeded Q_OBJECT macros, diff minimization	2015-03-17 19:12:26 -07:00
Seth Alves	222c3f01eb	minor cleanups, diff minimization	2015-03-17 14:24:46 -07:00
Seth Alves	5475e76516	merge from upstream	2015-03-17 14:16:00 -07:00
Brad Davis	6415ff99f6	Work in progress	2015-03-17 12:04:04 -07:00
Brad Davis	80b5a44cc4	Adding a RAII version of the mutex locker that uses tryLock instead of lock	2015-03-17 11:49:17 -07:00
Seth Alves	bed37ef49a	incorporate code review feedback	2015-03-16 13:57:22 -07:00
Seth Alves	6c4b808813	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-15 07:10:56 -07:00
Seth Alves	b815c365eb	formatting	2015-03-13 18:57:27 -07:00
Seth Alves	87cc710efc	more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set	2015-03-13 18:43:24 -07:00
Stephen Birarda	9d055f81f4	use a Mozilla user agent for mod security	2015-03-13 18:29:55 -07:00
Stephen Birarda	9f7ed7b12a	update user agent to be HighFidelityInterface	2015-03-13 18:28:09 -07:00
Stephen Birarda	dcff4f5956	use HIGH_FIDELITY_USER_AGENT for DataWebPage	2015-03-13 18:25:17 -07:00
Seth Alves	2368e6e5b7	collision with a hull sort of works. there is a new memory corruption problem	2015-03-13 15:41:57 -07:00
Seth Alves	3c61727a22	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-12 11:56:12 -07:00
Seth Alves	b945ce5e7a	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 11:38:01 -07:00
Atlante45	eb5206f8e6	Naming	2015-03-12 19:05:06 +01:00
Atlante45	0bd97ce40c	Dependency::customDeleter uses a lambda	2015-03-12 18:53:29 +01:00
Seth Alves	9e6c289ab8	move filename utils into shared library	2015-03-12 10:23:57 -07:00
Seth Alves	87ac38c3df	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-11 18:35:13 -07:00
Seth Alves	df29d5365a	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 15:18:55 -07:00
Andrew Meadows	feafa0a60b	remove old Ragdoll and avatar interactions	2015-03-11 14:29:03 -07:00
Seth Alves	3a3e723f4e	trying to figureo out where to download hull models	2015-03-11 14:26:30 -07:00
Seth Alves	1c73f50dbc	started to hook up geometry downloader to ShapeInfo	2015-03-11 07:17:13 -07:00
Seth Alves	844085b514	started on hull collisions	2015-03-10 15:30:08 -07:00
Seth Alves	088e23ad54	saving and loading largely works. still some rough edges	2015-03-10 11:31:48 -07:00
Seth Alves	afd2c87dfe	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-10 10:12:43 -07:00
Seth Alves	2076de9153	started on reading entities from json file	2015-03-10 10:12:29 -07:00
Seth Alves	d0bbac2eb6	json writer sort of works. started on reader	2015-03-09 17:55:58 -07:00
Andrew Meadows	6936d65db9	remove unused *= operator for AABox	2015-03-06 15:31:52 -08:00
Andrew Meadows	6fa1b1c600	remove unused cruft and fix float casts	2015-03-06 15:31:27 -08:00
Andrew Meadows	49eee89c19	merge upstream/master into andrew/isentropic Conflicts: libraries/networking/src/PacketHeaders.cpp libraries/networking/src/PacketHeaders.h	2015-03-05 08:22:02 -08:00
Andrew Meadows	d7d25a6509	Octree::findCapsulePenetration() uses meters	2015-03-04 16:16:49 -08:00
Sam Gateau	4619ba1f5b	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
Seth Alves	bb7b132b78	Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once.	2015-03-02 14:18:26 -08:00
Ryan Huffman	11efcd70d8	Add SIGINT handling to assignment-client	2015-02-27 14:09:46 -08:00
Andrew Meadows	7836bb4dcd	rayIntersection uses meters instead of tree units	2015-02-26 17:42:17 -08:00
Andrew Meadows	7210c7a88b	added EntityTree::findEntitiesInMeters() progress toward conversion to meters	2015-02-26 15:16:59 -08:00
Sam Gateau	d8ebb0c5b9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
Ryan Huffman	14ec9b431e	Update findRayRectangleIntersection to set out variable distance	2015-02-25 10:26:44 -08:00
Ryan Huffman	03b10b6cb0	Add findRayRectangleIntersection	2015-02-24 17:00:30 -08:00
Sam Gateau	d08142d37d	replacing glTRansform by gpu/Transform features	2015-02-19 15:12:13 -08:00
Sam Gateau	cc3cc4f96f	replacing the glTransform pipeline for model rendering	2015-02-16 09:31:29 -08:00
Brad Hefta-Gaub	1827d9f3cd	Merge pull request #4256 from samcake/temp1 Getting rid of glLIghts and replacing by the model::Light	2015-02-13 10:49:53 -08:00
Sam Gateau	bc2faca9bc	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-13 01:33:21 -08:00
Andrew Meadows	d89548312e	manipulate the extents for SHAPE_TYPE_SPHERE The conversion from ShapeInfo to btShape MUST be reversable! Otherwise we leak shapes in the ShapeManager class.	2015-02-11 08:44:10 -08:00
Andrew Meadows	e6a6946027	merge upstream/master into andrew/thermonuclear	2015-02-09 12:44:52 -08:00
Sam Gateau	ace6dc4faf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-08 23:23:06 -08:00
Andrew Meadows	a233551ec3	oops forgot to implement ShapeInfo::setParams()	2015-02-08 15:35:54 -08:00
Andrew Meadows	12a7021bb5	ShapeInfo computs own DoubleHashKey, gets new API	2015-02-08 15:12:44 -08:00
Sam Gateau	469ee29f0b	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Brad Davis	da05c26aad	Moving shaders to standard format, adding bounding box support and using it in text node	2015-02-04 21:32:05 -08:00
Sam Gateau	3c30e70c12	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-04 13:32:02 -08:00
Brad Davis	1745ba9a7e	More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage	2015-02-04 12:42:27 -08:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Atlante45	e4591e0d03	Work arount for QVariant not converting to QVariant	2015-02-03 17:11:32 -08:00
Andrew Meadows	28a3c3f469	separate new shape types from legacy	2015-02-03 08:34:06 -08:00
Atlante45	f0b5cd195d	Renaming + end of file spaces	2015-02-02 18:37:49 -08:00
Atlante45	9abdb41764	Rearrange settings classes in correct files	2015-02-02 17:17:19 -08:00
Stephen Birarda	bd0552618f	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
Atlante45	633ec9807d	New settings api	2015-02-02 15:56:03 -08:00
Sam Gateau	2eb3c92e1d	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-02 11:19:08 -08:00
David Rowe	5474c0634e	Merge branch 'master' into 20277 Conflicts: libraries/script-engine/src/ScriptEngine.cpp	2015-01-30 13:49:45 -08:00
Sam Gateau	38129c2988	Merging with latest build	2015-01-30 12:58:50 -08:00
Atlante45	4562c29be8	Merge branch 'master' of https://github.com/highfidelity/hifi into android Conflicts: interface/src/avatar/Hand.cpp	2015-01-30 12:02:11 -08:00
Atlante45	4ef87b9919	Merge branch 'master' of https://github.com/highfidelity/hifi into android Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/ui/PreferencesDialog.cpp interface/src/ui/Stats.cpp libraries/audio-client/src/AudioClient.cpp libraries/audio-client/src/AudioClient.h	2015-01-28 13:13:32 -08:00
ZappoMan	6821f31f14	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing Conflicts: libraries/gpu/src/gpu/GLBackend.cpp	2015-01-28 10:46:30 -08:00
Sam Gateau	3953a4c8c7	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-01-28 00:10:20 -08:00
Andrew Meadows	58bb137c4d	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
Andrew Meadows	23bd3f90d9	Bullet-style rotation integration for kinematics and for dead reckoning after wire-transfer	2015-01-27 17:27:15 -08:00
ZappoMan	4a6cc5c6f2	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing Conflicts: interface/src/avatar/Hand.cpp interface/src/ui/overlays/ImageOverlay.cpp	2015-01-27 16:44:11 -08:00
Sam Gateau	ae3233b119	in the middle of something	2015-01-27 15:44:10 -08:00
David Rowe	812fbc58fb	Use custom User-Agent string	2015-01-23 19:13:29 -08:00
Atlante45	4eac6cd410	Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers	2015-01-23 13:19:03 -08:00
Atlante45	bbf6ae7b01	Move Faceshift constants to their own file in shared	2015-01-23 12:11:08 -08:00
ZappoMan	02a68096c3	add debug for vec4	2015-01-21 16:56:04 -08:00
Atlante45	850f92eae3	Don't call Settings::set when you don't need too.	2015-01-20 17:54:11 -08:00
Stephen Birarda	b4d6a44fc2	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-20 11:15:54 -08:00
Atlante45	d7f6add74c	Use QThreadStorage to store QSettings	2015-01-20 10:53:16 -08:00
Atlante45	e4fa9e508e	Moved loadSetting to MyAvatar	2015-01-20 00:56:25 -08:00
Atlante45	6a00dcbf0a	More switches to new Settings	2015-01-20 00:30:29 -08:00
Atlante45	4f2fa227b2	Got rid of SettingHandle::type	2015-01-19 22:35:38 -08:00
Atlante45	d0d16e088e	Introduced SettingsBridge class Class use to privatize direct access to settings	2015-01-19 21:24:57 -08:00
Atlante45	6cf00041f8	Introduced SettingHandle New class that serves as an accesor to a single setting	2015-01-19 20:56:15 -08:00
Atlante45	43597ea29d	Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess Conflicts: interface/src/Application.cpp interface/src/Menu.cpp	2015-01-19 14:18:22 -08:00
Stephen Birarda	10be0ee984	resolve conflicts on merge with upstream master	2015-01-19 10:26:56 -08:00
Atlante45	33d0e1bad5	Added Settings class Just a simple Wrapper for now	2015-01-18 18:08:20 -08:00
Atlante45	8f5f634308	Took audio settings out of Menu Hooked to actual settings in Audio class	2015-01-17 21:22:02 -08:00
Andrzej Kapolka	b6c843497d	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2015-01-16 11:56:04 -08:00
Atlante45	786c0a5462	Drop DM ref before creating new object	2015-01-15 14:00:45 -08:00
Brad Hefta-Gaub	89967fbe7a	Merge pull request #4104 from AndrewMeadows/inertia store density in EntityItem instead of mass	2015-01-14 17:17:45 -08:00
Andrew Meadows	8236837dd0	add ShapeInfo::computeVolume()	2015-01-14 15:00:31 -08:00
Atlante45	f77fab2fe0	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
Atlante45	27cc3d297e	DependencyManager update - Now need a call to DependencyManager::set(...) that support variable arguments number and type - Now support destroy operation via DependencyManager::destroy() - Now support inheritance. All inheritance relationship need to be specified via DependencyManager::registerInheritance<Base, Derived>() before any call to the DepedencyManager involving Base. - Dependencies should now inherit from the class Dependency as well as using SINGLETON_DEPENDENCY	2015-01-13 20:27:38 -08:00
Atlante45	2a82ff9768	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: assignment-client/src/voxels/VoxelServer.cpp interface/src/Application.cpp interface/src/Audio.cpp interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/Util.cpp interface/src/avatar/MyAvatar.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp libraries/networking/src/NodeList.cpp libraries/shared/src/DependencyManager.h	2015-01-13 11:03:14 -08:00
Atlante45	7d39b45f16	Hopefully fixes the windows compile error	2015-01-12 17:34:07 -08:00
Andrzej Kapolka	cad8313e56	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2015-01-12 12:00:20 -08:00
Stephen Birarda	d30490c760	resolve conflicts on merge with upstream master	2015-01-12 09:25:37 -08:00
Atlante45	6d67b8e20c	Don't call delete later unless you have to	2015-01-09 15:32:08 -08:00
Andrzej Kapolka	c99e2c3ec6	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: libraries/networking/src/PacketHeaders.cpp	2015-01-08 14:57:03 -08:00
Andrzej Kapolka	5a46f3e20d	Material/ray testing bits.	2015-01-05 18:37:47 -08:00
Stephen Birarda	51bba4884f	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
Stephen Birarda	dfb02aea0c	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
ZappoMan	4cc641320b	fix PerformanceTimer to handle timer stacks on multiple threads	2015-01-02 15:04:48 -08:00
Andrew Meadows	58f3436d9b	fix bug in != operator	2014-12-29 10:50:06 -08:00
Stephen Birarda	c7a5f3c86c	resolve conflicts and merge with upstream master	2014-12-29 10:59:42 -07:00
Andrew Meadows	9b7e50858a	merge upstream/master into andrew/inertia Conflicts: libraries/avatars/CMakeLists.txt libraries/entities/CMakeLists.txt	2014-12-29 09:15:49 -08:00
Sam Gateau	bc83641300	add comments to Transform.h	2014-12-22 14:05:09 -08:00
Atlante45	327daacecd	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp libraries/networking/src/NodeList.cpp	2014-12-22 13:34:18 -08:00
Sam Gateau	4c670ac17a	merging with upstream master and origin temp0	2014-12-22 10:38:11 -08:00
Sam Gateau	967c6dbc4b	Add the Model library	2014-12-19 16:19:06 -08:00
ZappoMan	22e2fcf746	add some vec2 debugging	2014-12-19 13:46:42 -08:00
Atlante45	f2847cec06	Changed Singleton Dependency macro and tweaked DM	2014-12-18 15:42:03 -08:00
Andrew Meadows	11f01e1859	merge upstream/master into andrew/inertia	2014-12-18 15:01:08 -08:00
Andrew Meadows	85fd1fc14f	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.cpp	2014-12-18 13:46:06 -08:00
Atlante45	aa0998dc7d	Moved LimitedNodeList into DM	2014-12-18 10:32:34 -08:00
Stephen Birarda	7beb3a7b62	resolve conflicts on merge with upstream master	2014-12-17 16:57:35 -08:00
Stephen Birarda	9425ea2c17	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 16:47:15 -08:00
Atlante45	d9d0166bc9	Use variadic templates to create instance with arguments	2014-12-17 15:23:39 -08:00
Andrew Meadows	6ea766b48d	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityTypes.cpp	2014-12-17 13:21:00 -08:00
Stephen Birarda	737741c13b	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 09:23:42 -08:00
Atlante45	8a76429a0e	Merge branch 'applications_diet' into applications_diet_cpp11	2014-12-16 16:50:51 -08:00
Atlante45	6304a5e819	Unused removed method	2014-12-16 16:50:15 -08:00
Atlante45	3f2b5aeca4	Cleaner destruction handling	2014-12-16 16:22:59 -08:00
Atlante45	c40e83c9e4	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-16 15:42:40 -08:00
Atlante45	b2dac6f53f	DM users update	2014-12-16 15:32:11 -08:00
Atlante45	11a2ecab56	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/entities/EntityTreeRenderer.h interface/src/ui/ApplicationOverlay.cpp libraries/render-utils/src/GlowEffect.cpp libraries/render-utils/src/Model.cpp	2014-12-16 15:02:37 -08:00
Stephen Birarda	1db12453d4	move audio stats into member of Audio	2014-12-16 14:47:24 -08:00
Atlante45	cf6aa563ac	DM returns shared pointer	2014-12-16 13:54:24 -08:00
ZappoMan	bfcc78c57d	replaced Application::resourcesPath() with PathUtils::resourcesPath()	2014-12-15 15:20:18 -08:00
Andrew Meadows	67c3a25475	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.h	2014-12-15 14:46:46 -08:00
ZappoMan	0b95403949	cleanup the windows hackery a little	2014-12-15 12:25:20 -08:00
ZappoMan	95d820ee8b	more windows hackery	2014-12-15 12:16:01 -08:00
ZappoMan	4e7368b643	more windows hackery	2014-12-15 12:09:30 -08:00
ZappoMan	28f2dc62ea	add windowshacks.h to GPUConfig.h and move it to shared	2014-12-15 11:49:01 -08:00
Stephen Birarda	8549e9cb53	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
Atlante45	e40961df12	Checking that T is in fact derived from Dependency	2014-12-14 21:34:27 -08:00
Atlante45	28786721a6	Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager	2014-12-13 01:18:33 -08:00
Atlante45	9aea2843ac	Remove pointer check	2014-12-12 21:20:26 -08:00
Atlante45	50fd52377f	Couple improvements to the dependency manager	2014-12-12 21:10:45 -08:00
Atlante45	14cda00ebc	First implementation of the DependencyManager	2014-12-12 20:52:41 -08:00
Brad Hefta-Gaub	31cbd6e88c	Merge pull request #3954 from ctrlaltdavid/20226 CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize	2014-12-11 14:33:24 -08:00
Stephen Birarda	f58d21d6f0	have ShutdownEventListener handle WM_CLOSE or SIGTERM	2014-12-11 10:21:11 -08:00
David Rowe	136c3a2cce	Replace 2D and 3D text overlay textWidth() method with textSize()	2014-12-09 18:32:53 -08:00
Andrew Meadows	3fd2f12a73	merge upstream/master into andrew/inertia Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntitySimulation.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTreeElement.cpp libraries/entities/src/SimpleEntitySimulation.cpp libraries/entities/src/SimpleEntitySimulation.h libraries/entities/src/SphereEntityItem.cpp	2014-12-09 12:41:53 -08:00
ZappoMan	27bc394bed	repair collision info mismatch	2014-12-08 10:52:53 -08:00
ZappoMan	d698594899	use common findRayTriangleIntersection	2014-12-06 19:39:02 -08:00
ZappoMan	ec907d1d1d	removed debug	2014-12-06 09:44:30 -08:00
ZappoMan	1fec69698e	get the triangle picking for submeshes working, remove some debug	2014-12-05 23:23:21 -08:00
ZappoMan	a6b86da47a	basics of triangle picking working for models	2014-12-05 11:31:27 -08:00
Stephen Birarda	5c3e90f64f	resolve conflicts on merge with upstream master	2014-12-03 13:11:56 -08:00
Andrew Meadows	fb7a5e64cf	fix file path in header text: physcis --> shared	2014-12-03 11:15:44 -08:00
Andrew Meadows	8d49b694cc	ShapeManager doesn't support tiny and giant shapes	2014-12-03 10:08:26 -08:00
Andrew Meadows	6e88ab15f9	remove debug #include	2014-12-02 17:47:33 -08:00
Andrew Meadows	182cebbe40	Fix order of shape types for ShapeCollider	2014-12-02 17:47:00 -08:00
Andrew Meadows	a21ebe4f6a	merge andrew/thermonuclear into andrew/inertia	2014-12-02 15:31:30 -08:00
Andrew Meadows	919214b7cb	split ShapeInfo into shared and physics parts	2014-12-02 10:44:40 -08:00
Andrew Meadows	e6a9081184	Moving ShapeInfo to shared lib	2014-12-01 16:47:55 -08:00
Andrew Meadows	1df6c32a4e	moving Shape* back into shared lib removing dependency of entities lib on physics lib physics lib now depends on entities lib	2014-12-01 16:03:14 -08:00
Andrew Meadows	5acaaa9c3b	merge andrew/thermonuclear into andrew/inertia Conflicts: interface/src/entities/EntityCollisionSystem.cpp libraries/entities/src/EntityItem.h libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTree.h libraries/entities/src/EntityTreeElement.cpp	2014-11-26 15:36:08 -08:00
ZappoMan	333f323856	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode	2014-11-25 12:46:18 -08:00
ZappoMan	e9812d0608	added similarStrings() helper	2014-11-25 09:25:49 -08:00
Andrew Meadows	37093cbd00	merge upstream/master into andrew/inertia Conflicts: interface/src/Application.cpp	2014-11-24 11:24:39 -08:00
Andrew Meadows	eda779b434	add != operator for AACube	2014-11-24 11:04:27 -08:00
Sam Gateau	1f22d5b493	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-11-24 10:05:39 -08:00
Sam Gateau	87471df7a1	First version of the lighmap working	2014-11-21 18:08:34 -08:00
ZappoMan	bd2adf08e3	fix to drift in usecTimestampNow() caused when computer sleeps	2014-11-21 13:33:53 -08:00
Atlante45	ae3bcc8f06	No more .f	2014-11-19 16:53:39 -08:00
Stephen Birarda	8c65c6c1c8	fix comment for actual time format	2014-11-18 17:02:28 -08:00
Stephen Birarda	705d3da089	cleanup time in log prefix	2014-11-18 17:00:33 -08:00
Andrew Meadows	971804b98e	name change shinkIfNeeded() -> shrinkIfNeeded()	2014-11-17 16:14:49 -08:00
Stephen Birarda	473ae10104	shuffle files with QtGui dependency out of shared	2014-11-17 13:33:07 -08:00
ZappoMan	4adb4787cd	added debugging of usecTimestampNow() in octree server to better understand flight times	2014-11-15 21:50:42 -08:00
Sam Gateau	0973d197cf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 12:25:00 -08:00
Stephen Birarda	f23b08971c	merge with cuckoo branch, fix makefile OS X support	2014-11-14 10:52:12 -08:00
Stephen Birarda	86284036f1	put back timestamp in log	2014-11-14 10:35:13 -08:00
Sam Gateau	f09b58c255	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 10:05:01 -08:00
Sam Gateau	642f436fba	first draft of factorizing the rendering traversal for both sides in stereo	2014-11-14 09:56:36 -08:00
Brad Hefta-Gaub	27c37f3a4e	Merge pull request #3784 from ctrlaltdavid/20157 CR for Job #20157 - Enable "Get Overlay properties" from javascript	2014-11-13 20:43:38 -08:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
Stephen Birarda	e10d132f75	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
Sam Gateau	420118e9db	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-13 11:04:12 -08:00
Sam Gateau	7e2c4c0561	SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint	2014-11-13 10:57:32 -08:00
ZappoMan	09a06c9d82	add debug streamer for xColor	2014-11-13 08:14:01 -08:00
David Rowe	fac6b6b426	Refactor QRect conversion to QScriptValue	2014-11-12 21:32:55 -08:00
Sam Gateau	b6c004c431	Fix syntax that doesn't compile on linux and used smart glm::max instruction	2014-11-12 17:16:43 -08:00
Sam Gateau	8fb04af59d	defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design	2014-11-12 16:40:45 -08:00
Sam Gateau	e47524d70a	fix syntax and missing constant name	2014-11-12 10:41:50 -08:00
Sam Gateau	b716a512c6	Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level	2014-11-12 00:26:44 -08:00
Sam Gateau	668c5e298d	clean up the Transform class and the rendering path in Model.cpp	2014-11-11 16:39:00 -08:00
Sam Gateau	ad51416c28	move the transform class files to the Shared library, still problem with negative scale composition	2014-11-11 09:54:35 -08:00
Stephen Birarda	9b2acadb4b	include c++ header for memset	2014-11-07 17:24:05 -08:00
Stephen Birarda	6a4808aac8	include string.h for memset usage	2014-11-07 17:22:54 -08:00
Stephen Birarda	2ca673175a	rename StdDev to StDev, patch its leak	2014-11-07 17:15:54 -08:00
Stephen Birarda	4fd22914c0	fix a leak in StdDev	2014-11-07 17:11:00 -08:00
Stephen Birarda	3f44203984	remove getpid usage and replace with Qt solution	2014-11-05 11:42:40 -08:00
Philip Rosedale	cdad40faec	Merge pull request #3736 from ZappoMan/entityBugs reset the QElapsedTimer in usecTimestampNow() periodically to prevent error	2014-11-04 12:59:13 -08:00
ZappoMan	a89287e404	reset the QElapsedTimer in usecTimestampNow() periodically to prevent error	2014-11-04 11:01:37 -08:00
Stephen Birarda	8d6b041758	send a pick ray with HFActionEvent, not x,y	2014-11-04 10:01:25 -08:00
Stephen Birarda	6b922fc3e7	final tweak for linux unistd include	2014-10-30 10:03:36 -07:00
ZappoMan	c3d1d13fa9	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
Stephen Birarda	7f3482bbdd	swithc from elif to elsif	2014-10-29 10:53:34 -07:00
Stephen Birarda	03e1da0ba9	include unistd only on Q_OS_LINUX	2014-10-29 10:37:39 -07:00
ZappoMan	3e9bc23c2f	moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes	2014-10-29 10:19:04 -07:00
Andrew Meadows	c39b239f99	fix linux build for missing getpid()	2014-10-29 09:30:51 -07:00
Brad Hefta-Gaub	be65a798db	Merge pull request #3681 from birarda/verbose-log-silencer logging tweaks to reduce spam from repeated log messages	2014-10-28 17:58:17 -07:00
Stephen Birarda	9af097967d	remove ctime since windows build did not fail without it	2014-10-28 15:56:30 -07:00
Stephen Birarda	992396ba63	add ctime for strftime call	2014-10-28 15:48:06 -07:00
Stephen Birarda	01de6305e9	add time header for date in log entry	2014-10-28 15:42:03 -07:00
Stephen Birarda	c4538836c1	always output the first matching repeated log message	2014-10-28 14:51:47 -07:00
Stephen Birarda	424793b905	complete output of suppressed repeated messages to log	2014-10-28 14:49:14 -07:00
Stephen Birarda	8e3102266a	use the LogHandler in Interface	2014-10-28 14:23:34 -07:00
Stephen Birarda	d3bbd251db	move Logging to LogHandler	2014-10-28 13:59:23 -07:00
Andrew Meadows	4c3cdf5b7a	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
Stephen Birarda	2711ff2b5f	move functionality from VerboseLoggingHelper into the Logging class	2014-10-28 13:48:53 -07:00
Stephen Birarda	8a4c716452	leverage the VerboseLoggingHelper for packets from unknown nodes	2014-10-28 12:15:52 -07:00
Stephen Birarda	9c30903eb6	add the VerboseLoggingHelper class for repeated messages	2014-10-28 12:05:56 -07:00
ZappoMan	fc507850be	Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles	2014-10-16 20:36:28 -07:00
samcake	3d13792a9d	Merge pull request #3599 from ZappoMan/frustumCullModelParts Frustum cull model parts	2014-10-15 11:56:00 -07:00
ZappoMan	64fecba011	removed some unneeded scaling to AABox and AACube debug	2014-10-14 17:17:30 -07:00
ZappoMan	e235af1331	add debeg streaming to Extents	2014-10-14 17:16:49 -07:00
ZappoMan	f04c2b6e6f	fix possible buffer overrun asserts	2014-10-14 17:14:12 -07:00
Andrzej Kapolka	60576bdcbd	Basic metavoxel scripting bits.	2014-10-13 15:05:16 -07:00
ZappoMan	4c85e9f581	removing particles	2014-10-13 14:10:57 -07:00
Stephen Birarda	c16ab0a19f	remove definition for an unused method	2014-09-29 15:27:45 -07:00
Stephen Birarda	bd4a32551b	fix for settings save without organization	2014-09-29 10:09:33 -07:00
Stephen Birarda	5e2870ac5f	require a distinction between master config and user config	2014-09-29 09:30:08 -07:00
Stephen Birarda	7c738edbd8	Merge pull request #3488 from PhilipRosedale/master Correct eye contact for Oculus users	2014-09-26 15:42:03 -07:00
Stephen Birarda	e75a2d355e	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard	2014-09-26 14:31:52 -07:00
Stephen Birarda	94f30fe4d9	handle password setting by not converting to double	2014-09-26 12:20:12 -07:00
Stephen Birarda	21809cc9df	fix http username with no password	2014-09-26 12:09:29 -07:00
Stephen Birarda	e6449da890	repair a crash while overriding a config map	2014-09-26 11:10:56 -07:00
Stephen Birarda	954fbc2017	use DomainServerSettingsManager to handle simulation settings and config	2014-09-26 11:06:05 -07:00
Philip Rosedale	f66f565f53	update stDev (standard deviation) class to coding standard	2014-09-25 18:14:02 -07:00
Stephen Birarda	a684191cf1	change the default config path to system config path	2014-09-25 14:50:07 -07:00
ZappoMan	9cd76983a2	swith to using shape collider instead of spheres	2014-09-25 14:35:20 -07:00
Andrew Meadows	58bcb98dd6	remove virtual for ListShape::findRayIntersection()	2014-09-23 10:04:36 -07:00
Andrew Meadows	7dd9587d20	remove warning about hidden virtual override	2014-09-23 09:07:23 -07:00
Stephen Birarda	0033dfe5af	use quat orientation to store locations and user locations	2014-09-16 09:57:21 -07:00
Andrew Meadows	0539246089	merge upstream/master into andrew/ragdoll	2014-09-15 13:56:51 -07:00
ZappoMan	fd9f64cb44	normalize all quats before packing	2014-09-15 08:46:28 -07:00
ZappoMan	4ae3360f83	fix warning	2014-09-13 08:50:52 -07:00
ZappoMan	e76ffb2ecb	fixed another warning	2014-09-13 08:44:13 -07:00
ZappoMan	973479d1ac	fix warning in ByteCountCoded<>	2014-09-13 07:57:45 -07:00
Andrew Meadows	f2882618be	merge upstream/master into andrew/inertia Conflicts: interface/src/avatar/MyAvatar.cpp	2014-09-12 17:50:26 -07:00
Andrew Meadows	62867391a3	collide against PhysSimulation instead of VoxelTree	2014-09-12 17:38:45 -07:00
Andrew Meadows	32b07027d3	namechange planeNormal --> faceNormal	2014-09-12 17:27:56 -07:00
Andrew Meadows	4e7a7667b1	remove unused variable	2014-09-12 09:19:03 -07:00
Andrew Meadows	825be3e1e7	fix for ray-vs-AACubeShape intersection test	2014-09-12 08:40:48 -07:00
Andrew Meadows	a9957ac7df	the real fix for ray-vs-plane intersection	2014-09-12 08:40:03 -07:00
Andrew Meadows	ff0872a5f0	add RayIntersectionInfo::getIntersectionPoint()	2014-09-12 08:38:44 -07:00
Andrew Meadows	46089a0611	fix ray-vs-AACube logic	2014-09-12 08:37:47 -07:00
ZappoMan	9f4d199440	move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes	2014-09-11 15:36:13 -07:00
ZappoMan	d616c7fa0c	handy conversions between AABox, AACube, and Extents	2014-09-11 12:23:35 -07:00
ZappoMan	7cadc3433a	improve constness for operators on PropertyFlags<>	2014-09-11 12:13:34 -07:00
ZappoMan	13cffa6e44	moved Extents to shared	2014-09-11 12:12:25 -07:00
Andrew Meadows	0494ffcf38	implement Ray-vs-Capsule and Ray-vs-AACube	2014-09-10 17:01:51 -07:00
Andrew Meadows	4da1ca22ba	Add RayIntersectionInfo and use for shape-vs-ray	2014-09-09 17:35:06 -07:00
Ryan Huffman	ecadf7dd33	Add include for QtGlobal to ensure OS global has been defined	2014-09-08 12:40:53 -07:00
Ryan Huffman	b0a0760be2	Update ShutdownEventListener to not stop event handling	2014-09-05 11:26:22 -07:00
Ryan Huffman	38a14c3864	Reapply "Update assignment client to close on WM_CLOSE message on Windows" This reverts commit `a603453cf2`.	2014-09-05 11:19:36 -07:00
Leonardo Murillo	a603453cf2	Revert "Update assignment client to close on WM_CLOSE message on Windows"	2014-09-05 11:36:56 -06:00
Brad Hefta-Gaub	9648c0d64e	Merge pull request #3343 from AndrewMeadows/ragdoll Ragdoll Part 12: first pass avatar skeleton collides with voxels	2014-09-04 23:09:08 -07:00
Andrew Meadows	7cde6811ca	remove unecessary AACube::operator<()	2014-09-04 15:21:19 -07:00
AndrewMeadows	8223481ecb	Merge pull request #3341 from huffman/19967 Code Review for Job #19967	2014-09-03 16:51:19 -07:00
AndrewMeadows	9036954d38	Merge pull request #3311 from huffman/fix-wm-close Update assignment client to close on WM_CLOSE message on Windows	2014-09-03 16:43:12 -07:00
Andrew Meadows	e120697a9b	merge upstream/master into andrew/ragdoll	2014-09-03 15:49:32 -07:00
AndrewMeadows	bd55da4a83	Merge pull request #3335 from ZappoMan/virtualEntities Model Server to Entity Server Refactoring	2014-09-03 15:48:58 -07:00
Andrew Meadows	a3b26582ba	fix for nan in sphereVsAACubeHelper()	2014-09-03 15:39:26 -07:00
Andrew Meadows	4270c4d989	merge upstream/master into andrew/ragdoll	2014-09-03 14:42:17 -07:00
Andrew Meadows	361d1e83b0	use PhysicsEntity::stepForward() in simulation loop	2014-09-03 13:18:35 -07:00
Andrew Meadows	6454fd2627	add PhysicsEntity::stepForward()	2014-09-03 13:18:12 -07:00
Andrew Meadows	06e1d4a8bc	init Shape::_mass in all ctors	2014-09-03 13:16:49 -07:00
Andrew Meadows	0cc6f559d4	add AACube::operator<() so they can be sorted	2014-09-03 13:13:54 -07:00
Ryan Huffman	5937830443	Update getWindowTitleBarHeight signature	2014-09-03 08:27:18 -07:00
Ryan Huffman	1ee23a1661	Add Windows.h include to ShutdownEventListener	2014-09-03 08:04:39 -07:00
Ryan Huffman	76bede04aa	Move stdout/err disabling to a library class	2014-09-03 07:06:08 -07:00
Ryan Huffman	c27bee2c06	Move wm_close handling to a shared library	2014-09-03 07:05:24 -07:00
Andrew Meadows	7c04a25095	fix whitespace formatting of curly braces	2014-09-02 16:29:20 -07:00
Ryan Huffman	67cefc8d54	Reduce height of RunningScripts so titlebar is inside main window	2014-09-02 13:12:52 -07:00
ZappoMan	ea22073ddc	removed some accidentally added code	2014-09-01 23:05:23 -07:00
ZappoMan	d1a046e6ed	properly handle LOD in rendering by not rendering small entities	2014-08-29 21:18:31 -07:00
Andrew Meadows	aeb355e3da	re-enabling legacy avatar-vs-voxel collisions so that I don't break anything when this merges with upstream	2014-08-29 15:53:20 -07:00
Andrew Meadows	ebcc960ec7	merge upstream/master into andrew/ragdoll	2014-08-29 15:48:40 -07:00
Andrew Meadows	a0eb13f6db	collision logic for capsule-side-vs-cube-face with unit tests	2014-08-29 14:23:00 -07:00
ZappoMan	2bcad6ab2b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp examples/editModels.js	2014-08-28 21:19:56 -07:00
Andrew Meadows	00913d4422	fixes for capsuleVsAACube() with unit tests	2014-08-28 16:51:16 -07:00
ZappoMan	76c77d6994	first cut at properly working lifetime	2014-08-28 13:46:54 -07:00
Andrew Meadows	921c8cfec3	fix broken build for using unititialized const float	2014-08-27 12:21:15 -07:00
Andrew Meadows	e133a696f5	merge andrew/ragdoll into some ShapeCollider work	2014-08-27 12:12:08 -07:00
Andrew Meadows	c6253bb51a	AACube vs Sphere and Capsule collision tests Sphere is unit tested. Also removed the shape collision query against Octree	2014-08-27 12:09:41 -07:00
Craig Hansen-Sturm	e941e58626	merge HEAD with PR-3281	2014-08-26 18:25:40 -07:00
Andrew Meadows	7a5c4fdb16	remove commented out #includes	2014-08-25 15:25:46 -07:00
ZappoMan	1764839223	get basics of referentials working	2014-08-25 14:07:01 -07:00
Andrew Meadows	681c526fe1	exploit symmetry of collision pairings	2014-08-25 08:52:45 -07:00
Andrew Meadows	f684608d1f	Added AACubeShape with stubbed collision functions	2014-08-25 08:24:44 -07:00
Andrew Meadows	1bd7734ec1	sometimes swap order of shapes for simpler code	2014-08-22 18:07:11 -07:00
Andrew Meadows	1be922f986	add shapeVsList etc to dispatch table renamed some functions for more readability	2014-08-22 11:20:53 -07:00
Andrew Meadows	3ebd8c1969	use dispatchTable for shape-vs-shape collisions	2014-08-21 16:40:25 -07:00
Andrew Meadows	f511fe2657	Ragdoll cannot assume skeleton's rootIndex is 0 some Models have extra "joints" not part of the normal skeleton	2014-08-19 11:31:50 -07:00
ZappoMan	32d5eb3cea	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/CMakeLists.txt interface/CMakeLists.txt libraries/entities/CMakeLists.txt libraries/models/src/ModelEditPacketSender.cpp libraries/models/src/ModelEditPacketSender.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h libraries/octree/src/OctreePacketData.h libraries/octree/src/OctreeQuery.cpp libraries/particles/src/ParticleEditPacketSender.cpp libraries/particles/src/ParticleEditPacketSender.h libraries/script-engine/CMakeLists.txt tests/octree/CMakeLists.txt	2014-08-18 15:16:35 -07:00
Andrew Meadows	543bf5224c	add VerletPoint::shift()	2014-08-18 12:54:26 -07:00
Andrew Meadows	7e7978de1a	compute and store Ragdoll::_accumulatedMovement	2014-08-18 12:53:04 -07:00
Andrew Meadows	fe5f9f8fe5	use relative mass when enforcing ContactPoint	2014-08-18 12:49:47 -07:00
Andrew Meadows	54851c5ced	add Ragdoll::_accumulatedMovement	2014-08-18 12:49:12 -07:00
Andrew Meadows	432c14408c	removed hackery from ContactPoint enforcement	2014-08-14 15:29:57 -07:00
Andrew Meadows	98d27ad2b5	more correct names for ContactPoint API renamed (and disabled) the useless enforce() to applyFriction() changed the buildConstraints() method to more correct name: enforce() will eventually change how ContactPoint actually works, but later	2014-08-14 15:17:03 -07:00
Andrew Meadows	60d411ead5	cleanup Ragdoll API (less "ragdoll" qualifiers)	2014-08-14 14:41:51 -07:00
Andrew Meadows	46c91052c9	split SkeletonModel and Ragdoll classes apart	2014-08-14 14:29:03 -07:00
Andrew Meadows	ee0d0a1566	remove ragdoll from simulation in dtor	2014-08-14 09:20:53 -07:00
wangyix	81fa5ed41f	readPendingDatagrams stats printed and sent to domain page jittertester now prints out send or receive error msgs	2014-08-13 16:48:06 -07:00
Andrew Meadows	f66398d366	adding comment about parameter's purpose	2014-08-13 15:06:34 -07:00
Andrew Meadows	7852321152	merge upstream/master into andrew/ragdoll	2014-08-13 14:52:14 -07:00
Andrew Meadows	b177686f74	minor tweak to how ContactPoint is updated	2014-08-13 14:50:25 -07:00
Andrew Meadows	2f1a56a87c	ContactPoint tries to help maintain collisions so that collision events will continue to update the contact	2014-08-13 13:48:04 -07:00
wangyix	b17c9102c9	added stats for readPendingDatagrams in audiomixer	2014-08-13 13:30:02 -07:00
Andrew Meadows	bc432aa8e8	use relative masses for ContactPoint contsrtaint	2014-08-13 11:29:54 -07:00
Andrew Meadows	4de43b7cbe	cleanup and reordering of code	2014-08-13 11:19:32 -07:00
wangyix	db0fbcab97	merge with upstream	2014-08-13 11:09:55 -07:00
ZappoMan	3551bd676f	quiet a lot of debugging, fix issue with updating entities that overhang the domain bounds	2014-08-12 13:14:28 -07:00
ZappoMan	027b1d58cc	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h interface/src/entities/EntityTreeRenderer.h interface/src/models/ModelTreeRenderer.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.h	2014-08-08 14:26:56 -07:00
Stephen Birarda	d5b1bee13c	resolve conflicts on merge with upstream master	2014-08-08 13:48:32 -07:00
Stephen Birarda	6eb2c73624	add assert include to SharedUtil	2014-08-08 13:23:54 -07:00
Stephen Birarda	27419b7b6b	fix some build blockers in test directory	2014-08-08 13:17:54 -07:00
Stephen Birarda	0378fb3049	break glm helpers out of SharedUtil	2014-08-08 13:17:53 -07:00
wangyix	63624fae7d	cleaned up code, fixed typos	2014-08-08 11:40:48 -07:00
wangyix	b670226ee3	removed printf, removed random copy of some file	2014-08-08 11:22:04 -07:00
Philip Rosedale	96a795eea4	Merge pull request #3263 from AndrewMeadows/ragdoll Ragdoll Part 9:	2014-08-07 22:12:31 -07:00
wangyix	1153a76ab1	new option knobs added, no new behavior yet	2014-08-07 16:37:36 -07:00
ZappoMan	84f3ede32f	small change to force rebuild	2014-08-07 15:09:24 -07:00
Andrew Meadows	bb33266635	merge upstream/master into andrew/ragdoll	2014-08-07 14:37:10 -07:00
Andrew Meadows	94da63006c	VerletPoint::_mass is now private We set the mass of other avatars artificially high so they are less movable.	2014-08-07 14:35:32 -07:00
Andrew Meadows	0f784a9cc5	add other ragdolls to simulation	2014-08-07 13:09:05 -07:00
wangyix	357ba92181	working towards more dials for InboundAdioStream	2014-08-07 12:41:09 -07:00
Andrew Meadows	87350ad2d0	ragdoll simulation now in model-relative frame (same rotation as world-frame, but translated to MyAvatar origin)	2014-08-07 11:45:06 -07:00
Andrew Meadows	27b876e84c	namechange _frame --> _frameCount	2014-08-07 09:02:31 -07:00
AndrewMeadows	2653b33b67	Merge pull request #3257 from Atlante45/referentials Referentials	2014-08-06 14:12:18 -07:00
Andrew Meadows	cb8c0792b2	make main ragdoll and entity special also addded some logic (unused) to add ragdolls of other avatars	2014-08-06 10:43:56 -07:00
Andrew Meadows	a1fccdb177	remove dangling shape pointers from PhysicsSimulation	2014-08-05 08:32:14 -07:00
Andrew Meadows	39d3deee90	merge upstream/master into andrew/ragdoll	2014-08-04 17:37:28 -07:00
Andrew Meadows	f126ce299a	ContactPoint = set of assymetric distance consraints	2014-08-04 17:34:24 -07:00
Andrew Meadows	4beee3fecf	add Shape::getVerletPoints()	2014-08-04 17:33:24 -07:00
Andrew Meadows	d1b2ba4a43	fix bug: false positive capsuleCapsule() collision for capsules with parallel axes and negative pojection of center-to-center separation also replace fabs() with fabsf()	2014-08-04 17:30:23 -07:00
Stephen Birarda	9fc545001c	look for a config.json file by default in resources	2014-08-04 15:40:45 -07:00
Atlante45	d9dde06c14	Various tweaks to referentials	2014-08-04 14:59:15 -07:00
ZappoMan	3a8c5018ee	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h libraries/entities/src/EntityTreeElement.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.cpp libraries/models/src/ModelTree.h libraries/models/src/ModelTreeElement.cpp libraries/networking/src/PacketHeaders.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h	2014-08-04 12:01:23 -07:00
Andrew Meadows	1ec6ee05f3	Rename ContactConstraint to ContactPoint	2014-08-01 15:08:21 -07:00
Andrew Meadows	3305f5edf9	merge upstream/master into andrew/ragdoll	2014-08-01 11:13:18 -07:00
Andrew Meadows	789eeed760	limit action of ContactConstraint to penetration	2014-08-01 11:11:41 -07:00
Andrew Meadows	9d2744296e	update physics stats names	2014-07-31 13:33:46 -07:00
Andrew Meadows	fc1d805d54	add ContactConstraint and use to impede muscles	2014-07-31 13:16:06 -07:00
Andrew Meadows	0f82236f2c	minor cleanup	2014-07-31 13:09:10 -07:00
Andrew Meadows	0b9f246661	set the shape ID in the ctor's NOT the dtor	2014-07-31 13:08:27 -07:00
ZappoMan	77e1867b11	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp assignment-client/src/Agent.h examples/editModels.js interface/src/Application.h	2014-07-31 10:34:23 -07:00
Brad Hefta-Gaub	d6e6cfd585	Merge pull request #3216 from wangyix/inbound_audio_stream Audio ringbuffer classes refactored into subclasses of InboundAudioStream	2014-07-30 18:00:17 -07:00
Andrew Meadows	f579d2a0e2	add CollisionInfo::getShapePairKey()	2014-07-30 13:11:45 -07:00
Andrew Meadows	176d8d157d	remove unused Constraint::_type	2014-07-30 13:07:32 -07:00
Andrew Meadows	7b76753daf	add PhysicsSimulation::_frame	2014-07-30 11:45:53 -07:00
Andrew Meadows	c0689f3784	fix old bug: rotation of CapsuleShape not updated when setting endpoints directly	2014-07-30 11:30:08 -07:00
Andrew Meadows	53db6dec13	fix old copy-n-paste typo	2014-07-30 11:29:43 -07:00
Andrew Meadows	917833d92a	namechange for Shape::_id	2014-07-30 11:29:07 -07:00
Andrew Meadows	dde0cbddcc	add Shape::_id	2014-07-30 11:09:19 -07:00
Andrew Meadows	81ba686fdf	more perfstats for ragdoll simulation	2014-07-30 11:02:47 -07:00
Andrew Meadows	67b9c185eb	formatting and minor tweaks to constraint strengths	2014-07-29 16:48:34 -07:00
wangyix	71c23eac1e	added TimeWeightedAvg to InboundAudioStream _maxFramesOverDesired hardcoded right now	2014-07-29 13:51:46 -07:00
Atlante45	03031c4c04	Outdated link	2014-07-28 16:36:12 -07:00
ZappoMan	805a88b73b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/editModels.js interface/src/entities/EntityTreeRenderer.h libraries/models/src/ModelsScriptingInterface.cpp libraries/script-engine/src/ScriptEngine.cpp	2014-07-28 13:39:35 -07:00
wangyix	9bbd055404	added stdev method of jitter calc to InboundAudioStream	2014-07-28 11:41:08 -07:00
Andrew Meadows	60612f6397	implement VerletPoint::integrateForward()	2014-07-25 15:23:12 -07:00
Andrew Meadows	b2c2cfec79	implement base Ragdoll::stepRagdollForward()	2014-07-25 15:22:25 -07:00
Andrew Meadows	2ddca4fbf9	split independent classes out of Ragdoll files	2014-07-24 09:50:16 -07:00
Andrew Meadows	b62f04e9fe	check for nan's coming out of rotationBetween()	2014-07-23 16:51:53 -07:00
Andrew Meadows	c0e02107c5	minor cleanup	2014-07-23 16:51:26 -07:00
ZappoMan	30aee70346	latest work	2014-07-21 09:18:21 -07:00
Philip Rosedale	1b265f3adb	Merge pull request #3180 from AndrewMeadows/ragdoll Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes	2014-07-17 16:00:02 -07:00
Brad Hefta-Gaub	437e3efbc2	Merge pull request #3179 from wangyix/quick_audio_PR Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames	2014-07-17 11:44:05 -07:00
Andrew Meadows	b22652f441	merge upstream/master into andrew/ragdoll	2014-07-17 10:52:27 -07:00
Andrew Meadows	66158cb8a2	fix capsule-vs-capule collision test	2014-07-17 09:19:17 -07:00
wangyix	6764ace8eb	droppable silent packets are added for dropped packets; _currentJitterBufferFrames replaced with moving average of frames available. Downstream framesAvailable stat now includes the frames in QAudioOutput as well as the ringbuffer.	2014-07-16 14:41:24 -07:00
Andrew Meadows	922912b784	merge upstream/master into andrew/ragdoll Conflicts: interface/src/Menu.h	2014-07-16 09:00:36 -07:00
Andrzej Kapolka	469e31cc05	Script bindings for QColor.	2014-07-15 16:44:02 -07:00
ZappoMan	1eb472c43a	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-07-15 10:05:06 -07:00
ZappoMan	2baac96665	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/sit.js interface/src/Application.cpp libraries/models/src/ModelItem.cpp libraries/models/src/ModelsScriptingInterface.cpp	2014-07-15 10:04:40 -07:00
wangyix	1047ec7c87	merge with upstream	2014-07-14 16:25:26 -07:00
Aleric Inglewood	935f28aa35	Type fix. That that even compiled :/	2014-07-14 21:18:37 +02:00
wangyix	cb5a9bf668	moved some const defs to avoid redefinition	2014-07-14 10:43:02 -07:00
Aleric Inglewood	13c2c69d06	Fix another typo in previous commit	2014-07-13 20:54:27 +02:00
Aleric Inglewood	ea98b58b40	Debug support: allow printing of glm types to QDebug. This adds support for serialization to QDebug of glm::vec3, glm::quat and glm::mat4. Output example: qDebug().nospace() << "Calling PhysicsEntity::findRayIntersection(" << origin << ", " << direction << ", &distance) const; numShapes = " << numShapes; leads to: [2014-07-13T20:24:47] Calling PhysicsEntity::findRayIntersection({type='glm::vec3', x=5222.45, y=2159.05, z=6527.79}, {type='glm::vec3', x=0, y=-0.119145, z=-0.992877}, &distance) const; numShapes = 0 Note that we explicitly don't return dbg.space() because we want to be able to print these things comma separated as follows: {...}, {...}, ... as opposed to {...} , {...} etc. I changed the already existing operator<< for Box to the more general case, where it just prints its members and doesn't mess with the internals of its members. The result is more verbose, but also more recognizable when in the future everything will look the same, allowing for speed reading the debug output. The constructor of Box needed to made explicit because it was too annoying that when one forgets to #include "StreamUtils.h" that writing a glm::vec3 resulted in printing out a Box, implicitly converted from the vector.	2014-07-13 20:43:02 +02:00
wangyix	82e9aa8bb7	made stats easier to read; reverted injected stream deletion conditions	2014-07-11 16:08:15 -07:00
Andrew Meadows	c5a5f8c5d4	bug fix: bad logic in capsule-vs-capsule	2014-07-11 10:54:16 -07:00
Andrew Meadows	7c8f5e2c12	Remove some old TODO comments	2014-07-11 10:54:03 -07:00
wangyix	25f4f63a1e	added window PacketStreamStats to AudioStreamStats	2014-07-10 16:42:23 -07:00
ZappoMan	780532bfd8	more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe	2014-07-10 13:42:49 -07:00
wangyix	35419eb939	Merge remote-tracking branch 'upstream/master' into quick_audio_PR	2014-07-10 11:56:35 -07:00
wangyix	a955a17472	changed RingBufferHistory to use qvector instead of raw array	2014-07-10 11:55:19 -07:00
wangyix	0b213f9616	streamlined AudioStreamStats packing; added #include <limits>	2014-07-10 10:44:33 -07:00
wangyix	35e4b253c2	added typename keyword in MovingMinMaxAvg.h	2014-07-10 10:35:29 -07:00
wangyix	763cc26fa9	added operator= to RingBufferHistory<T>::Iterator	2014-07-10 10:21:03 -07:00
wangyix	37b60a63b2	removed spaces	2014-07-10 10:01:32 -07:00
wangyix	0d83b9a6f6	tidied up code	2014-07-10 09:51:01 -07:00
wangyix	01f10024ae	all stats added, needs testing; created PacketStreamStats struct	2014-07-09 18:13:33 -07:00
wangyix	81e168f657	added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg	2014-07-09 15:38:03 -07:00
Andrew Meadows	9ce6844e9d	fix accidental broken class definition	2014-07-09 14:39:08 -07:00
Andrew Meadows	63bcee0229	fix whitespace formatting	2014-07-09 14:33:09 -07:00
wangyix	d03d3ef817	new auidostreamstats displayed in interface, domain page stats updated	2014-07-09 11:59:50 -07:00
Andrew Meadows	d26585728b	Improved stat accumulation and context names	2014-07-09 11:53:53 -07:00

... 14 15 16 17 18 ...

2994 commits