Commit graph

57408 commits

Author SHA1 Message Date
Olivier Prat
dbf0b64dfb Refactored Fade.slh to take into account differences between instanced draw and normal draw 2017-07-18 12:49:34 +02:00
Olivier Prat
10a6ad2ac9 Added 3 more texture coord vec4f stream attributes 2017-07-18 10:58:49 +02:00
Olivier Prat
236270d798 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape 2017-07-18 10:47:21 +02:00
Olivier Prat
ca6ac4ab17 Merge branch 'fade' into fadeshape 2017-07-18 10:12:25 +02:00
Olivier Prat
4b8545e8b5 Removed all bubble fade event code on avatar side 2017-07-18 10:04:08 +02:00
utkarshgautamnyu
758ae9825d Merge pull request #10939 from highfidelity/bug/6118
Record total number of ATP/HTTP/File bytes downloaded during session
2017-07-17 13:53:21 -07:00
Zach Fox
aadf407842 Merge pull request #10978 from zfox23/hoverOverlayInterface
New HoverOverlayInterface skeleton
2017-07-17 13:16:32 -07:00
Zach Fox
19b42b0180 CR feedback 2017-07-17 13:15:23 -07:00
Zach Fox
4b9797c179 Comment explaining category debugs 2017-07-17 11:35:27 -07:00
Zach Fox
0a4ab23356 Remove unnecessary include 2017-07-17 11:32:47 -07:00
Zach Fox
147474e19a Logging category and filter 2017-07-17 11:17:59 -07:00
Andrew Meadows
99aad77e53 Merge pull request #10954 from jherico/qml_crashes_again
Still trying to address QML crashes
2017-07-17 10:21:23 -07:00
Zach Fox
19d5b8750a Cleanup logging 2017-07-17 09:51:00 -07:00
Olivier Prat
1f14b6ef38 Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering 2017-07-17 17:50:59 +02:00
Olivier Prat
f8b2ffe359 Removed transparency on fading shapes 2017-07-17 15:06:32 +02:00
Olivier Prat
db7871fca7 Merge branch 'fadevoxel' into fadeshape 2017-07-17 14:33:00 +02:00
Olivier Prat
95059e26c1 Fading working on voxels 2017-07-17 14:32:05 +02:00
Olivier Prat
3f8daa21ec Created FadeEffect singleton to be able to get fade item & batch setters for every special entity render 2017-07-17 14:26:41 +02:00
Olivier Prat
76dd421ecd Merge branch 'fade' into fadevoxel 2017-07-17 12:00:10 +02:00
Olivier Prat
146f934019 Cleaned up shader code as fade position is now world position 2017-07-17 11:59:10 +02:00
Olivier Prat
0123e2936b Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-17 11:44:10 +02:00
Olivier Prat
290d106cf4 Shapes are working again. Had to re-specialize all the payload hooks for ShapePayload::Pointer... 2017-07-17 11:37:50 +02:00
Olivier Prat
9e9c0aff65 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape 2017-07-17 09:59:59 +02:00
Olivier Prat
5e5148ca91 Merge branch 'fade' into fadeshape 2017-07-17 09:53:26 +02:00
Olivier Prat
61de99dfe8 Merge branch 'fade' into fadevoxel 2017-07-17 09:42:14 +02:00
Zach Fox
e602d3610e Initial commit for HoverOverlayInterface 2017-07-14 17:26:53 -07:00
Andrew Meadows
5a4f56388b Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains
Smooth IK when trackers are disabled / enabled.
2017-07-14 16:59:30 -07:00
druiz17
3b112450f0 Merge pull request #10959 from druiz17/bug/wrong-tablet-state
Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode
2017-07-14 14:31:04 -07:00
utkarshgautamnyu
fef375ef50 Merge pull request #10962 from highfidelity/clean_install
Added option in the installer for a clean install
2017-07-14 14:09:32 -07:00
Seth Alves
806d9f1436 Merge pull request #10968 from druiz17/bug/load-priority
Prioritize file:// requests over http://
2017-07-14 11:13:35 -07:00
Zach Fox
a9197509d8 Merge pull request #10965 from CainFoool/avatar-scaler
WL 21422 - Add a scale slider for avatar size
2017-07-14 10:30:33 -07:00
Dante Ruiz
68fa426da9 set file url as higher priority 2017-07-14 18:17:13 +01:00
Andrew Meadows
9584035aa4 Merge pull request #10886 from 1P-Cusack/21420
[Worklist #21420] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
Andrew Meadows
17f5c9099e Merge pull request #10944 from misslivirose/fix-chat-help-text
String pass on Chat.js
2017-07-14 09:58:35 -07:00
Anthony J. Thibault
de199bff9d code review feedback 2017-07-14 09:47:37 -07:00
Seth Alves
741feb7e54 Merge pull request #10951 from druiz17/tablet-modal-fixes
Allow the tablet to be closed when a modal dialog is open.
2017-07-14 09:40:58 -07:00
Seth Alves
ba76020617 Merge pull request #10967 from elmanytas/improve_build_linux_doc
Create ubuntu specific documentation.
2017-07-14 09:40:02 -07:00
Cain Kilgore
b7ed3ce659 Prettified the Comment 2017-07-14 17:33:17 +01:00
Cain Kilgore
ee1f371902 Fixed step counted not resetting to 1 properly 2017-07-14 16:29:19 +01:00
Olivier Prat
82da9fb537 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-14 17:28:35 +02:00
elmanytas
f692a2e4bf Create ubuntu specific documentation based on https://forums.highfidelity.com/t/how-to-compile-a-stable-build-of-the-linux-server-stack-on-ubuntu-16-04-lts/11528/16 and tested yesterday. 2017-07-14 08:44:59 +02:00
Cain Kilgore
c60c8c7b13 Missed two tabs.. 2017-07-14 00:59:25 +01:00
Cain Kilgore
4f8d958831 Some code cleaning, added comment for reasoning of specifying min and max in the qml 2017-07-14 00:56:42 +01:00
Brad Hefta-Gaub
b35d696077 Merge pull request #10966 from sethalves/fix-softattachment-crash
avoid crash in soft-attachment code
2017-07-13 15:48:23 -07:00
Cain Kilgore
72c3e789e9 More Spaces! 2017-07-13 23:42:20 +01:00
Cain Kilgore
d74c834f12 Fixed colour scheming and changed to a reload icon 2017-07-13 22:40:37 +01:00
Cain Kilgore
60300f5d7b changed to icon (hopefully) 2017-07-13 22:06:44 +01:00
Olivier Prat
b125fba2e1 Removed untested avatar bubble fade code. Made changes as requested by Andrew 2017-07-13 23:04:55 +02:00
Howard Stearns
17fcfad957 Merge pull request #10875 from highfidelity/spectator-camera
Spectator Camera
2017-07-13 13:57:18 -07:00
Olivier Prat
b68ec4f933 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-13 22:36:52 +02:00