Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -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
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
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
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
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
Anthony J. Thibault
5eddd232b0
Fix for change from std::string to QString
2017-03-24 17:03:01 -07:00
Anthony J. Thibault
49a95089d1
Remove hacks for debug rendering of IK targets
...
A AnimContext class was introduced. This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.
(cherry picked from commit a028d3ba58
2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3
Added developer option to draw IK targets in world.
...
(cherry picked from commit 7e7803c648
2017-03-24 16:20:52 -07:00
Seth Alves
f1470e34f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-24 15:17:52 -07:00
Brad Davis
82d502ae9f
Correctly initialize a file cache with the proper key
2017-03-24 13:35:37 -07:00
Seth Alves
0d2e0eb9c3
Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx
...
Avoid deadlock on 10k mesh fbx
2017-03-24 12:34:37 -08:00
Seth Alves
aaa78d108b
if a model has too many meshes, give up.
2017-03-24 11:17:24 -07:00
Seth Alves
e1e51614d9
don't hang loop if entity isDead
2017-03-24 11:16:54 -07:00
samcake
13b3809fe3
removing includes if possible
2017-03-24 11:04:52 -07:00
Clément Brisset
5ff7dbb254
Merge pull request #9991 from Atlante45/fix/entity-bad-url
...
Show entity bounding box for bad URLs
2017-03-24 10:56:06 -07:00
ZappoMan
ddd0645453
fix merge issue
2017-03-24 09:59:11 -07:00
samcake
a0488cfb91
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-03-24 09:41:09 -07:00
Brad Hefta-Gaub
1972b140b9
Merge pull request #9976 from mittens/21215
...
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
2017-03-24 08:52:12 -07:00
ZappoMan
bc331af6a0
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -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
Brad Hefta-Gaub
aa1883ba85
Merge pull request #9979 from jherico/crash_fix
...
Fix crash in render-perf-test
2017-03-24 08:10:37 -07:00
Sam Cake
022e91b35d
Clean comments and pixel format used
2017-03-24 00:26:14 -07:00
samcake
618344fe98
Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture
2017-03-23 18:10:09 -07:00
Atlante45
4f8d9b190b
Show green box when model entity has bad url
2017-03-23 17:56:33 -07:00
Atlante45
d4353e1d19
Fix warnings
2017-03-23 11:39:42 -07:00
ZappoMan
246f377a07
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-23 10:40:37 -07:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Seth Alves
1c62a80bc2
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:45 -07:00
Seth Alves
ec331f495d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:25:56 -07:00
Dante Ruiz
af97c7275e
Use loadQMlSource if no stack is aviable
2017-03-23 17:03:24 +01:00
Brad Davis
944255a37b
Fix crash in render-perf-test
2017-03-22 22:44:05 -07:00
Brad Davis
3a40fd886f
Fix comparison between GL stamps and GPU stamps
2017-03-22 18:11:20 -07:00
Brad Davis
4868a1618a
Add initialization to sampler stamp
2017-03-22 18:10:54 -07:00
Brad Davis
893fcba283
Return the correct format and internal format combo for depth textures
2017-03-22 17:14:40 -07:00
Brad Davis
9a3686fc1a
Fixing merge conflict
2017-03-22 14:55:11 -07:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Andrew Meadows
a463013d90
Merge pull request #9960 from samcake/blue
...
Fix Ambient Lighting equation
2017-03-22 14:13:31 -07:00
Chris Collins
05c40d2930
Merge pull request #9933 from mittens/hotfix/obj-texture-fix
...
Fixed the texture assignment for the OBJ loader
2017-03-22 13:19:01 -07:00
trent
c71e57753b
Removing changes (albeit benign ones) from another PR.
2017-03-22 15:23:40 -04:00
