Commit graph

21766 commits

Author SHA1 Message Date
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
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
samcake
03e1c5e0f2 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-03-20 15:10:09 -07:00
trent
3b8636b75c Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up. 2017-03-20 17:55:52 -04:00
Seth Alves
d5ea69d81d Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-20 14:06:00 -07:00
Stephen Birarda
c63a2c9cda remove requirement of ScriptEngine in ScriptEngines slots 2017-03-20 13:40:15 -07:00
Stephen Birarda
a4d72c4e67 make AudioScriptingInterface a Dependency 2017-03-20 13:40:15 -07:00
Andrew Meadows
92e3f8768c Merge pull request #9921 from jherico/menu_fix
Fix possible crash in Menu::removeSeparator
2017-03-20 13:38:36 -07:00
Brad Hefta-Gaub
bc5d7d8698 Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
zero velocity of deactivated dynamic entities
2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub
ccce4b4d29 Merge pull request #9948 from sethalves/fix-obj-with-no-material
fix obj sans material
2017-03-20 10:09:36 -07:00
Chris Collins
509057c6d8 Merge pull request #9941 from Triplelexx/21232
21232 - Remove Mini Mirror from View menu
2017-03-20 09:55:37 -07:00
Brad Davis
14c8c3f4db Return existing textures when matching hash for a previously found live texture 2017-03-20 09:39:29 -07:00
Seth Alves
67507f1f05 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-20 09:37:53 -07:00
Seth Alves
98cae8d152 added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript 2017-03-20 09:37:46 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3
CR 21114 -- Implement modules/require support into hifi
2017-03-20 06:22:35 -07:00
Sam Cake
a804bc723f Keep pushing and debugging ambient lighting 2017-03-20 00:32:06 -07:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
Sam Cake
3a08611c26 Fix the typo in the assert for isWireframe 2017-03-19 17:33:28 -07:00
Sam Cake
8584d80bb8 KEep exploring the ambient lighting 2017-03-19 17:00:42 -07:00
Seth Alves
c45d4660e5 Merge branch 'model-scripting-1' of github.com:sethalves/hifi into model-scripting-2 2017-03-18 22:36:40 -07:00
Seth Alves
b876d22e46 fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels 2017-03-18 22:36:24 -07:00
Seth Alves
f22d5b5f28 Merge branch 'fix-obj-with-no-material' of github.com:sethalves/hifi into model-scripting-2 2017-03-18 14:42:16 -07:00
Seth Alves
b945d9c4cb fix a bug that caused obj models with no material to randomly use the materials of other things in the view 2017-03-18 14:34:19 -07:00
Seth Alves
35c38b8130 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1 2017-03-18 10:18:27 -07:00
Seth Alves
488ed081dd Mesh::forEach and Mesh::map 2017-03-18 10:18:04 -07:00
Triplelexx
8b845658e2 remove redundant declarations 2017-03-18 05:00:05 +00:00
samcake
8b8f9d7b1a Fix a problem of the ambient lighting diffuse beeing too sstrong, we found a nice balance together with Alan 2017-03-17 18:26:48 -07:00
Triplelexx
a9b1a38665 remove Mini Mirror from View menu
Avatar inputs only contains the audio meter now.
2017-03-18 00:53:13 +00:00
samcake
e1a0984fed Merge pull request #9906 from samcake/red
Expose rendering in wireframe mode
2017-03-17 17:09:44 -07:00
Seth Alves
b3603ce8b3 Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now 2017-03-17 16:52:56 -07:00
Brad Hefta-Gaub
a75acd139b Merge pull request #9885 from sethalves/model-scripting
Model scripting
2017-03-17 13:13:17 -07:00
Zach Pomerantz
a68146e7d9 mv audio output init to output thread 2017-03-17 15:31:00 -04:00
trent
f1e81c34a3 Fixed the texture assignment for the OBJ loader (it wasn't doing anything with the spceular texture) 2017-03-17 14:34:17 -04:00
Ken Cooke
652c80057e Merge pull request #9924 from zzmp/fix/noise-delay
Use single frame buffer for local audio injectors
2017-03-17 11:24:02 -07:00
Seth Alves
16c3eb62b1 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1 2017-03-17 08:54:32 -07:00
Brad Davis
813e3a1bca Fix issue with scaling prior to KTX serialization 2017-03-17 08:05:52 -07:00
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Seth Alves
bbad6a0eb7 mesh-append works, mesh-transform doesn't? 2017-03-16 17:26:07 -07:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
Seth Alves
0e8d62c11e delete dead code 2017-03-16 15:24:39 -07:00
Seth Alves
200550aba9 ModelScriptingInterface::appendMeshes 2017-03-16 15:22:34 -07:00
Zach Pomerantz
db956f4cc3 use single frame buffer for local audio 2017-03-16 18:06:18 -04:00
Brad Hefta-Gaub
3fe4d6e733 Merge pull request #9910 from jherico/vs2017
Fix build problems on VS 2015 and VS 2017
2017-03-16 14:41:33 -07:00
humbletim
87d62ad1eb Merge branch 'master' into 21114-part3 2017-03-16 16:39:37 -04:00
Stephen Birarda
a69cf76d06 Merge pull request #9879 from birarda/bug/no-unload
make sure deleted entities are unloaded first
2017-03-16 13:29:36 -07:00
Brad Davis
e265a0a1f8 Fix possible crash in Menu::removeSeparator 2017-03-16 13:12:30 -07:00
Seth Alves
eba2417f41 Merge pull request #9912 from AndrewMeadows/model-cleanup-4
minor cleanup of render pipeline for models and avatars
2017-03-16 10:39:43 -08:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
samcake
4ef7fc61f0 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2017-03-16 10:43:07 -07:00
Seth Alves
a3fadbc367 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1 2017-03-16 09:38:56 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08:00
humbletim
366c90ef6a add Q_ASSERT to IS_THREADSAFE_INVOCATION 2017-03-16 01:28:50 -04:00
humbletim
52a571558c * changes per CR feedback
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
2017-03-16 01:23:23 -04:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
Seth Alves
693aee0628 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-03-15 16:54:40 -07:00
Andrew Meadows
d3fa28d4bc remove cruft and fix indentation 2017-03-15 16:17:59 -07:00
Brad Davis
2837ae9183 More VS 2017/2015 fixes 2017-03-15 16:13:15 -07:00
Andrew Meadows
cf848d73e4 don't updateClusterMatrices() in render() 2017-03-15 16:03:36 -07:00
howard-stearns
f662571cab send credentials to private data-webs as well 2017-03-15 15:46:25 -07:00
Brad Davis
b8ded015c6 Fix packetlist compilation on VS 2017 2017-03-15 15:20:41 -07:00
Andrew Meadows
f250c0d298 simpler bindTransform() for ModelMeshPartPayload 2017-03-15 14:41:13 -07:00
Brad Davis
3e68018a12 Fix node persmissions hash 2017-03-15 14:33:32 -07:00
Brad Hefta-Gaub
ed380a7738 Merge pull request #9895 from zzmp/clean/noise-gate
Strip AudioNoiseGate of dead code
2017-03-15 13:21:56 -07:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Dante Ruiz
dac16af1df Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation 2017-03-15 19:27:11 +01:00
Dante Ruiz
4bc050e583 added tablet notification 2017-03-15 19:26:50 +01:00
Stephen Birarda
0c657a1d55 add parameter to unload to remove entityID from map 2017-03-15 10:57:12 -07:00
Anthony Thibault
495deba771 Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races
Fixes for race conditions in DebugDraw
2017-03-15 10:38:26 -07:00
Seth Alves
ec5acf6035 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 09:36:39 -08:00
Seth Alves
dc82895feb Merge pull request #9870 from Atlante45/fix/js-exceptions
Fix JS exception messages formatting
2017-03-15 09:32:04 -08:00
Zach Pomerantz
789bb7c855 rename audio(Mic)OutboundPPS 2017-03-15 13:30:39 -04:00
Zach Pomerantz
2d0e11e2d1 add AudioNoiseGate to recording 2017-03-15 13:30:39 -04:00
Seth Alves
94e2cd6e68 Merge pull request #9845 from AndrewMeadows/fix-rare-physics-crash
fix rare physics crash
2017-03-15 09:30:29 -08:00
Seth Alves
816b0b5cfd unmangle merge 2017-03-15 09:02:32 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Seth Alves
7afe091c52 quiet warnings 2017-03-14 19:47:30 -07:00
Seth Alves
0785172398 quiet warnings 2017-03-14 19:01:13 -07:00
Seth Alves
08ad56d254 quiet warnings 2017-03-14 18:05:53 -07:00
Seth Alves
40b87171a9 quiet warnings 2017-03-14 17:49:39 -07:00
Zach Pomerantz
b1e5e43faa mv AudioNoiseGate to audio 2017-03-15 00:15:33 +00:00
Zach Pomerantz
f43706dfe1 clean AudioNoiseGate 2017-03-15 00:14:55 +00:00
Zach Pomerantz
0abcda86a8 mv AudioNoiseGate to audio 2017-03-15 00:14:55 +00:00
Seth Alves
3f142b7290 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-03-14 16:41:39 -07:00
Brad Davis
fc21c6bbd8 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-14 15:57:25 -07:00
Brad Davis
ff89a5c8c4 Merge pull request #9889 from samcake/brown
Fix the unsupported KTX file format
2017-03-14 15:56:15 -07:00
samcake
900615fcd5 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:53:29 -07:00
samcake
e0f0cc2102 Fix the unsupported ktx format, it was coming from the BUmp map case 2017-03-14 15:49:44 -07:00
Brad Davis
5e716f15b5 Protect against missing texture cache on shutdown 2017-03-14 13:48:24 -07:00
Seth Alves
5b28f3a3c4 cleanups 2017-03-14 10:08:34 -07:00
Zach Pomerantz
a41146451b Merge pull request #9883 from jherico/smarter_textures
Don't crash when failing to convert a texture to KTX format
2017-03-14 12:14:56 -04:00
Brad Davis
1ccf715e3b Don't crash when failing to convert a texture to KTX format 2017-03-14 09:09:14 -07:00
Seth Alves
4a1be69be4 writeOBJToString 2017-03-14 07:11:38 -07:00
Seth Alves
1eedce9825 unmangle merge 2017-03-13 18:18:26 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
humbletim
db73c80ba1 remove unused meta property adapter 2017-03-13 19:16:00 -04:00
Brad Davis
eab91d061d Merge pull request #9868 from zzmp/ktx/local-not-roaming
Use Local for WIN32 FileCache
2017-03-13 15:52:11 -07:00
Anthony J. Thibault
d38b994f4c Fix for potential crash due to DebugDraw data race.
(cherry picked from commit 1b8a624edb)
2017-03-13 15:23:16 -07:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
463f6454f8 use Local instead of Roaming for FileCache 2017-03-13 17:26:38 -04:00