samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
samcake
60208bca69
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-03-29 10:58:05 -07:00
samcake
9bc7e41642
Remove extra calls for binding default textures, not needed
2017-03-29 10:57:08 -07:00
samcake
8fd413e7c3
Merge pull request #10037 from highfidelity/revert-10036-revert-10020-ktx_refactor
...
Don't hold KTX files open for longer than transfers require
2017-03-29 10:02:33 -07:00
Seth Alves
6080c4782a
fix polyvox shader
2017-03-28 16:44:31 -07:00
samcake
a1bf1beab4
Merge pull request #10014 from samcake/blue
...
Fixing the roughness/reflection quantization bug
2017-03-28 14:50:24 -07:00
Seth Alves
4516ddf855
Merge pull request #9847 from highfidelity/tablet-ui
...
Tablet ui
2017-03-28 14:48:02 -07:00
samcake
a2b2e3e169
Revert "Revert "Don't hold KTX files open for longer than transfers require""
2017-03-28 14:45:04 -07:00
samcake
08e1a2ba4c
Revert "Don't hold KTX files open for longer than transfers require"
2017-03-28 14:06:09 -07:00
samcake
e42cb52bd1
Merge pull request #10020 from jherico/ktx_refactor
...
Don't hold KTX files open for longer than transfers require
2017-03-28 14:06:02 -07:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
Seth Alves
1cf6945bf2
pass radials argument to AABox::touchesAAEllipsoid as const reference
2017-03-28 11:12:00 -07:00
Seth Alves
9789476a73
handle case where AAEllipsoid is entirely inside the AABox
2017-03-28 10:57:03 -07:00
Seth Alves
6f6343420c
don't crash if entity dimensions somehow include a zero
2017-03-28 10:56:33 -07:00
Seth Alves
7641677902
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-28 10:14:49 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Bradley Austin Davis
9fc9253eeb
Fixing warnings
2017-03-28 09:54:18 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Seth Alves
651d87dc2a
move Qt-related stuff out of model and into model-networking
2017-03-28 07:53:25 -07:00
Seth Alves
8da91695df
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-27 20:15:54 -07:00
Andrew Meadows
5fc1e97166
fix windows build of render-utils-test
2017-03-27 16:49:43 -07:00
Bradley Austin Davis
2cf7ba4119
Fixing pending transfer calculation
2017-03-27 16:34:08 -07:00
Bradley Austin Davis
638364497d
Trying a different tactic to avoid multiple concurrent file access
2017-03-27 16:18:04 -07:00
Andrew Meadows
92b41d7a38
fix link error for linux build
2017-03-27 15:50:40 -07:00
Andrew Meadows
ff2f4da4b2
final changes as per samcake
2017-03-27 15:19:28 -07:00
Seth Alves
343c9335b3
Merge pull request #10023 from hyperlogic/bug-fix/stylus-touching-deleted-entity
...
tablet bug fixes
2017-03-27 14:07:14 -08:00
Andrew Meadows
fcf18cba91
render pipeline support for normalized intergers
2017-03-27 14:40:31 -07:00
Andrew Meadows
60bc76e1c4
store cluster indices and weights in uint16_t
2017-03-27 14:40:31 -07:00
Andrew Meadows
f6d6c62fab
move variable closer to context where it is used
2017-03-27 14:40:31 -07:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Andrew Meadows
60874e6041
remove unused cruft
2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f
Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
...
Added Developer > Avatar > Show IK Targets
2017-03-27 14:29:02 -07:00
Brad Hefta-Gaub
3bdcfd8b78
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
...
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
Anthony J. Thibault
a0c42bacdb
Fix problem with ContextMenu triggering on button up and button down.
...
This is fixed by clearing the ButtonPressedMap in the KeyboardMouseDevice every update.
Previously, this button would never be cleared, causing other controller actions mapped to the same button to have the incorrect state.
In this case, ContextMenu action would become 2 when pressed and 1 when released, anytime after the right mouse button was pressed.
2017-03-27 14:26:17 -07:00
Bradley Austin Davis
f764cd614b
Don't hold KTX files open for longer than transfers require
2017-03-27 13:33:00 -07:00
Seth Alves
a3fce13a04
Merge branch 'brown' of github.com:samcake/hifi into tablet-ui
2017-03-27 12:00:45 -07:00
Seth Alves
a6c54907b4
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 11:14:24 -07:00
Dante Ruiz
f4255735a9
make login screen show up on the tablet on startup
2017-03-27 18:03:38 +01:00
Seth Alves
d0c8994a8c
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 09:51:40 -07:00
samcake
25d39d2430
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-03-27 09:50:44 -07:00
Seth Alves
5ed0ff729b
cleanups
2017-03-27 07:25:40 -07:00
Seth Alves
2682586c38
some clean-ups and a bug fix in PolyVox to mesh code
2017-03-27 06:50:06 -07:00
Sam Cake
e87bc91d0e
Fixing the roughness/reflection quantization bug
2017-03-26 11:48:02 -07:00
Seth Alves
9cdd85af05
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-26 09:33:39 -07:00
Seth Alves
bb28976d0e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-26 09:32:35 -07:00
Seth Alves
c21b8b4eac
raise max mesh count for static collision entities from 500 to 1000
2017-03-26 08:48:08 -07:00
Seth Alves
66f8e4063d
Merge pull request #9984 from Atlante45/fix/warnings
...
Fix warnings
2017-03-26 07:03:33 -08:00
Seth Alves
5e8c1eab78
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-25 19:03:39 -07:00
samcake
8b1a0be754
Merge pull request #9997 from jherico/ktx_cache_fix
...
Correctly initialize a file cache with the proper key
2017-03-25 09:58:32 -07:00
Sam Cake
ad5c78349a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-03-25 09:57:28 -07:00
