Commit graph

27791 commits

Author SHA1 Message Date
Niraj Venkat
ee998d0c74 Icon size is a pixel if the inStatus is -1 2015-07-01 17:30:50 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Brad Hefta-Gaub
bfd72a89af Merge pull request #5250 from jherico/animation_perf_tester
Animation performance test script
2015-07-01 17:24:59 -07:00
Brad Davis
566842389b Animation performance test script 2015-07-01 17:04:48 -07:00
Brad Davis
88a733181e Fixing comment to reflect code 2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01 CR comments and fixing the microsecond display 2015-07-01 16:53:12 -07:00
Niraj Venkat
219bcd19ed Status bar update 2015-07-01 16:40:42 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29 Merge pull request #5247 from ericrius1/handRender
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09 Instrument the inter-idle time and tweaking the timeout setting 2015-07-01 16:14:17 -07:00
Brad Hefta-Gaub
b4f04af66f Merge pull request #5242 from jherico/packet_processing
Eliminate per-packet locking for processing
2015-07-01 16:11:27 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00
ericrius1
a24df5c02f added postLighting check back for rendering avatar Hands 2015-07-01 15:28:48 -07:00
ericrius1
f49f368ec3 removed dead commented out code 2015-07-01 15:16:34 -07:00
ericrius1
50a7332a5a removed accidental lineRotations.js file commit 2015-07-01 15:14:53 -07:00
ericrius1
8129d0eb1f hydra lasers are now rendering again 2015-07-01 15:12:37 -07:00
Brad Davis
5001c9af4b Merge pull request #5245 from ZappoMan/entityServerEditStats
add inbound edit packet queue depth to entity server
2015-07-01 15:10:57 -07:00
ericrius1
8b00864175 hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Brad Davis
1d16d80c0c Comments from CR 2015-07-01 14:55:24 -07:00
Brad Davis
1e1f199fdb Undoing unwisdom 2015-07-01 14:54:26 -07:00
Brad Davis
4c200d75bc Tweaking packet processing locking 2015-07-01 14:53:08 -07:00
samcake
b23f68107c Adding the gpu_shader4 for linux and fixing function name for mac 2015-07-01 14:52:23 -07:00
ZappoMan
ce613d59fd add inbound edit packet queue depth to entity server 2015-07-01 14:46:37 -07:00
Sam Gateau
93303a02ec Merge branch 'stats' of https://github.com/venkatn93/hifi into yellow 2015-07-01 14:22:40 -07:00
Sam Gateau
dfa6b03a6b Making the first statusGetter noitify 2015-07-01 14:20:35 -07:00
Niraj Venkat
32042884c7 Merging sam/yellow 2015-07-01 14:07:36 -07:00
Clément Brisset
93d51717ce Merge pull request #5201 from ctrlaltdavid/20590
QA for #20590 - Delete Interface.ini.lock file at start-up if it exists
2015-07-01 13:54:02 -07:00
Clément Brisset
eb3bddfe4c Merge pull request #5209 from ctrlaltdavid/20589
QA for #20589 - Vertical field of view preference change should be applied immediately
2015-07-01 13:53:25 -07:00
Clément Brisset
ede2eec283 Merge pull request #5240 from ctrlaltdavid/fix-textoverlay-size
Fix TextOverlay font size setting
2015-07-01 13:52:51 -07:00
David Rowe
6a48b56e0f In mirror mode look directly at the camera in both normal and HMD view 2015-07-01 13:32:50 -07:00
David Rowe
efbccc3a4e Fix storing Oculus eye positions 2015-07-01 13:32:50 -07:00
David Rowe
e85eb246d2 Delete old TextRenderer after new one is in place 2015-07-01 13:19:46 -07:00
Brad Hefta-Gaub
8ec3f7ea46 Merge pull request #5228 from DaveDubUK/walk-1.25
walk.js disable audio by default
2015-07-01 13:19:45 -07:00
Seth Alves
6e3cab9f4d fix logic problem with previous fix 2015-07-01 12:37:15 -07:00
Seth Alves
593ed9f998 work around problem where EntityItem::setActionData is called before the entity tree is set up 2015-07-01 12:26:51 -07:00
Seth Alves
5ab2c8d724 rename variable to be more descriptive 2015-07-01 12:24:50 -07:00
Philip Rosedale
8ed4000560 Merge pull request #5239 from SamGondelman/zooming
DO NOT MERGE - quadratic zooming response
2015-07-01 12:22:23 -07:00
Philip Rosedale
f10b8329e1 Merge pull request #5243 from murillodigital/master
Enhancing PR installer titles
2015-07-01 11:29:17 -07:00
Clément Brisset
52d1ae18cc Merge pull request #5233 from SamGondelman/cameraMode
correct menu shortcut for mouselook
2015-07-01 11:15:31 -07:00
Jenkins Slave Access
981ff2d5fa Enhancing PR installer titles 2015-07-01 14:13:37 -04:00
Seth Alves
e8a6acd65b responses to code review 2015-07-01 10:42:04 -07:00
Brad Hefta-Gaub
e25483cdde Merge pull request #5241 from jherico/stats_fix
Fix inverted in/out mbps display on stats
2015-07-01 10:30:04 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Brad Davis
cd63b8a49d Fix inverted in/out mbps display on stats 2015-07-01 10:10:53 -07:00
Brad Davis
d4d6f8f5d5 Eliminate per-packet locking for processing 2015-07-01 10:06:04 -07:00
Sam Gateau
63e3d0e741 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 07:48:37 -07:00
Sam Gateau
2f04a9d3da refining the shader pipeline and trying to pass a Status Getter from the model and fails 2015-07-01 07:47:46 -07:00
Seth Alves
a356cbf620 remove commented code 2015-07-01 07:33:46 -07:00
Seth Alves
b7e9056c04 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership 2015-07-01 07:33:29 -07:00
Seth Alves
6e7973f5b9 coding-standard / code-review 2015-06-30 19:28:22 -07:00