Howard Stearns
|
d59b93e713
|
Merge pull request #10168 from davidkelly/dk/4036
username stays around now when tabbing to connections
|
2017-04-10 11:05:59 -07:00 |
|
David Kelly
|
cd55728490
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036
|
2017-04-10 10:09:27 -07:00 |
|
Seth Alves
|
5893b0b489
|
Merge pull request #10177 from sethalves/fix-send-to-script
revert commit that broke sendToScript
|
2017-04-10 10:03:50 -07:00 |
|
David Kelly
|
333f950512
|
Merge pull request #10172 from howard-stearns/fix-multi-line-session-display-name
fix multi-line sessionDisplayName
|
2017-04-10 09:13:50 -07:00 |
|
Seth Alves
|
36940b4dfe
|
revert commit that broke sendToScript
|
2017-04-10 09:11:23 -07:00 |
|
Howard Stearns
|
54888f85be
|
strip more
|
2017-04-10 08:41:50 -07:00 |
|
Anthony Thibault
|
746b7aadbd
|
Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped
Fix teleport when something equipped
|
2017-04-09 19:00:21 -07:00 |
|
Philip Rosedale
|
c74778116a
|
Merge pull request #10156 from Triplelexx/21256
21256 - Add packet loss % to stats
|
2017-04-09 18:00:01 -07:00 |
|
Triplelexx
|
7936637e9c
|
and tired..
|
2017-04-09 11:02:35 +01:00 |
|
Triplelexx
|
54eb7c10c6
|
distracted
|
2017-04-09 10:50:22 +01:00 |
|
Triplelexx
|
ec6885a2fb
|
change audioPacketLoss stat to display largest of upstream/downstream loss
|
2017-04-09 09:49:41 +01:00 |
|
Seth Alves
|
aa89903a9f
|
Merge pull request #10160 from vladest/tabletwebview-yahoo-fix
Yahoo, Reddit etc now works correctly
|
2017-04-08 20:25:18 -07:00 |
|
Howard Stearns
|
c32879d807
|
fix multi-line sessionDisplayName
|
2017-04-08 15:41:11 -07:00 |
|
Brad Hefta-Gaub
|
0d4649ded8
|
Merge pull request #10079 from jherico/entity_thread_safety
Thread safety for property getter/setters on entities
|
2017-04-07 19:01:07 -07:00 |
|
Chris Collins
|
8e12f62cbb
|
Merge pull request #10153 from druiz17/goto-fix
Ability to toggle goto with the crt-l and enter keys
|
2017-04-07 16:36:41 -07:00 |
|
Faye Li
|
d53b5b9c8c
|
Merge pull request #10137 from fayeli/handheld-cam
Selfie Stick Script
|
2017-04-07 16:12:23 -07:00 |
|
Chris Collins
|
1175f65cb0
|
Merge pull request #10162 from vladest/goto-white-buttons-fix
Check if offset outside image, set to last image
|
2017-04-07 15:58:48 -07:00 |
|
David Kelly
|
174b2978e3
|
username stays around now when tabbing to connections
|
2017-04-07 14:01:36 -07:00 |
|
Howard Stearns
|
57d8ec883e
|
Merge pull request #10163 from davidkelly/dk/3938
updated availability combo dialog
|
2017-04-07 13:57:17 -07:00 |
|
Seth Alves
|
03065ee6c8
|
Merge pull request #9938 from kunalgosar/jsRenderBug
Stop WebEntities Running Files and Commands
|
2017-04-07 13:44:03 -07:00 |
|
Dante Ruiz
|
cde9310f3e
|
goto home button fix
|
2017-04-07 21:35:28 +01:00 |
|
Dante Ruiz
|
909fda98a4
|
git goto button toggle hightlight
|
2017-04-07 21:01:53 +01:00 |
|
David Kelly
|
870e003311
|
Scattered X glyphs around the letterbox and combo dialogs
|
2017-04-07 11:12:54 -07:00 |
|
Vladyslav Stelmakhovskyi
|
a1892b351f
|
Cant use underscores outside class internals
|
2017-04-07 19:40:46 +02:00 |
|
David Kelly
|
ee9bc0bfa4
|
updated availability combo dialog
|
2017-04-07 10:25:37 -07:00 |
|
Vladyslav Stelmakhovskyi
|
9a563ba02f
|
Check if offset outside image, set to last image
|
2017-04-07 19:17:09 +02:00 |
|
Faye Li
|
3caea88641
|
use JS method to enable/disable avatar collisions
|
2017-04-07 10:02:30 -07:00 |
|
Andrew Meadows
|
b9c7d6351f
|
Merge pull request #10135 from samcake/ambient
Rename render::PendingChanges to render::Transaction
|
2017-04-07 09:54:10 -07:00 |
|
Brad Davis
|
91f8bf45b8
|
Merge pull request #10159 from highfidelity/revert-10158-revert-10157-brown
Fixing the rendering bug triggered with Nvidia driver 381.65
|
2017-04-07 09:53:41 -07:00 |
|
Triplelexx
|
fcfd206e9c
|
change implict conversions
|
2017-04-07 17:47:04 +01:00 |
|
David Kelly
|
12b5b91754
|
Merge pull request #10161 from howard-stearns/fix-pal-connections-help
fix pal connections-tab help trigger
|
2017-04-07 09:34:11 -07:00 |
|
Howard Stearns
|
468cc7f19b
|
Merge pull request #10150 from davidkelly/dk/3930
friends checkbox speedup
|
2017-04-07 09:27:39 -07:00 |
|
David Kelly
|
d363bde0d4
|
Merge pull request #10155 from howard-stearns/make-connection-message-not-logged-in
make connection messaging when not logged in
|
2017-04-07 09:12:24 -07:00 |
|
Howard Stearns
|
03013ecb3a
|
fix pal connections-tab help trigger
|
2017-04-07 07:30:36 -07:00 |
|
Howard Stearns
|
5d341778c5
|
fix notification word wrapping
|
2017-04-07 07:08:19 -07:00 |
|
Vladyslav Stelmakhovskyi
|
f88ba7bc57
|
Yahoo, Reddit etc now works correctly
|
2017-04-07 15:45:33 +02:00 |
|
samcake
|
f82310545c
|
Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65""
|
2017-04-07 02:03:58 -07:00 |
|
samcake
|
700c319953
|
Merge pull request #10158 from highfidelity/revert-10157-brown
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
|
2017-04-07 02:03:51 -07:00 |
|
samcake
|
ab3d39951e
|
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
|
2017-04-07 02:03:31 -07:00 |
|
samcake
|
ac9b181786
|
Merge pull request #10157 from samcake/brown
|
2017-04-07 02:01:05 -07:00 |
|
Sam Cake
|
b1a4bc329b
|
Introducing a fix to the graphics bug
|
2017-04-07 01:10:18 -07:00 |
|
Sam Cake
|
da1355dc32
|
Introducing a fix to the graphics bug
|
2017-04-07 01:03:07 -07:00 |
|
samcake
|
aae7349c40
|
trying to understand the bug with nvidia new driver
|
2017-04-06 18:31:03 -07:00 |
|
howard-stearns
|
b089fd03b8
|
make connection messaging when not logged in
|
2017-04-06 16:48:11 -07:00 |
|
samcake
|
0254c3372f
|
Merge pull request #10143 from jherico/ktx_crash
Don't crash if KTX file is invalid
|
2017-04-06 16:28:19 -07:00 |
|
David Kelly
|
d64a803451
|
no need to set checked
|
2017-04-06 16:08:48 -07:00 |
|
Chris Collins
|
4e9e3cccea
|
Merge pull request #10116 from birarda/bug/rel-ext-textures
fix relative/absolute path handling for external FBX textures
|
2017-04-06 15:58:02 -07:00 |
|
Seth Alves
|
ec2ebc00c0
|
Merge pull request #10145 from hyperlogic/feature/openvr-1.0.6
OpenVR: upgrade to version 1.0.6, for better generic tracker support
|
2017-04-06 15:53:49 -07:00 |
|
David Kelly
|
a1c211395b
|
Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column
fix sorting by pal connections-tab friends column
|
2017-04-06 15:43:21 -07:00 |
|
Dante Ruiz
|
22521526ec
|
removed stray space
|
2017-04-06 23:41:30 +01:00 |
|