Dante Ruiz
|
058145df15
|
Merge branch 'ui' of github.com:SamGondelman/hifi into ui
|
2017-11-14 13:04:20 -08:00 |
|
Dante Ruiz
|
8779d52ad3
|
making requested changes
|
2017-11-14 13:04:09 -08:00 |
|
SamGondelman
|
210fd209f5
|
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup
|
2017-11-14 11:47:32 -08:00 |
|
Dante Ruiz
|
416a47cfc7
|
adding controller haptic feedback to tablet onPress
|
2017-11-14 09:34:17 -08:00 |
|
Dante Ruiz
|
db2f6810bd
|
Merge branch 'ui' of github.com:SamGondelman/hifi into ui
|
2017-11-14 08:41:38 -08:00 |
|
SamGondelman
|
a505d50027
|
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup
|
2017-11-13 17:55:44 -08:00 |
|
Dante Ruiz
|
b779c33a1b
|
fixed lockEndUUID offset for scripts
|
2017-11-13 16:42:16 -08:00 |
|
Dante Ruiz
|
6173c33b51
|
fixing merge conflict
|
2017-11-13 15:02:25 -08:00 |
|
Dante Ruiz
|
132b33dbe7
|
disable stylus pointer when not being used
|
2017-11-13 14:53:54 -08:00 |
|
SamGondelman
|
60db24f2d3
|
merge with master
|
2017-11-13 14:36:24 -08:00 |
|
SamGondelman
|
2fb1981c4a
|
merge with master
|
2017-11-13 14:34:39 -08:00 |
|
Dante Ruiz
|
7613bddefa
|
fixing some issues with hud module
|
2017-11-13 14:26:34 -08:00 |
|
Dante Ruiz
|
56823f8a72
|
Merge branch 'ui' of github.com:SamGondelman/hifi into ui
|
2017-11-13 13:39:10 -08:00 |
|
Dante Ruiz
|
5852224a31
|
clean up code and finialize changes
|
2017-11-13 13:37:53 -08:00 |
|
SamGondelman
|
2c0272f304
|
(mostly?) fix touch events
|
2017-11-13 12:58:31 -08:00 |
|
Zach Fox
|
0b6cc6ba2e
|
Merge pull request #11803 from zfox23/commerce_fixCertDisappearing
Fix bug with disappearing certificate info
|
2017-11-13 12:13:45 -08:00 |
|
Stephen Birarda
|
21e49d1504
|
Merge pull request #11798 from Atlante45/feat/wizard-tweaks
Wizard tweaks
|
2017-11-13 12:07:22 -08:00 |
|
Zach Fox
|
641c4656c4
|
Fix bug with disappearing certificate info
|
2017-11-13 10:53:16 -08:00 |
|
Seth Alves
|
9df11fb11a
|
Merge pull request #11787 from elisa-lj11/musvis
Second fix to null file path return (specific to music visualizer)
|
2017-11-13 09:44:47 -08:00 |
|
Sam Gateau
|
4b14a7a820
|
Merge pull request #11799 from NissimHadar/hazeUIFix
Removed Keylight attenuation from .js (as well as .html).
|
2017-11-13 09:18:29 -08:00 |
|
Ryan Downe Karpf
|
3ea6ecf104
|
Merge pull request #11747 from luiscuenca/case8495
8495 No mirror camera in HMD mode
|
2017-11-13 09:09:34 -08:00 |
|
luiscuenca
|
d75c176fef
|
clean up unused lastmode
|
2017-11-13 06:10:17 -07:00 |
|
Ryan Downe Karpf
|
9ff4541ee3
|
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
Remove hack for missing inttypes.h header on VS2010
|
2017-11-12 10:59:19 -08:00 |
|
Ryan Downe Karpf
|
f8b1c7978c
|
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
[Case 6569]: Silent failure is possible during Model Creation
|
2017-11-12 08:36:10 -08:00 |
|
Nissim Hadar
|
f629357ded
|
Removed Keylight attenuation from .js (as well as .html).
|
2017-11-11 18:58:12 -08:00 |
|
Ken Cooke
|
89dbbb44ed
|
Merge pull request #11780 from kencooke/audio-codec-update
Audio codec update for all platforms (includes Android)
|
2017-11-11 11:33:33 -08:00 |
|
Atlante45
|
8f133fc7fa
|
Congratulation page styling fixes
|
2017-11-10 18:12:43 -08:00 |
|
Atlante45
|
067436a743
|
CR
|
2017-11-10 18:12:33 -08:00 |
|
Dante Ruiz
|
43c6d71236
|
fix stylus module
|
2017-11-10 17:28:55 -08:00 |
|
Atlante45
|
9cd8f372f2
|
Fix race condition
|
2017-11-10 16:21:06 -08:00 |
|
Atlante45
|
796909d366
|
Permissions page tweaks
|
2017-11-10 16:19:49 -08:00 |
|
Atlante45
|
2782ae03c5
|
Add back buttons
|
2017-11-10 15:48:44 -08:00 |
|
Atlante45
|
c047a1d0a4
|
Rework perms wizard page
|
2017-11-10 15:48:44 -08:00 |
|
Sam Gateau
|
ecf67cc331
|
Merge pull request #11650 from Zvork/outline
Multiple Outline Groups
|
2017-11-10 15:45:03 -08:00 |
|
Andrew Meadows
|
469b68011c
|
Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero
div by zero fixes, detected by address sanitizer
|
2017-11-10 13:47:40 -08:00 |
|
SamGondelman
|
cbf0543646
|
deadspot
|
2017-11-10 13:22:38 -08:00 |
|
Sam Gateau
|
f857b37d2e
|
Merge pull request #11758 from NissimHadar/hazeUIFix
Improved Haze UI in Create menu
|
2017-11-10 11:58:06 -08:00 |
|
Anthony Thibault
|
08c12a1ced
|
Merge pull request #11704 from AndrewMeadows/shape-manager-key
cleanup ShapeInfo hash generation
|
2017-11-10 11:31:46 -08:00 |
|
Melissa Brown
|
f7eb57a54c
|
Merge pull request #11653 from vladest/fix_sriptslog_multiply_window
Fix scriptslog multiply window
|
2017-11-10 11:11:46 -08:00 |
|
Anthony J. Thibault
|
ba4c0f189e
|
code review feedback
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
|
2017-11-10 10:25:29 -08:00 |
|
Anthony J. Thibault
|
4169e11e77
|
Merge branch 'master' into bug-fix/div-by-zero
|
2017-11-10 10:15:26 -08:00 |
|
luiscuenca
|
055fe16677
|
Allow script to change to mirror camera in HMD
|
2017-11-09 18:27:16 -07:00 |
|
Sam Gondelman
|
9010a02bee
|
Merge pull request #11790 from SamGondelman/overlayFlash
Fix laser end not disappearing
|
2017-11-09 17:10:07 -08:00 |
|
Dante Ruiz
|
ef55e3181d
|
moveing controllerDispatchaer pointers to pointerUtils.js
|
2017-11-09 16:48:52 -08:00 |
|
Anthony Thibault
|
38cc56db7f
|
Merge pull request #11785 from luiscuenca/case6944
6944 Avatar scale is preserved across domains
|
2017-11-09 16:38:45 -08:00 |
|
SamGondelman
|
9188ae9fb5
|
fix laser end not disappearing
|
2017-11-09 16:26:37 -08:00 |
|
luiscuenca
|
355b465109
|
make leaveDomain slot private
|
2017-11-09 16:05:53 -07:00 |
|
Anthony Thibault
|
de9eeff7d2
|
Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer
Fix for address sanitizer warning
|
2017-11-09 14:19:03 -08:00 |
|
David Kelly
|
31dc140ea6
|
Merge pull request #11771 from zfox23/commerce_seedingFrontend
Commerce: Seeding Frontend
|
2017-11-09 14:45:10 -07:00 |
|
Ken Cooke
|
c324f342b4
|
Fix to check ANDROID before UNIX
|
2017-11-09 13:39:13 -08:00 |
|