David Rowe
|
3c7cdc16ce
|
Merge branch 'master' into 20280
Conflicts:
interface/src/Application.h
|
2015-01-30 18:44:14 -08:00 |
|
David Rowe
|
44083dd343
|
Add user warning if domain has mismatched packet versions
|
2015-01-27 13:10:11 -08:00 |
|
ZappoMan
|
db94949649
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
interface/src/avatar/SkeletonModel.cpp
|
2015-01-14 17:55:03 -08:00 |
|
ZappoMan
|
e6388a65b9
|
rough pass at adding color to geometry cache
|
2015-01-13 20:53:05 -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 |
|
ZappoMan
|
b940dcfdb3
|
more voxel-ectomy cleaning up some remaining references to voxels
|
2015-01-06 09:27:48 -08:00 |
|
ZappoMan
|
95bb125e48
|
more voxelEctomy
|
2014-12-30 20:13:57 -08:00 |
|