Commit graph

41973 commits

Author SHA1 Message Date
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
Stephen Birarda
3f0ffc0aff update ice-server address with API, add failed and clear denials 2016-04-14 10:33:17 -07:00
Stephen Birarda
55002b8d5e add ice server address to hearbeat if full networking is on 2016-04-14 09:27:43 -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
Stephen Birarda
f975f480b4 use the random device for random number generation 2016-04-12 17:46:47 -07:00
Stephen Birarda
b5fe6120aa base randomization of ice-server from ice.highfidelity.com 2016-04-12 17:41:47 -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
Brad Davis
9f2eabe6ce Fixing rate counter 2016-04-12 14:11:56 -07:00
Seth Alves
b952147fca Merge pull request #7635 from birarda/master
fix domain-server settings change without password change
2016-04-12 12:49:55 -07:00
Seth Alves
2b63c2a8ba Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix
Rename CPUID to CPUIdent to fix XCode 7.2 builds
2016-04-12 12:48:15 -07:00
Seth Alves
0980ab5c2d Merge pull request #7634 from birarda/asset-server-clean
cleanup unmapped asset server files
2016-04-12 11:59:41 -07:00
Seth Alves
460fdc0761 Merge pull request #7536 from samcake/orange
First pass at using compressed format when uploading textures
2016-04-12 11:59:10 -07:00
Anthony J. Thibault
32ccc1d68e Windows build fixes 2016-04-12 10:53:04 -07:00
Chris Collins
0faab41057 Merge pull request #7624 from birarda/new-home-set
allow ATP scripts to be used by scripted Agent
2016-04-12 09:42:14 -07:00
Stephen Birarda
455d2d5048 allow for an empty password with a username 2016-04-12 09:37:26 -07:00
Brad Hefta-Gaub
83494c4a96 Merge pull request #7594 from huffman/feat/include-rolled-logs-bugsplat
Add rolled log files to BugSplat
2016-04-12 08:33:17 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd
Disable gradient QML items on AMD
2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
ad8d7b2ffa Merge pull request #7620 from sethalves/make-fixupMissingParents-more-thread-safe
guard access to _missingParent vector with a lock
2016-04-12 08:32:38 -07:00
Brad Hefta-Gaub
a1fe6aee6d Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements
Improve comfort of third-person HMD camera.
2016-04-12 08:32:23 -07:00
Brad Hefta-Gaub
9a687bea44 Merge pull request #7628 from jherico/save_scripts
Save the set of running scripts when they change, as well as at shutdown
2016-04-12 08:32:10 -07:00
Brad Hefta-Gaub
c5840f217a Merge pull request #7630 from jherico/fps_fix
Fix FPS counter
2016-04-12 08:31:58 -07:00
Stephen Birarda
76af3efe73 fix for active socket check on ATP script download 2016-04-11 17:59:27 -07:00
Stephen Birarda
190d11e0bf rename the set of hashes to check for deletion 2016-04-11 17:16:52 -07:00
Stephen Birarda
026f58c866 don't perform asset cleanup if mapping file load fails 2016-04-11 17:14:31 -07:00
Zach Pomerantz
1df2fc7809 Disable qml gradient for AMD for ContentSection 2016-04-11 13:59:08 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70 Move gl info queries to GLHelpers 2016-04-11 13:28:18 -07:00
Stephen Birarda
aad98cc25d make sure password setting is set before checking length 2016-04-11 11:56:47 -07:00
Anthony J. Thibault
470aac3acf Rename CPUID to CPUIdent to fix XCode 7.2 builds 2016-04-11 11:54:17 -07:00
Zach Pomerantz
d719b3692e Consolidate qml alpha gradient workaround to desktop 2016-04-11 11:36:42 -07:00
Seth Alves
1d63f6d354 Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe 2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub
b758acb7d8 Merge pull request #7610 from zzmp/fix/standard-qt-gl
Codify qt qml version in one header
2016-04-11 09:45:21 -07:00
Brad Hefta-Gaub
47ff5c090d Merge pull request #7623 from ZappoMan/fixAnimationFrameExport
fix export of animation properties
2016-04-11 09:37:47 -07:00
Brad Hefta-Gaub
94f970dd89 Merge pull request #7622 from hyperlogic/tony/frozen-avatar-fix
Fix for frozen ghost avatars
2016-04-11 09:37:30 -07:00
Brad Hefta-Gaub
a204b9d923 Merge pull request #7627 from jherico/qml_key_interaction
Suppress key release events for presses that were absorbed by QML
2016-04-11 09:31:46 -07:00
Stephen Birarda
334dc3cb6c cleanup left file debug, add check for deleted mapping 2016-04-11 09:05:11 -07:00
Stephen Birarda
775898893b add deletion of unmapped files during delete op 2016-04-11 08:57:07 -07:00
Stephen Birarda
fae9b061a3 promote a debug to info 2016-04-11 08:42:52 -07:00
Stephen Birarda
4d0976f730 remove migration code for pre-mapping migrations 2016-04-11 08:41:42 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Brad Hefta-Gaub
cc418c615f Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack
treat children of avatars and children of entities differently until velocity handling is fixed
2016-04-10 14:55:03 -07:00
Andrew Meadows
013f575cc9 Merge pull request #7632 from sethalves/fix-physics-feedback-loop
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-10 10:40:09 -07:00
Seth Alves
43f735dd21 avoid loop where bullet moves an entity and then an entity tells bullet that it has moved. 2016-04-09 22:18:43 -07:00