Commit graph

1828 commits

Author SHA1 Message Date
Brad Hefta-Gaub
3bdcfd8b78 Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
Seth Alves
90db9af2f9 Merge pull request #9978 from Triplelexx/fix-tablet-users-typo
fix myVisibility typo
2017-03-26 07:36:11 -08:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208
21208 - Muted microphone indicator
2017-03-24 13:07:43 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Ryan Huffman
1285f2a9eb Merge pull request #9937 from thoys/boppo
El Boppo the Clown punching bag game
2017-03-22 09:30:54 -07:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon
Add particle system overlay in edit.js
2017-03-21 10:02:52 -07:00
Brad Hefta-Gaub
af790d8474 Merge pull request #9875 from birarda/bug/spin-strafe
fix double snap turn strafing
2017-03-20 10:08:05 -07:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01:00
Thijs Wenker
febe25511b teleport.js - ignore entity support (for boxing gloves) 2017-03-17 21:10:06 +01:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08:00
Stephen Birarda
d13752a7c6 use the correct property name for useAdvancedMovementControls 2017-03-15 10:34:43 -07:00
Stephen Birarda
bfc51d8222 use property not function for advanced movement controls 2017-03-15 10:25:06 -07:00
Triplelexx
5883bd39dc rename color to component 2017-03-15 11:17:27 +00:00
Triplelexx
41041c711f use utils.js 2017-03-15 11:09:13 +00:00
Triplelexx
9e0091ebe0 use utils.js, move easing function, use mixes
some cleanup
2017-03-15 11:08:54 +00:00
Triplelexx
84d157ab18 handle overlay lifetime during update, remove color conv 2017-03-15 10:31:09 +00:00
Stephen Birarda
7ddb5ff770 use correct boolean when changing AMC 2017-03-14 18:09:17 -07:00
Stephen Birarda
188530590a add missing curly brace to script 2017-03-14 17:16:49 -07:00
Stephen Birarda
490cb83489 move advanced movement control changes to MyAvatar 2017-03-14 15:03:01 -07:00
Triplelexx
6971aeb081 additional reference information 2017-03-14 17:18:11 +00:00
Triplelexx
8a39ce16bd add simple easing function
dodgy add push
2017-03-14 16:57:45 +00:00
Triplelexx
4dd9a7c37f add simple easing function 2017-03-14 16:51:43 +00:00
Triplelexx
30c16984c0 change offsetPosition to use Camera.position 2017-03-14 06:07:22 +00:00
Triplelexx
c729ceccb5 change color lerp to use HSV color 2017-03-14 03:59:24 +00:00
Triplelexx
2e0cac4676 add extra safeguards 2017-03-14 01:25:39 +00:00
Triplelexx
8bd155cb86 change offsetPosition to use Camera.orientation 2017-03-14 01:23:04 +00:00
Ryan Huffman
8246dbafab Update particle explorer to work outside of entity list 2017-03-13 15:15:36 -07:00
Stephen Birarda
0926b2df2a add LX snap turn to standard mapping 2017-03-13 15:14:20 -07:00
Ryan Huffman
9880d40cfb Update edit.js light icons to now use the name entityIcon 2017-03-13 14:38:56 -07:00
Triplelexx
95fcb1df7a fix spelling mistake 2017-03-13 18:32:53 +00:00
Ryan Huffman
d4ade8278c Fix js linting errors in entityIconOverlayManager.js 2017-03-13 11:27:12 -07:00
Ryan Huffman
b7783dcffe Update edit.js light/particle overlays to be clickable when behind something 2017-03-13 11:26:34 -07:00
Ryan Huffman
c2564800dc Add edit.js particle + light icons 2017-03-13 10:10:53 -07:00
Ryan Huffman
dbcd7fd9e9 Fix light icon overlay not updating to represent light type 2017-03-13 10:10:53 -07:00
Ryan Huffman
42d518fafb Remove debug log in entityIconOverlayManager 2017-03-13 10:10:53 -07:00
Ryan Huffman
86116aaad7 Update light/particel icons to be shown by default in edit mode 2017-03-13 10:10:53 -07:00
Ryan Huffman
ce5ee42961 Update LightOverlayManager to work with particles 2017-03-13 10:10:53 -07:00
Triplelexx
873a9aa39e change color swapping to be more concise 2017-03-11 07:40:32 +00:00
Brad Hefta-Gaub
23e47f2fdc added icons to the audioScope app 2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
b8a2525f9e add auto pause/resume to the Audio Scope App 2017-03-10 17:38:00 -08:00
Brad Hefta-Gaub
5f3ee2e98f add a basic tablet app for the audio scope 2017-03-10 17:08:54 -08:00
Triplelexx
8a0dd55275 change naming and comment 2017-03-11 00:19:02 +00:00