Ryan Huffman
|
80b5f90160
|
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive
MS17463: only show InteractiveWindow on top of interface window
|
2018-09-06 10:15:20 -07:00 |
|
sabrina-shanman
|
f7226757ad
|
Just import TransformNode in AvatarTransformNode.h and similar
|
2018-09-06 10:03:05 -07:00 |
|
Dante Ruiz
|
200f6d540a
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-09-06 09:59:51 -07:00 |
|
Seth Alves
|
042044ceaf
|
dammit
|
2018-09-06 09:38:12 -07:00 |
|
Seth Alves
|
5a0a259c21
|
dammit
|
2018-09-06 09:37:01 -07:00 |
|
Bradley Austin Davis
|
fade3a8de0
|
Fixing shader implicit type conversions
|
2018-09-06 09:08:36 -07:00 |
|
Brad Davis
|
650f112f16
|
Fix keyword in shader layout
|
2018-09-06 09:08:36 -07:00 |
|
Brad Davis
|
50f4932d9c
|
PR feedback: structure alignement and size
|
2018-09-06 09:07:53 -07:00 |
|
Seth Alves
|
69ae04ab09
|
protect Base3DOverlay::_name with a mutex
|
2018-09-06 09:03:28 -07:00 |
|
Brad Davis
|
9a28e04e37
|
Remove all tabs from shaders
|
2018-09-06 08:59:07 -07:00 |
|
Brad Davis
|
2df2bbef46
|
Adding missing locations
|
2018-09-06 08:59:07 -07:00 |
|
Brad Davis
|
87b9594bd0
|
Fix warnings
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
730cdb4257
|
Remove uniforms from unused shaders
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
f704ddc11c
|
Remove uniform from SDF text rendering
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
a4cd56532e
|
Removing uniforms from antialiasing
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
07fba89f0f
|
Remove uniforms from item status
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
271651737b
|
Cleanup gpu shader constants
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
5a5e1ad498
|
Remove uniforms from polyvox
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
cafd981744
|
Remove uniforms from bloom debug effect
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
719ae25adb
|
Remove uniforms from drawCellBounds
|
2018-09-06 08:59:05 -07:00 |
|
Brad Davis
|
c8eb4da6b6
|
Remove simple draw task uniforms
|
2018-09-06 08:59:05 -07:00 |
|
Brad Davis
|
ac84a498b3
|
Cleanup dead declarations
|
2018-09-06 08:59:05 -07:00 |
|
Brad Davis
|
35d86dd798
|
Fail unit test on non-compiling pipelines
|
2018-09-06 08:59:05 -07:00 |
|
Brad Davis
|
b6247e0850
|
Remove cmake spam
|
2018-09-06 08:59:05 -07:00 |
|
Brad Davis
|
105a615745
|
Fix no-ui crashes
|
2018-09-06 08:59:05 -07:00 |
|
Wayne Chen
|
3f1eba418d
|
modifying location of links for user/pw
|
2018-09-06 00:07:23 -07:00 |
|
Wayne Chen
|
6d055ba136
|
changing sign up label
|
2018-09-05 23:49:49 -07:00 |
|
Wayne Chen
|
78fa52285f
|
adding show password toggle in textfield
|
2018-09-05 23:48:21 -07:00 |
|
Wayne Chen
|
7a136812bf
|
Merge branch 'login-update' of https://github.com/alexiamandeville/hifi into loginOnLaunch
|
2018-09-05 20:05:19 -07:00 |
|
Wayne Chen
|
581aa0c02d
|
Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch
|
2018-09-05 20:04:34 -07:00 |
|
David Rowe
|
ab47e16be1
|
Fix up titles and leading white space of some dev menu tablet dialogs
|
2018-09-06 14:35:08 +12:00 |
|
David Rowe
|
8420afd143
|
Fix title not not going back to "Settings" upon Save or Cancel
|
2018-09-06 14:00:33 +12:00 |
|
Anthony Thibault
|
3a3ffcc98c
|
First pass at improving anim stats.
|
2018-09-05 18:14:06 -07:00 |
|
amantley
|
6fb335429d
|
starting to re-implement the walking state detection for smoothwalking
|
2018-09-05 17:55:27 -07:00 |
|
sam gateau
|
4ef8f29522
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-05 17:50:21 -07:00 |
|
sam gateau
|
21f65d8a78
|
position are used correctly for evaluting bounds in the Mesh
|
2018-09-05 17:50:06 -07:00 |
|
Sam Gateau
|
03f51352aa
|
Merge pull request #13932 from SamGondelman/framebuffer
Fix framebuffer debugging
|
2018-09-05 17:38:21 -07:00 |
|
Alexia Mandeville
|
901de120a6
|
Removing flavortext
|
2018-09-05 17:20:49 -07:00 |
|
SamGondelman
|
cde2dc2eaa
|
please work
|
2018-09-05 17:04:05 -07:00 |
|
sabrina-shanman
|
84a2512f31
|
Fix collision pick scale not being used
|
2018-09-05 16:51:27 -07:00 |
|
sabrina-shanman
|
e8ce152687
|
Scale collision picks relative to parent by adding and using more
specialized transform nodes.
|
2018-09-05 16:51:28 -07:00 |
|
Roxanne Skelly
|
4fa7ac1af2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into featuredStories
|
2018-09-05 16:51:25 -07:00 |
|
Roxanne Skelly
|
bb8d9c5cf0
|
For stories, base the notification popups off of the action_string instead of a hard-coded value.
|
2018-09-05 16:50:08 -07:00 |
|
Alexia Mandeville
|
1e697ad45f
|
Removing labels, adding flavor text, moving links
|
2018-09-05 16:25:18 -07:00 |
|
David Rowe
|
a7099025dc
|
Fix up some Settings dialogs' titles
|
2018-09-06 11:15:14 +12:00 |
|
David Rowe
|
960bf00e12
|
Modify look of HMD mode Settings dialogs' titles
|
2018-09-06 11:02:24 +12:00 |
|
Sam Gateau
|
912e0abb0a
|
Merge pull request #13891 from samcake/black
Improving the LOD manager behavior for better scaling
|
2018-09-05 16:01:09 -07:00 |
|
David Kelly
|
b022697dfa
|
volume slider on users fixed
|
2018-09-05 15:36:07 -07:00 |
|
David Rowe
|
398724de73
|
Make Save in HMD settings dialogs return to previous dialog
Same as Cancel key does.
|
2018-09-06 10:23:45 +12:00 |
|
Alexia Mandeville
|
dcf2e00bd7
|
Adding placeholder text
|
2018-09-05 14:55:12 -07:00 |
|