Commit graph

42368 commits

Author SHA1 Message Date
Seth Alves
f114888c1c Merge pull request #7665 from birarda/ice-server-redundancy
allow domain-server to cycle through ice-servers when failing
2016-04-14 14:36:29 -07:00
Stephen Birarda
9bca2309e0 remove the monitoring endpoint debug 2016-04-14 13:58:02 -07:00
Stephen Birarda
7385894b66 keep a set of pending public key requests 2016-04-14 13:57:09 -07:00
Stephen Birarda
757c7dcf29 removing HTTP health check from ice-server 2016-04-14 13:40:13 -07:00
Stephen Birarda
bc0b3b38b3 remove narrowing conversion for ICE_SERVER_DEFAULT_PORT 2016-04-14 12:25:47 -07:00
Brad Hefta-Gaub
ea4da05cba Merge pull request #7643 from AndrewMeadows/faster-bullet
faster Bullet kinematics
2016-04-14 12:16:54 -07:00
Brad Hefta-Gaub
c9b0531f55 Merge pull request #7662 from zzmp/fix/model-anim-cache
Use AnimationCache for models
2016-04-14 12:16:32 -07:00
Brad Hefta-Gaub
1fc540c775 Merge pull request #7639 from huffman/feat/crash-handling
Improve crash handling
2016-04-14 11:40:56 -07:00
Andrew Meadows
4d7efbc43f faster isNaN() and friends 2016-04-14 11:18:10 -07:00
Andrew Meadows
bb59860cfe update Aabb's of static objects when they move 2016-04-14 11:18:10 -07:00
Andrew Meadows
dcf28937cf cleanup cached Physics::sessionUUID 2016-04-14 11:18:10 -07:00
Stephen Birarda
3f0ffc0aff update ice-server address with API, add failed and clear denials 2016-04-14 10:33:17 -07:00
Zach Pomerantz
e80898f095 Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache 2016-04-14 10:12:16 -07:00
Ryan Huffman
e76ed6f73a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-handling 2016-04-14 09:47:03 -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
Stephen Birarda
55002b8d5e add ice server address to hearbeat if full networking is on 2016-04-14 09:27:43 -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
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -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