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
Zach Fox
e1a880a5d4
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 09:10:12 -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
Zach Fox
e88895935b
Revert "Actually merge from master"
...
This reverts commit 056d6fbe4f
2017-03-24 17:56:48 -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
Seth Alves
59da607d07
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-24 15:08:23 -07:00
Seth Alves
6e40f03c8e
cleanups
2017-03-24 15:08:13 -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
8f7f5efade
new javascript call: Model.newMesh()
2017-03-24 12:51:00 -07:00
Seth Alves
642cf57976
obj-writer now outputs normals
2017-03-24 12:49:58 -07: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
Zach Fox
056d6fbe4f
Actually merge from master
2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087
Revert "Merge from Master"
...
This reverts commit e48123b5bb
2017-03-24 10:04:51 -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
Anthony J. Thibault
bab9890fea
Added inputMode property to Web3DOverlay.
...
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
Atlante45
d4353e1d19
Fix warnings
2017-03-23 11:39:42 -07:00
Seth Alves
bb1c556c91
forgot a file
2017-03-23 11:04:50 -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
ba0c9e405a
cleanup
2017-03-23 10:38:57 -07:00
Seth Alves
f5680def55
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-23 09:55:41 -07:00
Seth Alves
93992bb427
Merge branch 'model-scripting-2' of github.com:sethalves/hifi into model-scripting-2
2017-03-23 09:55:35 -07:00
Seth Alves
ce9bb439b3
change Model api in anticipation of more than just PolyVox being able to give meshes to javascript
2017-03-23 09:55:30 -07:00
Zach Fox
e48123b5bb
Merge from Master
2017-03-23 09:54:14 -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
Seth Alves
df875ab504
make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches
2017-03-22 16:21:45 -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
trent
36619cd2e4
Fixed issue with duplicate physics status icons per sub-object.
2017-03-22 15:07:29 -04:00
Triplelexx
31ec9b832f
rename fronts to forwards
2017-03-22 18:43:30 +00:00
Triplelexx
c2cff55427
rename fronts to forwards
2017-03-22 18:41:06 +00:00
trent
83d69e65b3
Merge branch 'master' of https://github.com/highfidelity/hifi into 21215
2017-03-22 14:20:37 -04:00
Brad Davis
e60108cc8c
PR comments
2017-03-21 17:26:24 -07:00
Triplelexx
6e740a5fbb
change Mat4 getFront to getForward
2017-03-21 22:33:37 +00:00
Triplelexx
b7980569cc
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
2017-03-21 22:13:33 +00:00
Triplelexx
248c932d50
inline getFront
2017-03-21 22:11:18 +00:00
Seth Alves
91cac892d2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 14:04:58 -07:00
Seth Alves
b5786befc3
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-21 13:49:19 -07:00
Brad Davis
a3828ce45c
Fixing comment
2017-03-21 13:42:24 -07:00
Triplelexx
6d664fd668
add getForward, getFront returns getForward
...
getForward better describes the returned vector as a direction
2017-03-21 19:54:32 +00:00
Chris Collins
4c789c44aa
Merge pull request #9922 from birarda/bug/stuck-ess
...
fix a couple of ESS issues during ES/ESS restart
2017-03-21 12:44:53 -07:00
Seth Alves
048da6e6cb
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-21 09:52:15 -07:00
trent
21db7c3b7f
Merge branch 'master' of https://github.com/highfidelity/hifi into hotfix/obj-texture-fix
2017-03-21 12:46:57 -04:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Andrew Meadows
b2abe5aa04
Merge pull request #9956 from mittens/master
...
Tweaks to the Physics Simulation Ownership Icon Rendering
2017-03-21 09:29:50 -07:00
Brad Hefta-Gaub
ac309df3d1
Merge pull request #9946 from sethalves/model-scripting-1
...
Model scripting
2017-03-21 09:26:32 -07:00
Chris Collins
3f30909579
Merge pull request #9961 from Atlante45/feat/delete_dead_code
...
Delete old sitting points code
2017-03-21 08:03:46 -07:00
Zach Pomerantz
b6d111369f
Merge pull request #9935 from zzmp/fix/audio-initialization
...
Fix data race in audio output initialization
2017-03-21 00:23:28 -04:00
Zach Pomerantz
20ea13e00a
Merge pull request #9897 from zzmp/record/noise-gate
...
Add AudioNoiseGate to recordings played through Interface
2017-03-21 00:21:20 -04:00
Atlante45
73dd2abdaf
Delete old sitting points code
2017-03-20 17:29:44 -07:00
samcake
e05abf2a2f
Fixing the spherical harmonics gneration
2017-03-20 16:41:21 -07:00
