Brad Davis
39dcd1f9bd
Eliminate file IO contentions for the settings
2016-06-04 17:55:30 -07:00
Brad Hefta-Gaub
c85923c69b
Merge pull request #7956 from jherico/web_entity_crash
...
fix crash on click on non-visible web-entity
2016-06-03 10:29:55 -07:00
Brad Hefta-Gaub
2e4480ee15
Merge pull request #7979 from jherico/steam_vr_exit_fix
...
Fix crash on shutdown of SteamVR
2016-06-03 10:28:53 -07:00
Atlante45
e2fa734024
Set collision threashold to walking speed
2016-06-02 19:15:55 -07:00
Atlante45
4e8b61dea0
Limit collision injectors count to 3
2016-06-02 19:12:37 -07:00
Atlante45
854bf82631
Raise and stretch collision sounds threshold
2016-06-02 17:37:36 -07:00
Brad Davis
bf734395e5
More invisible web entity fixes
2016-06-02 16:37:45 -07:00
Brad Davis
ac5912df01
Fix crash on shutdown of SteamVR
2016-05-27 13:40:47 -07:00
Howard Stearns
5b6660e7ea
Default preference to false.
2016-05-27 10:35:46 -07:00
Howard Stearns
e4d36cc2c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-27 10:32:01 -07:00
Anthony J. Thibault
b4d14f06d8
Bugfix for avatar LOD
...
If an avatar was LOD'ed out, it would never become visible again, because the bounds of the skeleton model were never again.
This ensures that the model bound is updated, even when the avatar is LOD'ed away.
2016-05-26 14:35:17 -07:00
howard-stearns
9ff1a695f0
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-26 13:52:23 -07:00
howard-stearns
991da9e248
fix cut-paste error in settings.
2016-05-26 09:51:55 -07:00
Brad Hefta-Gaub
78b6a6c661
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899
Merge pull request #7971 from birarda/session-id-with-place-request
...
optionally include the metaverse session ID as HTTP header when sending usage data
2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09
Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
...
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
howard-stearns
dc7d6d470d
Don't reset head when we come back.
2016-05-25 12:21:50 -07:00
Stephen Birarda
66bdbf910d
optionally include the metaverse session ID as an http header
2016-05-25 11:55:04 -07:00
howard-stearns
2accccef9e
Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving
2016-05-25 11:32:01 -07:00
howard-stearns
8198a1b4d1
Add preference to control behavior.
2016-05-25 11:30:45 -07:00
howard-stearns
5d806cba7f
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-25 10:47:31 -07:00
Brad Hefta-Gaub
fb9f6185db
CR feedback
2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub
183f38e4f0
pop up warning if domain over capacity
2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
2eef07e414
cleanup and dead code removal
2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280
check point with protocol refusal working
2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624
first cut at support for verifying all protocol version compatibility
2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub
f16a3ce6bb
Merge pull request #7962 from zzmp/fix/throttle
...
fix throttling when Interface is not in focus
2016-05-24 08:25:38 -07:00
Zach Pomerantz
7dabce9cff
Check throttle before idling/painting
2016-05-23 19:04:35 -07:00
Anthony J. Thibault
edfce0d5ba
MyAvatar: reset fix, for both oculus and vive
2016-05-23 16:34:19 -07:00
Anthony J. Thibault
a1c32f8c44
Merge branch 'master' into tony/improved-avatar-mixer-precision
2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub
ac49feda22
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
...
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
Seth Alves
f91a2403be
merge from upstream
2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df
Merge pull request #7800 from sethalves/no-fly-zones
...
No fly zones
2016-05-20 16:59:55 -07:00
howard-stearns
fa78eea434
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 16:50:54 -07:00
howard-stearns
9a428947e4
Simplify code.
2016-05-20 16:50:17 -07:00
howard-stearns
6568c0563d
Delay on entry/exit.
2016-05-20 16:43:55 -07:00
Seth Alves
d95d3ff3ac
clean up debugging prints
2016-05-20 14:56:47 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-20 14:38:53 -07:00
howard-stearns
dcc8764fa7
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 13:41:41 -07:00
Brad Hefta-Gaub
770fab956f
remove dead code
2016-05-20 12:23:06 -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
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
Seth Alves
1de9598243
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 16:37:40 -07:00
Anthony J. Thibault
7f131e2c4f
Reset avatar as well as displayPlugin when "driving"
2016-05-19 15:00:08 -07:00
Zach Pomerantz
9a4b30a50b
Fix AvatarInputs phantom movement
2016-05-19 13:19:15 -07:00
Brad Hefta-Gaub
cef4a49c35
Merge pull request #7867 from huffman/fix/query-octree-crash
...
Fix crash in JurisdictionMap
2016-05-19 11:53:54 -07:00
