Stephen Birarda
33379824c8
clear place name if switching to a domain ID string
2016-05-20 11:25:26 -07:00
Stephen Birarda
5ab876114f
send hostname to DS with every DS packet to handle changes
2016-05-20 11:24:54 -07:00
Stephen Birarda
962066c7d1
send user hostname breakdown with heartbeat
2016-05-20 11:24:54 -07:00
Stephen Birarda
7d2d60f200
split assigned and un-assigned nodes
2016-05-20 11:24:54 -07:00
Stephen Birarda
5884e1eadd
rename metaverse heartbeat methods
2016-05-20 11:24:54 -07:00
Stephen Birarda
3b2a9b7b98
fix set of place name on DomainServerNodeData
2016-05-20 11:24:54 -07:00
Stephen Birarda
7110fe98eb
associate incoming place name with DomainServerNodeData
2016-05-20 11:24:54 -07:00
Stephen Birarda
51c16739f2
provide a getter for the place name in AddressManager
2016-05-20 11:24:54 -07:00
Atlante45
0353e562e4
entityProperties.html handles non object userData
2016-05-20 10:18:32 -07:00
Seth Alves
1ef0f8055b
fix grammar in comment
2016-05-20 10:12:59 -07:00
Seth Alves
35065ab05e
remove unused setter
2016-05-20 10:12:38 -07:00
Seth Alves
aa58cad93e
code review
2016-05-20 09:54:54 -07:00
Andrew Meadows
83b8ef8131
clean up stream formatting of vec3 and friends
2016-05-20 09:41:26 -07:00
Andrew Meadows
f3fc00bc3a
add comment for why MAX_HULL_POINTS is 42
2016-05-20 09:41:26 -07:00
Andrew Meadows
5a826d696a
cleanup after code review
2016-05-20 09:41:26 -07:00
Andrew Meadows
9fae1a7edd
tweak log format
2016-05-20 09:41:26 -07:00
Andrew Meadows
7866fcf78c
trim high-point convex hulls
2016-05-20 09:41:26 -07:00
Brad Hefta-Gaub
95f7ea5609
Merge pull request #7922 from samcake/red
...
improve performance of Light volume pass
2016-05-20 09:33:55 -07:00
Zach Pomerantz
4c8ff557db
Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash
2016-05-20 09:31:30 -07:00
Brad Hefta-Gaub
8760cd0807
Merge pull request #7929 from zzmp/fix/script-downloaded-shutdown
...
fix crash on shutdown from scriptDownloaded callback
2016-05-20 09:31:04 -07:00
Brad Hefta-Gaub
25e7b9935e
Merge pull request #7932 from zzmp/fix/shadows
...
fix shadow box that appears when flying
2016-05-20 09:30:29 -07:00
Brad Hefta-Gaub
f1278894c7
Merge pull request #7941 from zzmp/fix/vsync-halving
...
fix vsync halving fps
2016-05-20 09:30:13 -07:00
Zach Pomerantz
fff260c2b9
Guard against zero-sized gl buffer copy
2016-05-20 09:27:50 -07:00
howard-stearns
1801e270af
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 09:26:25 -07:00
Zach Pomerantz
2026226fe2
Handle vsync without halving fps
2016-05-20 09:04:39 -07:00
Brad Hefta-Gaub
1cce891f7c
Merge pull request #7947 from ZappoMan/zzmp-fix/avatar-inputs-pos
...
fix AvatarInputs spawning on bottom-left
2016-05-20 08:59:54 -07:00
Howard Stearns
3088a84035
Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing.
...
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 08:04:38 -07:00
Brad Hefta-Gaub
472c735d60
Merge branch 'master' of https://github.com/highfidelity/hifi into zzmp-fix/avatar-inputs-pos
2016-05-20 07:44:29 -07:00
Brad Hefta-Gaub
354661cc44
Merge branch 'fix/avatar-inputs-pos' of https://github.com/zzmp/hifi into zzmp-fix/avatar-inputs-pos
2016-05-20 07:44:07 -07:00
Brad Hefta-Gaub
313708ab5f
Merge pull request #7946 from Atlante45/fix/osx-warnings
...
Fix OSX warnings
2016-05-20 07:31:35 -07:00
David Rowe
17b3101ca5
Merge branch 'master' into 20917
2016-05-20 18:50:01 +12:00
David Rowe
b2bbf72be2
Replace drive drop-down plus text field with a paths drop-down
2016-05-20 18:48:51 +12:00
Atlante45
8be6bc6460
Add missing overrides
2016-05-19 22:00:22 -07:00
Anthony J. Thibault
c73943ee19
macosx warning fixes
2016-05-19 20:32:08 -07:00
Anthony J. Thibault
b95ba8141c
AvatarData packet overhaul, uses a structure instead of raw memcpy
2016-05-19 20:26:00 -07:00
Stephen Birarda
d3304ee65c
make some overriding methods as override
2016-05-19 18:01:13 -07:00
Stephen Birarda
e8d7f9614a
refresh API info during re-connect - case 570
2016-05-19 17:59:42 -07:00
Geenz
e2f5d22c98
Merge remote-tracking branch 'highfidelity/master' into 20901
2016-05-19 20:57:31 -04:00
Brad Hefta-Gaub
a1ec6c2961
Merge pull request #7938 from sethalves/set-age-of-imported-to-zero
...
fix age of imported entities
2016-05-19 17:53:31 -07:00
Brad Hefta-Gaub
d521cd82a0
Merge pull request #7908 from Atlante45/fix/settings
...
fix settings getting reset
2016-05-19 17:53:15 -07:00
Geenz
75532cda08
Document evalLightAttenuation's parameters.
2016-05-19 20:52:28 -04:00
Brad Hefta-Gaub
8ff7af28be
Merge pull request #7925 from sethalves/overlay-or-grab-not-both
...
fix mouse-grab moving both an overlay and an entity at the same time
2016-05-19 17:38:32 -07:00
Brad Hefta-Gaub
f85d5d3ca8
Merge pull request #7935 from ZappoMan/fixLogSpam
...
reduce log spam
2016-05-19 17:38:16 -07:00
Geenz
a54e8206fa
Switch back to using the light's radius + spacing
2016-05-19 20:10:49 -04:00
Geenz
6ecbdc6b9a
Modify evalLightAttenuation to "fade" edges of lights.
...
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.
This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
2016-05-19 20:03:05 -04:00
Anthony J. Thibault
13a057513a
Removed jointIndices transmission experiment
2016-05-19 16:46:17 -07:00
Seth Alves
1de9598243
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 16:37:40 -07:00
David Rowe
11aeaba114
Capitalize drive letter of chosen file
2016-05-20 11:32:14 +12:00
Seth Alves
3f5ed4bef8
set isStopping on other calls to stop
2016-05-19 16:15:33 -07:00
Seth Alves
9ad488ba7b
fix method name to match coding standard
2016-05-19 16:08:44 -07:00