Andrew Meadows
dcf28937cf
cleanup cached Physics::sessionUUID
2016-04-14 11:18:10 -07:00
Brad Hefta-Gaub
7b5075cce5
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
...
add a heuristic for deciding when it's safe to enable bullet
2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
285ebe8ec5
Merge pull request #7655 from sethalves/dont-spam-about-expired-actions
...
don't flood log with messages about expired actions
2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub
623bfa3c35
Merge pull request #7653 from hyperlogic/tony/avatar-meta-item-bound-fix
...
Fix for occasional invisible avatars
2016-04-14 09:32:46 -07:00
Brad Hefta-Gaub
37dcfdad8a
Merge pull request #7652 from huffman/feat/crash-menu
...
Move crash menu items to submenu and add new crash types
2016-04-14 09:32:36 -07:00
Brad Hefta-Gaub
dd4589269d
Merge pull request #7661 from zzmp/fix/track-resources
...
Track resources as they fall out of cache
2016-04-14 09:29:58 -07:00
Seth Alves
ba0549dddd
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-14 09:18:58 -07:00
Seth Alves
63468f8faa
Merge pull request #7660 from zzmp/feat/debug-trackers
...
Make shared Debug header
2016-04-13 16:56:11 -07:00
Chris Collins
47522e1774
Merge pull request #7659 from ZappoMan/newLODSettings
...
improve reset settings
2016-04-13 16:49:22 -07:00
Brad Hefta-Gaub
eef3445ede
Merge pull request #7361 from imgntn/homereset
...
Home reset and content
2016-04-13 16:27:31 -07:00
Ryan Huffman
b0084926c0
Merge pull request #7644 from birarda/sandbox-ds-settings
...
replace Sandbox default content set with Home
2016-04-13 16:08:00 -07:00
Zach Pomerantz
774eb1c45a
Make shared Debug header
2016-04-13 15:48:26 -07:00
Zach Pomerantz
e20acb1d42
Track resources as they fall out of cache
2016-04-13 15:44:14 -07:00
Ryan Huffman
47c2a1722b
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu
2016-04-13 14:40:46 -07:00
Brad Hefta-Gaub
07f734f4dd
Merge pull request #7640 from jherico/vive_timewarp
...
Vive timewarp
2016-04-13 14:39:59 -07:00
James B. Pollack
4c9c5a10f6
fanning
2016-04-13 14:33:23 -07:00
Stephen Birarda
d7450b8178
release pending ATP script request for active AssetServer
2016-04-13 14:25:23 -07:00
Stephen Birarda
c7d184ad6b
update comment for completed untar
2016-04-13 14:02:14 -07:00
Stephen Birarda
8850ebd158
update electron/electron-prebuilt, remove gunzip option
2016-04-13 14:02:14 -07:00
Stephen Birarda
149bf0be92
allow zlib as much memory as possible for faster speed
2016-04-13 14:02:14 -07:00
Stephen Birarda
db4f1a8acb
split gunzip and untar errors
2016-04-13 14:02:14 -07:00
Stephen Birarda
7dbdc9ca0a
use tar-fs and zlib for content extraction
2016-04-13 14:02:14 -07:00
Ryan Huffman
bc247ec058
Remove unused Application::crashApplication()
2016-04-13 14:01:41 -07:00
Howard Stearns
f24c2c7714
Merge pull request #7657 from ZappoMan/avatarLicenseSupport
...
add support for avatar licenses in FST files
2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub
0af47fd3d5
Merge pull request #7617 from jherico/vr_menu
...
VR menu fixes
2016-04-13 13:53:36 -07:00
Ryan Huffman
9ee81a73c7
Fix clang warning in CrashHelpers::newFault
2016-04-13 13:41:45 -07:00
Brad Hefta-Gaub
9c437c0824
CR feedback
2016-04-13 13:36:28 -07:00
Brad Hefta-Gaub
67af3917bc
improve reset settings
2016-04-13 13:18:23 -07:00
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
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
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
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
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
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
