ZappoMan
|
2c02178802
|
Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers
Conflicts:
assignment-client/src/AssignmentClient.cpp
assignment-client/src/AssignmentClient.h
libraries/shared/src/NodeList.cpp
|
2014-04-18 14:28:54 -07:00 |
|
ZappoMan
|
7a993939bf
|
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
|
2014-04-14 09:43:29 -07:00 |
|
ZappoMan
|
a37921c1d5
|
move isNaN() to shared utils
|
2014-04-13 19:09:07 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
ZappoMan
|
4bf7faba7b
|
workaround for assert failures when bad view frustum input
|
2014-03-31 17:55:40 -07:00 |
|
Andrzej Kapolka
|
210af25396
|
When rendering avatar shadows, check bounds against shadow frustum. Closes
|
2014-03-24 14:52:02 -07:00 |
|
ZappoMan
|
f3bd8925d9
|
optimized OctreeElement::furthestDistanceToCamera()
|
2014-03-19 12:48:11 -07:00 |
|
ZappoMan
|
252bc3b3ee
|
optimized ViewFrustum::getFurthestPointFromCamera()
|
2014-03-19 11:51:47 -07:00 |
|
ZappoMan
|
0d4066a347
|
added note
|
2014-03-14 10:07:26 -07:00 |
|
Andrew Meadows
|
aa8c2fc8cb
|
use radians instead of degrees (almost) everywhere
|
2014-03-11 17:26:58 -07:00 |
|
Stephen Birarda
|
b78e723253
|
fix a NaN in ViewFrustum and BuckyBalls
|
2014-03-04 15:53:05 -08:00 |
|
ZappoMan
|
c5197b390e
|
removed a bunch of cruft from VoxelSystem
|
2014-03-02 12:13:00 -08:00 |
|
ZappoMan
|
1e404404c3
|
next pass at seeing voxels
|
2014-02-26 13:35:59 -08:00 |
|
Brad Hefta-Gaub
|
170dbe6e85
|
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
|
2014-01-15 10:20:21 -08:00 |
|
Stephen Birarda
|
987c639e36
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -08:00 |
|
Brad Hefta-Gaub
|
55babbf7b6
|
windows type mismatch warning fixes
|
2014-01-13 00:30:23 -08:00 |
|
Brad Hefta-Gaub
|
e55e680e66
|
tweaks to some variable names since windows has a problem with them
|
2014-01-10 18:28:18 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -08:00 |
|