Commit graph

42400 commits

Author SHA1 Message Date
Howard Stearns
e4f8a67e60 Merge pull request #7649 from hyperlogic/tony/simplify-away-mode
away.js: fix for permanent disabling avatar IK
2016-04-15 13:35:14 -07:00
Brad Hefta-Gaub
6a12425a2a Merge pull request #7669 from sethalves/not-away-if-walking
clear away-ness if the avatar walks a certain distance
2016-04-15 10:25:40 -07:00
Brad Hefta-Gaub
50856b715e Merge pull request #7674 from zzmp/leak/font
Change Font to use shared_ptr instead of freeing on _exit
2016-04-15 10:25:09 -07:00
Brad Hefta-Gaub
a88cd4b786 Merge pull request #7671 from AndrewMeadows/link-pthread
add pthread link dependency to interface for UNIX
2016-04-15 10:24:31 -07:00
Brad Hefta-Gaub
3e03f85f07 Merge pull request #7650 from Atlante45/fix/clear-atp-cache
Clear atp mapping cache between domain
2016-04-14 18:44:20 -07:00
Brad Hefta-Gaub
f4604e300b Merge pull request #7666 from birarda/interface-name-osx
rename .app on OS X to Interface
2016-04-14 18:44:07 -07:00
Brad Hefta-Gaub
21f30f1a10 Merge pull request #7672 from zzmp/fix/name-caches
Name exposed cache objects
2016-04-14 18:02:36 -07:00
Atlante45
b3b2f98f6c Merge branch 'master' of https://github.com/highfidelity/hifi into fix/clear-atp-cache 2016-04-14 17:59:36 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource
Fix raw pointers in shared resource cache items
2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Zach Pomerantz
2e4e1dd590 Fix leaking Font 2016-04-14 17:00:23 -07:00
Zach Pomerantz
bb02af793c Name exposed cache objects 2016-04-14 17:00:18 -07:00
Andrew Meadows
ae20bb5fa7 add pthread link dependency to interfac for UNIX 2016-04-14 16:35:51 -07:00
Seth Alves
31270ebe6e clear away-ness if the avatar walks a certain distance 2016-04-14 16:03:22 -07:00
Brad Hefta-Gaub
91334d6a39 Merge pull request #7664 from ZappoMan/reduceJointProperties
only export joint values if they've been explicitly set by scripts
2016-04-14 15:30:04 -07:00
Seth Alves
50c8b5858e Merge pull request #7668 from birarda/ice-server-redundancy
reduce ice.highfidelity.com DNS queries when not failing
2016-04-14 15:05:58 -07:00
Stephen Birarda
84df6cfed0 only re-request ice addresses during failure 2016-04-14 14:46:08 -07:00
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
7e02b30227 rename .app on OS X to Interface 2016-04-14 13:01:47 -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
Brad Hefta-Gaub
b48503a82d only export joint values if they've been explicitly set by scripts 2016-04-13 19:52:50 -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