Zach Pomerantz
dbd7dd104e
Merge pull request #7654 from ZappoMan/newLODSettings
...
new default LOD settings, and support for reset settings without crashing
2016-04-13 13:09:10 -07:00
Brad Hefta-Gaub
1c2c6804ac
Merge pull request #7656 from samcake/orange
...
Fixing the resize of gpu::framebuffer to avoid unecessary re validation every frame
2016-04-13 12:34:47 -07:00
Brad Hefta-Gaub
4b3b917af6
add support for avatar licenses in FST files
2016-04-13 12:26:09 -07:00
James B. Pollack
0767f4eef0
robot position
2016-04-13 11:50:45 -07:00
Ryan Huffman
e563de9ef8
Fix 'array is too large' warning
2016-04-13 11:28:54 -07:00
Ryan Huffman
6cbd31fa51
Cleanup unnecessary scoping in pureVirtualCall
2016-04-13 11:28:37 -07:00
samcake
7653fa2c37
Fixing the resize of framebuffer to avoid reassigning the render buffer every frame
2016-04-13 10:56:29 -07:00
Ryan Huffman
2d39551a35
Fix style in CrashReporter.cpp
2016-04-13 10:56:27 -07:00
Brad Davis
3421c10c1b
Fixing vive hand controllers
2016-04-13 10:35:39 -07:00
Ryan Huffman
fa49c213cc
Add threaded crashes
2016-04-13 10:24:56 -07:00
Ryan Huffman
7fbaa77c0b
Fix missing brace in namespace
2016-04-13 10:24:39 -07:00
samcake
f6dc7eb746
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-04-13 10:08:33 -07:00
Seth Alves
3288bff963
don't flood log with messages about expired actions. also, try to remove such actions
2016-04-13 09:47:07 -07:00
Ryan Huffman
91da4229ac
Fix unused variable warning in CrashHelpers.h
2016-04-13 09:42:20 -07:00
Brad Hefta-Gaub
93f8cfc80a
new default LOD settings, and support for reset settings without crashing
2016-04-13 09:26:01 -07:00
Seth Alves
d6673fb3c0
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-13 09:01:43 -07:00
Brad Hefta-Gaub
0f8842f582
Merge pull request #7637 from zzmp/fix/tex-transfer-free
...
Cleanly shutdown the texture transfer thread on quit
2016-04-12 19:28:51 -07:00
Seth Alves
298fe1e188
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-12 19:21:03 -07:00
Stephen Birarda
ab414f65eb
output success on first connection to new ice-server
2016-04-12 18:23:51 -07:00
Stephen Birarda
f69f59fa90
handle ice fail for no reply heartbeat in DS
2016-04-12 18:19:02 -07:00
Stephen Birarda
f1209dc82d
fix index randomization for single candidate ice-server
2016-04-12 18:04:32 -07:00
Stephen Birarda
6ef9fbfcc0
send an ACK packet from ice server for verified hearbeat
2016-04-12 18:01:20 -07:00
Stephen Birarda
8832a9d9ed
add ICEServerHeartbeatACK packet type
2016-04-12 17:59:07 -07:00
Brad Davis
1a02220886
Fixing wobble
2016-04-12 17:50:59 -07:00
Zach Pomerantz
bce33a7157
Merge pull request #7651 from imgntn/editmodelsurl
...
Remove model url placeholder text from edit.js import
2016-04-12 17:50:45 -07:00
Stephen Birarda
f975f480b4
use the random device for random number generation
2016-04-12 17:46:47 -07:00
Howard Stearns
e5a55ed9e5
Merge pull request #7616 from PhilipRosedale/golfclub
...
Simple golfclub that makes and jumps to balls
2016-04-12 17:45:34 -07:00
Stephen Birarda
b5fe6120aa
base randomization of ice-server from ice.highfidelity.com
2016-04-12 17:41:47 -07:00
Anthony J. Thibault
97f836d3bb
Avatar: fix for avatar meta item bound.
...
* In the case where a SkeletonModel was renderable, but had not actually
created the render items yet, don't use the the rendererableMeshBound
for the meta render item, because it hasn't been computed yet! Instead
wait until the render items have been added to the scene before using
the more accurate bound...
2016-04-12 17:32:49 -07:00
Brad Davis
9d29d6c0e9
Fixing OSX build
2016-04-12 16:44:17 -07:00
Brad Davis
73ec40dae6
Making a debug mechanism for force OpenVR
2016-04-12 16:44:16 -07:00
Brad Davis
3325c58ceb
Vive timewarp implementation
2016-04-12 16:44:15 -07:00
Ryan Huffman
0c1277ae7a
Add CrashHelpers.h and add to separate submenu
2016-04-12 16:44:11 -07:00
James B. Pollack
ab7f8f27fe
clear stuff from edit
2016-04-12 16:22:53 -07:00
samcake
49af41afca
Merging with master
2016-04-12 16:14:24 -07:00
Anthony J. Thibault
87cba810a7
remove away states from avatar-animation.json
...
away.js: prefetch the kneel animation, so it is available when we need it.
2016-04-12 15:37:31 -07:00
Atlante45
0f62d5c997
clear ATP assets on domain change
2016-04-12 15:30:53 -07:00
Atlante45
7c652aa3ca
Add lock on ResourceCache data structs
2016-04-12 15:30:39 -07:00
Anthony J. Thibault
8d7bf87d74
away.js: simplify kneel animation handling
...
Instead of manually setting anim vars to play the kneel animation
and enable/disable IK, use the MyAvatar.overrideAnimation() and
MyAvatar.restoreAnimtion() functions, which did not exist when
away.js was written. This should make it more robust and eliminate
the issue with IK being stuck in the disabled state.
2016-04-12 14:52:22 -07:00
Anthony J. Thibault
a1bbb63ec4
Rig: save and restore user animations across resets
2016-04-12 14:51:17 -07:00
Brad Hefta-Gaub
88ca5520be
Merge pull request #7647 from jherico/rate_counter
...
Fixing rate counter
2016-04-12 14:48:05 -07:00
Ryan Huffman
88150f9c82
Remove CrashHelpers
2016-04-12 14:45:05 -07:00
Brad Davis
9f2eabe6ce
Fixing rate counter
2016-04-12 14:11:56 -07:00
Seth Alves
688de6f100
quiet warning
2016-04-12 14:10:14 -07:00
Atlante45
364f935b89
Allow cleanup of the old request
2016-04-12 13:51:11 -07:00
Atlante45
c8aeecdabd
Don't fire onGeoMappLoading twice
2016-04-12 13:51:11 -07:00
Atlante45
05895f628a
Revert to using a Resource
2016-04-12 13:51:11 -07:00
Atlante45
5cc90ce8f0
Make sure resource req are cleaned up with there parents
2016-04-12 13:51:11 -07:00
Atlante45
e45939d18f
Make sure ResourceCacheSharedItems deals with strong refs
2016-04-12 13:51:11 -07:00
Atlante45
5eb4f63573
Use ResourceManager in anim loader
2016-04-12 13:51:11 -07:00
