Stephen Birarda 956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback		2018-04-25 14:33:23 -07:00
..
assets	Merge remote-tracking branch 'upstream/master' into short-id	2018-04-20 11:10:21 -07:00
audio	Merge pull request #12944 from humbletim/fix-pal-adjusted-injector-gain	2018-04-23 09:22:53 -07:00
avatars	Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback	2018-04-25 14:33:23 -07:00
entities	Ensure the tree lock is always taken before the simulation lock	2018-04-24 13:46:05 -07:00
messages
octree	CR	2018-04-18 15:05:49 -07:00
scripts	Fix ESS remote method calls for connect only users	2018-03-28 14:01:03 -07:00
Agent.cpp	fix some xcode warnings for unnecessary captured this	2018-04-04 10:38:32 -07:00
Agent.h	Remove legacy jurisdiction code	2017-12-29 12:46:52 -08:00
AssignmentClient.cpp	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
AssignmentClient.h
AssignmentClientApp.cpp	list assignment types in assignment-client help	2017-12-18 15:32:32 -08:00
AssignmentClientApp.h	Sandbox restarts crashed processes	2017-06-29 12:13:52 -07:00
AssignmentClientChildData.cpp
AssignmentClientChildData.h
AssignmentClientLogging.cpp
AssignmentClientLogging.h
AssignmentClientMonitor.cpp	CR	2017-11-15 11:20:30 -08:00
AssignmentClientMonitor.h	Add info on how the child AC finished	2017-07-14 11:39:32 -07:00
AssignmentDynamic.cpp	remove unused API from ObjectDynamic and friends	2017-05-15 22:13:03 -07:00
AssignmentDynamic.h	remove unused API from ObjectDynamic and friends	2017-05-15 22:13:03 -07:00
AssignmentDynamicFactory.cpp	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
AssignmentDynamicFactory.h	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
AssignmentFactory.cpp
AssignmentFactory.h
main.cpp	Create a standard function to init Hifi Apps	2018-02-22 17:06:09 -08:00