Seth Alves
673182c091
formatting
2016-01-22 11:22:02 -08:00
Seth Alves
a9cf836cb0
added isVec3NaN and isQuatNaN functions
2016-01-22 11:13:55 -08:00
Seth Alves
6294939095
missed one
2016-01-22 10:37:11 -08:00
Seth Alves
6b15beb88a
use isNaN rather than a self-comparison
2016-01-22 10:36:21 -08:00
Seth Alves
451464cb47
check values in location updates for NaN before using them
2016-01-22 09:41:46 -08:00
Brad Hefta-Gaub
7bfe2730e8
Merge pull request #6849 from jherico/atmosphere
...
Remove old atmosphere rendering
2016-01-21 17:58:59 -08:00
Brad Hefta-Gaub
094e41c993
Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes
...
Fix wifi ping spikes
2016-01-21 17:07:38 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Atlante45
db18d188b8
Fix wifi ping spikes
...
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
2016-01-21 15:05:32 -08:00
Leonardo Murillo
7e19110dd5
Merge pull request #6887 from birarda/migrate-ds-old-dev
...
migrate domain-server config from single org name
2016-01-21 16:24:02 -06:00
Stephen Birarda
aa2e55a5a0
handle weird nested path on windows
2016-01-21 14:03:45 -08:00
Stephen Birarda
cddb8cd3f0
migrate domain-server config from single org name
2016-01-21 13:57:24 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Andrew Meadows
58a7528b68
Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js
...
Access avatar parent information from js
2016-01-21 09:19:40 -08:00
samcake
0da4df93b8
Merge pull request #6860 from zzmp/refactor/cull-functor
...
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
2016-01-20 14:25:42 -08:00
Andrew Meadows
19d24293e1
Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent
...
don't persist entites with invalid parentIDs
2016-01-20 10:38:26 -08:00
Stephen Birarda
8bc063e758
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-19 16:21:19 -08:00
Seth Alves
09dd3e2a56
merge from upstream, respond to code review
2016-01-19 14:38:22 -08:00
Stephen Birarda
74b2a44050
merge the master and user configs after a settings change
2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e
complete handling of immediate temp name grab
2016-01-19 13:04:05 -08:00
Stephen Birarda
858adf383e
update comment for config migration
2016-01-19 11:38:31 -08:00
Stephen Birarda
483e0f419b
use mkpath to create new data directory
2016-01-19 11:37:49 -08:00
Stephen Birarda
74806d9d2b
migrate old DS config file to new path
2016-01-19 11:28:29 -08:00
Zach Pomerantz
568ae2e7bc
Move ShoudRenderFunctor to render::CullFunctor
2016-01-19 11:24:11 -08:00
Ryan Huffman
de36f3eeb2
Update ServerPathUtils::getDataDirectory to use custom path lookup
2016-01-19 10:54:38 -08:00
Brad Hefta-Gaub
e15c7f089e
Merge pull request #6850 from sethalves/various-fixes
...
Various fixes
2016-01-19 10:15:46 -08:00
Seth Alves
e365d93ed9
don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file
2016-01-18 16:50:26 -08:00
Seth Alves
3b3720781f
fix a place where parent's scale wasn't properly squashed
2016-01-18 11:15:53 -08:00
Ryan Huffman
0f2b9744d1
Merge branch 'console' of github.com:birarda/hifi into console-logging
2016-01-15 10:46:22 -08:00
Ryan Huffman
a43b9ba2c3
Add ServerPathUtils
2016-01-14 12:55:32 -08:00
Zach Pomerantz
2938829167
Add shadow items to stats
2016-01-13 17:49:37 -08:00
Andrew Meadows
c52c543ab8
use strings for JS collisionGroup API
2016-01-12 15:11:27 -08:00
Andrew Meadows
6c49d81475
collision mask bit reinterpretation
...
also cache sessionID in static methods inside PhysicsEngine
2016-01-12 15:08:52 -08:00
Andrew Meadows
502921e877
more consistency for collision group values
2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8
add CollisionMask entity property
2016-01-12 15:08:52 -08:00
Zach Pomerantz
801dde7950
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
2016-01-11 16:38:04 -08:00
Anthony J. Thibault
e4e4cb0110
Bug fix for Transform.postMult() with non-uniform scale.
...
Previously it would not flag the matrix as non-uniform, this would
cause some operations (such as inverse) to be incorrect.
2016-01-11 12:03:44 -08:00
Zach Pomerantz
c8d3342aca
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
2016-01-08 17:04:02 -08:00
Philip Rosedale
d5c8689843
Merge pull request #6793 from sethalves/fix-get-query-aabox
...
fix queryAABox bug
2016-01-08 09:49:27 -08:00
Seth Alves
31bed934fe
fix bug caused by accidental reuse of variable -- queryAABox was often of size 1 rather than the correct dimensions
2016-01-07 16:27:14 -08:00
Andrew Meadows
6a642bdcf8
fix misusage of smart-pointers
2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Zach Pomerantz
59a354ea8c
Change payload interface to return ShapeKey, not MaterialKey
2016-01-05 17:20:08 -08:00
Seth Alves
b59934573a
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-05 13:50:12 -08:00
Brad Hefta-Gaub
c2f2f950fb
Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe
...
Make Avatar palm position/rotation accessors thread safe
2016-01-05 13:07:47 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Anthony J. Thibault
a21b604746
Simplified implementation of ThreadSafeValueCache
2016-01-05 11:08:08 -08:00
Anthony J. Thibault
9ea6079c64
Merge branch 'master' into tony/get-palm-thread-safe
2016-01-05 10:16:52 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
