Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-19 21:23:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/libraries
History
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
..
animation Removed unused variable, changed glm::vec3(0) to glm::vec3() 2015-09-11 10:43:49 -07:00
audio resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
audio-client call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
auto-updater call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
avatars Protect avatarLock. 2015-09-09 11:11:06 -07:00
display-plugins Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 09:12:32 -07:00
embedded-webserver Merge pull request #5663 from birarda/master 2015-08-27 12:46:24 -07:00
entities Merge branch 'master' into homer 2015-09-11 16:31:18 -07:00
entities-renderer Merge branch 'master' into homer 2015-09-11 16:31:18 -07:00
environment call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
fbx Merge pull request #5741 from AndrewMeadows/brokenCapsules 2015-09-09 09:33:57 -07:00
gpu Procedural skybox work 2015-09-08 14:31:16 -07:00
gpu-networking put back TextureCache headers 2015-09-08 15:23:26 -07:00
input-plugins Toggle mute while holding the hydras 2015-09-04 16:19:58 -07:00
model Procedural skybox work 2015-09-08 14:31:16 -07:00
networking Merge pull request #5772 from Atlante45/protocol 2015-09-11 09:35:39 -07:00
octree Merge branch 'master' into homer 2015-09-11 16:31:18 -07:00
physics Merge branch 'master' into homer 2015-09-11 16:31:18 -07:00
plugins call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
procedural Eliminate excessive debug logging from procedural setup 2015-09-10 10:57:37 -07:00
render Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
render-utils Added head target to AnimGraph IK node. 2015-09-11 09:48:48 -07:00
script-engine Revert "Make sure all entity script callbacks happen on the Entities script engine thread" 2015-09-11 11:55:36 -07:00
shared Merge branch 'master' into homer 2015-09-11 16:31:18 -07:00
ui call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00