Olivier Prat
|
9130c51319
|
Fixed incorrect removal of ALL avatar fade events. Fade out should now work again when avatar leaves domain
|
2017-07-18 14:46:49 +02:00 |
|
Olivier Prat
|
2bba6aa816
|
Revert "Removed all bubble fade event code on avatar side"
This reverts commit 4b8545e8b5.
|
2017-07-18 14:07:07 +02:00 |
|
Olivier Prat
|
4b8545e8b5
|
Removed all bubble fade event code on avatar side
|
2017-07-18 10:04:08 +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 |
|
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 |
|
Cain Kilgore
|
f91a8c0f53
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler
|
2017-07-13 21:25:39 +01:00 |
|
Seth Alves
|
12f52e8f20
|
don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready
|
2017-07-13 13:18:21 -07:00 |
|
Zach Fox
|
2c94917fb8
|
Add necessary button protection
|
2017-07-13 12:58:47 -07:00 |
|
Andrew Meadows
|
4f75558b49
|
Merge pull request #10963 from sethalves/fix-sort-joints
put result of Avatar::getJointNames back in index-order
|
2017-07-13 12:44:32 -07:00 |
|
Cain Kilgore
|
677b177dce
|
Build error fix
|
2017-07-13 20:29:52 +01:00 |
|
Cain Kilgore
|
247e7b8bed
|
indentation!!!
|
2017-07-13 19:25:31 +01:00 |
|
Cain Kilgore
|
092725ad1a
|
a thing
|
2017-07-13 19:24:30 +01:00 |
|
Cain Kilgore
|
5329c1ce42
|
Fixed Indentation, removed old debug code
|
2017-07-13 19:23:28 +01:00 |
|
Cain Kilgore
|
521babb6bd
|
Avatar Scaler - should be PR Ready.
|
2017-07-13 19:18:51 +01:00 |
|
Dante Ruiz
|
03fbd2a1e6
|
fixed another warning
|
2017-07-13 19:12:34 +01:00 |
|
Seth Alves
|
59d88cb564
|
Merge pull request #10941 from sethalves/audio-injector-smart-pointers
Audio injector smart pointers
|
2017-07-13 11:00:02 -07:00 |
|
utkarshgautamnyu
|
35f97837e7
|
ensured clean install state is not saved in the registry
|
2017-07-13 10:50:14 -07:00 |
|
Dante Ruiz
|
b46dc7d389
|
removed space
|
2017-07-13 18:42:26 +01:00 |
|
Dante Ruiz
|
3cbfd4c917
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes
|
2017-07-13 18:40:54 +01:00 |
|
Dante Ruiz
|
070db2922d
|
fixed warning compile error
|
2017-07-13 18:40:38 +01:00 |
|
David Kelly
|
60751f07bd
|
Merge pull request #10961 from davidkelly/dk/hmdPreviewFix
hmd preview fix
|
2017-07-13 10:32:33 -07:00 |
|
Andrew Meadows
|
01bbd8d89d
|
Merge pull request #10950 from samcake/hobbes
add custom shape pipeline, use for Polyvox and Particle system entities
|
2017-07-13 10:16:46 -07:00 |
|
Brad Hefta-Gaub
|
b063c2f45d
|
Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission
Cleanup OctreeSendThread::packetDistributor()
|
2017-07-13 09:58:28 -07:00 |
|
Olivier Prat
|
4d5f2ebdfe
|
Removed unused variable that prevented build on Linux
|
2017-07-13 18:45:08 +02:00 |
|
Olivier Prat
|
96f0c35b79
|
Yet some more compilation fixes for Mac and Linux
|
2017-07-13 18:22:18 +02:00 |
|
Seth Alves
|
463316e66d
|
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
|
2017-07-13 09:17:03 -07:00 |
|