Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-03 22:30:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-lubosz/libraries
History
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
..
animation Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
audio Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
avatars Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
embedded-webserver rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
entities Merge pull request #4086 from huffman/std-to-qstring 2015-01-12 16:19:28 -08:00
entities-renderer remove lock at EntityTreeRenderer::loadEntityScript 2015-01-11 10:44:36 -08:00
environment more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
fbx Update std::string instances to QString 2015-01-09 16:22:52 -08:00
gpu fixed pointers which were using 0 instead of NULL and syntax in resource.h 2014-12-22 11:20:04 -08:00
metavoxels Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
model FIx typos 2014-12-22 15:44:46 -08:00
networking Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
octree Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
physics remove some TODO comments 2015-01-09 09:28:01 -08:00
render-utils Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
script-engine Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
shared Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00