overte-HifiExperiments/interface/src/starfield
Andrew Meadows 1266ffd0ca merge of windows-build
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
2014-01-16 09:00:13 -08:00
..
data Starfield fix and Milky Way 2013-10-29 15:22:41 -07:00
renderer more windows float warning and error fixes 2014-01-12 22:07:37 -08:00
Config.h remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00
Controller.cpp merge of windows-build 2014-01-16 09:00:13 -08:00
Controller.h fix missing link to starfield implementation files 2013-10-18 09:01:44 -07:00
Generator.cpp Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
Generator.h Starfield modification to randomly generate stars 2013-10-17 23:24:03 -07:00