Andrew Meadows
|
92495d9622
|
delete in proper order on shutdown
|
2017-04-07 11:10:48 -07:00 |
|
Andrew Meadows
|
8773497f7e
|
remvoe commented out cruft
|
2017-04-07 11:08:06 -07:00 |
|
Andrew Meadows
|
1fb88a0315
|
add a helpful comment
|
2017-04-07 11:08:06 -07:00 |
|
Andrew Meadows
|
6d627aa9bc
|
don't remove other avatars on sign-out
|
2017-04-07 11:08:06 -07:00 |
|
Andrew Meadows
|
2f18e51f6b
|
lock mutex around fading avatar list
|
2017-04-07 11:08:06 -07:00 |
|
Andrew Meadows
|
662c34c266
|
fix avatar scale animation and avatar render debug
|
2017-04-07 11:06:16 -07:00 |
|
Andrew Meadows
|
40e223cb82
|
cleanup unused return values and redundant variables
|
2017-04-07 09:58:04 -07:00 |
|
Andrew Meadows
|
2775b17a65
|
unravel one loop of spaghetti
|
2017-04-07 09:56:26 -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 |
|
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 |
|
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 |
|
Seth Alves
|
b1a015affd
|
Merge pull request #10117 from huffman/fix/unlock-propagation
Fix entity "unlock" edits not being propagated to clients
|
2017-04-06 15:28:05 -07:00 |
|
Howard Stearns
|
67f2cc3567
|
Merge pull request #10148 from davidkelly/dk/3936
pal selection changes
|
2017-04-06 14:58:46 -07:00 |
|
Clément Brisset
|
da27cd1c8b
|
Merge pull request #10149 from mittens/patch-1
Link to coding standards.
|
2017-04-06 14:46:45 -07:00 |
|
howard-stearns
|
9577102c22
|
fix sorting by pal connections-tab friends column
|
2017-04-06 14:45:08 -07:00 |
|
David Kelly
|
331f2da4f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936
|
2017-04-06 14:22:08 -07:00 |
|
Seth Alves
|
3c6429cdf3
|
Merge pull request #10103 from vladest/master-qml-bugfixes
Master qml bugfixes
|
2017-04-06 14:22:06 -07:00 |
|
David Kelly
|
726395ac3e
|
friends checkbox speedup
|
2017-04-06 14:07:07 -07:00 |
|
Howard Stearns
|
f7ef587c61
|
Merge pull request #10138 from davidkelly/dk/3935
Now you can forget connections
|
2017-04-06 14:05:25 -07:00 |
|
Chris Collins
|
494c8d868e
|
Merge pull request #10126 from samcake/brown
Fixing the rendering of Image3D overlay when drawn in the scene
|
2017-04-06 13:40:09 -07:00 |
|
Anthony J. Thibault
|
4e49774d0e
|
Moved device class check into handleTrackedObject
|
2017-04-06 13:20:00 -07:00 |
|
Trent Polack
|
d163b34368
|
Link to coding standards.
|
2017-04-06 15:57:32 -04:00 |
|
David Kelly
|
46a7d28e16
|
Merge pull request #10144 from howard-stearns/notice-login-change-in-pal
notice login/logout change in pal
|
2017-04-06 12:57:22 -07:00 |
|
David Kelly
|
e0a1422345
|
pal selection changes
|
2017-04-06 12:07:51 -07:00 |
|
samcake
|
19d080c4cc
|
Merging
|
2017-04-06 11:33:41 -07:00 |
|
howard-stearns
|
1d60a55d5f
|
notice login/logout change in pal
|
2017-04-06 11:20:08 -07:00 |
|
David Kelly
|
85c78da839
|
updated, plus fixed some annoying errors in logs from Pal.qml
|
2017-04-06 11:16:51 -07:00 |
|
David Kelly
|
34a2cefb98
|
Merge pull request #10132 from davidkelly/dk/analyticsForConnections
initial analytics for connections
|
2017-04-06 10:45:39 -07:00 |
|
druiz17
|
01204f845f
|
Merge pull request #10141 from vladest/tabletwebview-focus
TabletWebView redesigned to single WebView instance
|
2017-04-06 10:40:24 -07:00 |
|
Brad Davis
|
057a9feaf1
|
Don't crash if KTX file is invalid
|
2017-04-06 10:09:57 -07:00 |
|
Vladyslav Stelmakhovskyi
|
16fa7988f6
|
TabletWebView redesigned to single WebView instance
|
2017-04-06 17:53:46 +02:00 |
|
David Kelly
|
a92162dea9
|
no mo useless debug statements
|
2017-04-06 08:50:22 -07:00 |
|
Anthony J. Thibault
|
42262aac78
|
OpenVR: upgrade to version 1.0.6, for better generic tracker support
|
2017-04-05 18:41:43 -07:00 |
|