Commit graph

54103 commits

Author SHA1 Message Date
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
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
Triplelexx
4c2823b42d change increment operator 2017-04-07 18:21:43 +01: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
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
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
volansystech
e0b08a5e4e Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand. 2017-04-07 21:55:26 +05:30
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
David Kelly
cb092d67dd Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 09:01:59 -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
David Rowe
1ef5f048a3 Inform user if recording failed to start 2017-04-07 18:53:20 +12:00
David Rowe
ce898ae42a Play recording 2017-04-07 18:38:55 +12:00
Triplelexx
27a404d0ea remove extra lines 2017-04-07 07:09:18 +01:00
Triplelexx
279997d905 change display plugin to deactivate when window minimized 2017-04-07 06:49:28 +01:00
David Rowe
75d970f5d5 Remove unresponsive players from list 2017-04-07 17:30:03 +12:00
David Rowe
81d8d238de Refactor log and error messages 2017-04-07 17:13:23 +12:00
David Rowe
5e55233934 Assignment client player script receives "play" command from recorder 2017-04-07 17:04:24 +12:00
David Rowe
506a414762 Lint fix 2017-04-07 14:06:16 +12:00
David Rowe
858e9650a3 Encapsulate recording methods in Recorder object 2017-04-07 14:03:08 +12:00
samcake
aae7349c40 trying to understand the bug with nvidia new driver 2017-04-06 18:31:03 -07:00
samcake
cb94e1009d Adding a job... 2017-04-06 18:10:28 -07:00
Al Bernstein
ead4793392 removed whitespace 2017-04-06 17:26:12 -07:00
Al Bernstein
c628b23895 removed whitespace 2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd used thread safe moving average for the quaternions 2017-04-06 16:56: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
Al Bernstein
de1fdfacca made requested changes in PR10147 2017-04-06 16:18:40 -07:00
David Kelly
d64a803451 no need to set checked 2017-04-06 16:08:48 -07:00
David Rowe
68901c8af5 Merge branch 'master' into 21249 2017-04-07 11:04:43 +12:00
David Rowe
49907970fb Fix countdown showing if restart with dialog open and recording enabled 2017-04-07 11:01:11 +12: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