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 |
|
Zach Pomerantz
|
172a638ef0
|
move resource paths to PathUtils
|
2017-03-13 17:26:34 -04:00 |
|
humbletim
|
075574b428
|
log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__)
|
2017-03-13 16:33:42 -04:00 |
|
ZappoMan
|
956fdd0933
|
CR feedback
|
2017-03-13 12:06:38 -07:00 |
|
ZappoMan
|
099ee1db7f
|
CR feedback
|
2017-03-13 12:05:42 -07:00 |
|
ZappoMan
|
3e020ede78
|
CR feedback
|
2017-03-13 11:58:43 -07:00 |
|
Andrew Meadows
|
546f32431d
|
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
|
2017-03-13 11:52:16 -07:00 |
|
ZappoMan
|
81d01da21d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate
|
2017-03-13 10:55:09 -07:00 |
|
Andrew Meadows
|
6e7f4b0418
|
Merge pull request #9829 from ZappoMan/addDoubleClick
Add double click message support to entities and overlays
|
2017-03-13 10:44:54 -07:00 |
|
Zach Pomerantz
|
a27d88da1a
|
update TextureCache to use FileCache
|
2017-03-13 13:41:44 -04:00 |
|
Zach Pomerantz
|
a0c56618b3
|
update FileCache to rm manifest
|
2017-03-13 13:41:44 -04:00 |
|
Atlante45
|
b67b17d3c0
|
Fix JS exception messages formatting
|
2017-03-13 09:11:20 -08:00 |
|
Seth Alves
|
7e7bbe8785
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-13 09:43:17 -07:00 |
|
Brad Hefta-Gaub
|
a38965d628
|
add more audio stats
|
2017-03-11 09:50:30 -08:00 |
|
Andrew Meadows
|
bde2222dfd
|
actually use worldTrans
|
2017-03-10 18:30:56 -08:00 |
|
Brad Hefta-Gaub
|
eaea718de1
|
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
|
2017-03-10 17:08:19 -08:00 |
|
Anthony J. Thibault
|
07e10ae862
|
Merge branch 'tablet-ui' into feature/can-touch-this
|
2017-03-10 17:05:26 -08:00 |
|
Chris Collins
|
49efd8ad42
|
Merge pull request #9841 from AndrewMeadows/fix-crash-copying-joint-data
fix crash when unpacking too many joints
|
2017-03-10 14:39:27 -08:00 |
|
Andrew Meadows
|
9c9eb87925
|
sync RigidBody on deactivation
|
2017-03-10 12:55:16 -08:00 |
|
Dante Ruiz
|
2cd194104f
|
force on to home screen
|
2017-03-10 20:46:01 +00:00 |
|
Brad Hefta-Gaub
|
69fdea3621
|
fix typo in comment
|
2017-03-10 11:44:53 -08:00 |
|
Brad Hefta-Gaub
|
a4eac3cbc0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate
Conflicts:
libraries/audio-client/src/AudioNoiseGate.cpp
|
2017-03-10 11:43:30 -08:00 |
|
Vladyslav Stelmakhovskyi
|
e27ccab2f4
|
Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click
|
2017-03-10 19:53:20 +01:00 |
|
Seth Alves
|
2068b93ccc
|
Merge pull request #9817 from druiz17/goto-home-bug
cant call gotohomescreen when tablet is closed
|
2017-03-10 10:17:23 -08:00 |
|
Seth Alves
|
e3f1d80933
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-10 09:54:35 -08:00 |
|
Brad Davis
|
43d8433d9a
|
Removing unused include
|
2017-03-10 09:19:00 -08:00 |
|
Andrew Meadows
|
2c141fd555
|
more correct comment
|
2017-03-10 09:18:29 -08:00 |
|
Andrew Meadows
|
a16760278e
|
remove debug code
|
2017-03-09 17:58:53 -08:00 |
|
Andrew Meadows
|
be3012181f
|
force local deactivation on remote deactivation
|
2017-03-09 17:53:17 -08:00 |
|
Andrew Meadows
|
8ddcae2a15
|
restore transform of deactivated entities
|
2017-03-09 17:26:53 -08:00 |
|
Andrew Meadows
|
d4abdcb6c8
|
comments, namechange, and temporary debug code
|
2017-03-09 17:26:53 -08:00 |
|
Anthony J. Thibault
|
d8f04d90a7
|
Merge branch 'master' into feature/can-touch-this
|
2017-03-09 14:24:10 -08:00 |
|
Bradley Austin Davis
|
8a438948b9
|
Fix OSX link failure
|
2017-03-09 10:42:56 -08:00 |
|
Brad Hefta-Gaub
|
bdab24d9bf
|
fix spelling
|
2017-03-09 08:25:56 -08:00 |
|
Brad Hefta-Gaub
|
79d8d90581
|
CR feedback
|
2017-03-08 20:35:24 -08:00 |
|
Brad Hefta-Gaub
|
2d595c1f87
|
CR feedback
|
2017-03-08 20:29:32 -08:00 |
|
Andrew Meadows
|
ffe69acb5c
|
fix rare physics crash
|
2017-03-08 19:26:12 -08:00 |
|
Brad Hefta-Gaub
|
7acfcf6750
|
fade in and out when opening/closing the noise gate
|
2017-03-08 18:15:32 -08:00 |
|
Brad Hefta-Gaub
|
60daaba525
|
small cleanup
|
2017-03-08 17:30:44 -08:00 |
|
Brad Hefta-Gaub
|
1bdad89cbe
|
properly handle silent packet transitions
|
2017-03-08 17:27:46 -08:00 |
|
Andrew Meadows
|
30d7ffb303
|
fix warning about signed unsigned compare
|
2017-03-08 17:17:49 -08:00 |
|
Andrew Meadows
|
5847f86db8
|
fix crash when unpacking too many joints
|
2017-03-08 16:12:03 -08:00 |
|
Zach Pomerantz
|
ffdaa09072
|
use stored Usage(Type), Sampler for KTX
|
2017-03-08 15:54:32 -05:00 |
|
Brad Davis
|
9d56001341
|
Fix rebase
|
2017-03-08 12:14:45 -08:00 |
|
samcake
|
9843b68878
|
Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown
|
2017-03-08 11:56:08 -08:00 |
|
Brad Davis
|
a871b1cabc
|
Merge branch 'smarter_textures' into 2-27
|
2017-03-08 11:33:38 -08:00 |
|
Dante Ruiz
|
e9086460e3
|
changed function names
|
2017-03-08 18:14:32 +00:00 |
|
Dante Ruiz
|
fd3e1fb320
|
Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug
|
2017-03-08 17:42:44 +00:00 |
|
Dante Ruiz
|
6acf2340a2
|
better way to determine if we can go to the homescreen
|
2017-03-08 17:42:24 +00:00 |
|
Seth Alves
|
66d44ac6f0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-08 09:26:51 -08:00 |
|
Andrew Meadows
|
31fc50b38c
|
Merge pull request #9828 from kunalgosar/recorderFix
Fixed bug where recording sends you to (0, 0, 0)
|
2017-03-08 09:24:29 -08:00 |
|
Brad Davis
|
9b8a531439
|
Fix iteration
|
2017-03-08 09:04:00 -08:00 |
|
Brad Davis
|
399270d243
|
Still trying to fix OSX build
|
2017-03-08 09:03:59 -08:00 |
|
Bradley Austin Davis
|
62fcd238ae
|
Fix shared pointer usage in storage abstraction
|
2017-03-08 09:03:58 -08:00 |
|
Brad Davis
|
e94f803b84
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2017-03-08 09:03:21 -08:00 |
|
Seth Alves
|
509ce3f2d2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 18:41:36 -08:00 |
|
Brad Hefta-Gaub
|
8ae6f2727d
|
add support for double click messages to overlays and entities
|
2017-03-07 17:52:55 -08:00 |
|
kunalgosar
|
d2a2ba1846
|
Fixed recording bug
|
2017-03-07 17:19:21 -08:00 |
|
Anthony J. Thibault
|
1b8a624edb
|
Fix for potential crash due to DebugDraw data race.
|
2017-03-07 16:07:30 -08:00 |
|
Thijs Wenker
|
b954d5b0e9
|
stop the playback after the clip stopped playing rather than pause. Allows you to click play again without having to move the position back.
|
2017-03-08 00:08:57 +01:00 |
|
Brad Hefta-Gaub
|
1e51ae62b1
|
Merge pull request #9804 from jherico/oculus_update
Update Oculus SDK to 1.11
|
2017-03-07 15:00:44 -08:00 |
|
Dante Ruiz
|
656720ae36
|
Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug
|
2017-03-07 22:22:46 +00:00 |
|
Seth Alves
|
71c2b4215d
|
Merge pull request #9811 from ZappoMan/triangleSet
Cleanup how Models do ray-picking and determination of point inside of convex hull
|
2017-03-07 14:12:56 -08:00 |
|
humbletim
|
8582c7af7b
|
Use specific debug name literal instead of __FUNCTION__ from within lambda
|
2017-03-07 16:41:20 -05:00 |
|
humbletim
|
d93047f9e2
|
Switch to READONLY_PROP_FLAGS for require.cache/require.resolve properties
|
2017-03-07 16:41:19 -05:00 |
|
humbletim
|
5e5bba5aad
|
Separate EntityPropertyMetadataRequest for easier documentation and testing
|
2017-03-07 16:41:19 -05:00 |
|
humbletim
|
40ba8185a0
|
* Update per 21114-part2 changes.
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
|
2017-03-07 16:36:07 -05:00 |
|
humbletim
|
9b09651337
|
Move BaseScriptEngine from script-engine to shared.
|
2017-03-07 16:34:24 -05:00 |
|
humbletim
|
e91de1775e
|
use a fully-qualified initializer when constructing BatchLoader
|
2017-03-07 16:34:24 -05:00 |
|
humbletim
|
32e450e6c2
|
* rework _requireResolve error throws (to avoid using lambda w/default args -- which vc++ didn't care for)
* add ExceptionEmitters to require/resolve so errors get logged even if invoked indpendently from a script
|
2017-03-07 16:34:24 -05:00 |
|
humbletim
|
efc61c25ad
|
* use explicit int's for moduleId constants
* maxTestConstructorValueSize was already limiting debug output size -- adopt its strategy, use shared MAX_DEBUG_VALUE_LENGTH const
|
2017-03-07 16:34:24 -05:00 |
|
humbletim
|
9d860a8e81
|
merge require/module changes into clean branch
|
2017-03-07 16:34:24 -05:00 |
|
Seth Alves
|
cd91d6ff3c
|
Merge pull request #9824 from sethalves/fix-tablet-qml-overlay-in-hmd
fix -- restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 13:25:44 -08:00 |
|
Ryan Huffman
|
a744e0d11c
|
Merge pull request #9685 from humbletim/21114-part2
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
|
2017-03-07 13:25:25 -08:00 |
|
Brad Hefta-Gaub
|
f7e824e47c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet
|
2017-03-07 12:18:36 -08:00 |
|
Seth Alves
|
aa4cbe2892
|
Merge branch 'fix-tablet-qml-overlay-in-hmd' of github.com:sethalves/hifi into tablet-ui-edit-js
|
2017-03-07 12:10:20 -08:00 |
|
Seth Alves
|
694fc58374
|
restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 12:07:24 -08:00 |
|
Seth Alves
|
b938579598
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 11:42:44 -08:00 |
|
Brad Hefta-Gaub
|
d8b7076a9e
|
Merge pull request #9816 from AndrewMeadows/sphere-means-sphere
ModelEntityItems that use 'sphere' for shapeType should collide as true spheres
|
2017-03-07 09:53:52 -08:00 |
|
Seth Alves
|
f594689fa8
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 09:24:50 -08:00 |
|
sam
|
1b036b7225
|
Implement the ktx keyvalue feature for read and write and use it with gpu::Texture to store meat data required for full serialization
|
2017-03-07 00:58:22 -08:00 |
|
Brad Hefta-Gaub
|
87934ee82d
|
fix bugs in some meshes
|
2017-03-06 21:50:32 -08:00 |
|
Atlante45
|
ff9d6d657c
|
Remove weighted offset, special case downward pressure
|
2017-03-06 19:41:08 -08:00 |
|
samcake
|
c267b5cd09
|
Adding KeyValues read/write, work in progress
|
2017-03-06 18:26:31 -08:00 |
|
Dante Ruiz
|
5156564f04
|
cant call gotohomescreen when tablet is closed
|
2017-03-07 00:53:36 +00:00 |
|
Thijs Wenker
|
2f51e63554
|
Since the deck is currently only capable of handling one clip, add temporary _length reset in FIXME section
|
2017-03-07 01:29:20 +01:00 |
|
Zach Pomerantz
|
170df4a1f4
|
Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27
|
2017-03-06 17:14:11 -07:00 |
|
Andrew Meadows
|
d749c0c8be
|
use fabsf() rather than fabs()
|
2017-03-06 15:50:32 -08:00 |
|
Brad Davis
|
8782fe1d93
|
Merge branch 'master' into smarter_textures
Conflicts:
libraries/model-networking/src/model-networking/TextureCache.cpp
|
2017-03-06 15:29:41 -08:00 |
|
Andrew Meadows
|
10b3e7fc67
|
sphere shapeType for models means 'sphere'
|
2017-03-06 15:14:51 -08:00 |
|
Zach Fox
|
5223f872c1
|
Merge pull request #9753 from zfox23/FB_3234_TakeTwo
Optimize AvatarMixer with respect to Identity and Avatar Data
|
2017-03-06 13:37:29 -08:00 |
|
Andrew Meadows
|
1b8f6b9835
|
Merge pull request #9784 from samcake/blue
Fixing Emissive on overlay for models (opaque and transparent)
|
2017-03-06 13:24:00 -08:00 |
|
Brad Hefta-Gaub
|
f27475613f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet
|
2017-03-06 12:53:59 -08:00 |
|
samcake
|
21f36d7212
|
removing comments and restoring the correct behavior for Pal.js
|
2017-03-06 12:41:00 -08:00 |
|
ZappoMan
|
faba160331
|
more CR feedback
|
2017-03-06 11:10:04 -08:00 |
|
Seth Alves
|
08e2e421e4
|
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
|
2017-03-06 11:08:27 -08:00 |
|
Seth Alves
|
4b02e550db
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-06 11:07:12 -08:00 |
|
Andrew Meadows
|
6ea6477c73
|
Merge pull request #9683 from jherico/cache_flush
Clear caches on domain switch
|
2017-03-06 11:05:44 -08:00 |
|
ZappoMan
|
af97e9bdd9
|
CR feedback
|
2017-03-06 10:49:38 -08:00 |
|
Zach Fox
|
718ecea404
|
Potential non-spammy solution using pseudo-state
|
2017-03-06 10:03:41 -08:00 |
|
Zach Fox
|
cfb8534d71
|
Comment
|
2017-03-06 10:03:41 -08:00 |
|
Zach Fox
|
c9c07c4269
|
Basically rebase and squash
|
2017-03-06 10:03:41 -08:00 |
|
Seth Alves
|
93246b24b0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-06 08:54:49 -08:00 |
|
ZappoMan
|
2a663cbcb1
|
cleanup
|
2017-03-05 19:28:15 -08:00 |
|
ZappoMan
|
87bcced409
|
cleanup use of triangleSet for picking
|
2017-03-05 19:23:55 -08:00 |
|
sam
|
cffd838d1d
|
merging with master
|
2017-03-05 12:57:13 -08:00 |
|
ZappoMan
|
32add6635d
|
checkpoint on reducing raypicking recalcs
|
2017-03-04 23:33:17 -08:00 |
|
Ken Cooke
|
a5571bd49d
|
redo unsafe optimization
|
2017-03-04 16:02:39 -08:00 |
|
Ken Cooke
|
44c1f8500d
|
redo unsafe optimization
|
2017-03-04 15:55:53 -08:00 |
|
Ken Cooke
|
0bababf1f5
|
Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128
|
2017-03-04 14:53:07 -08:00 |
|
ZappoMan
|
9908723bb9
|
fist cut at basic TriangleSet class
|
2017-03-03 22:27:38 -08:00 |
|
Bradley Austin Davis
|
9051c84b6d
|
Fix warnings
|
2017-03-03 14:16:27 -08:00 |
|
Bradley Austin Davis
|
de564d92b9
|
Fix KTX compile errors
|
2017-03-03 13:23:13 -08:00 |
|
David Rowe
|
6403e51d20
|
Merge branch 'tablet-ui-edit-js' into 21199
|
2017-03-04 09:00:49 +13:00 |
|
Bradley Austin Davis
|
ce9d637b3f
|
Expose ASW activation status, provide normalized present rate information
|
2017-03-03 10:46:05 -08:00 |
|
samcake
|
67d14230c5
|
Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown
|
2017-03-03 10:14:04 -08:00 |
|
Anthony J. Thibault
|
45febe8565
|
Merge branch 'master' into feature/fingers-on-tablet
|
2017-03-03 09:04:43 -08:00 |
|
Seth Alves
|
40caa1ea49
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-03 09:01:57 -08:00 |
|
Bradley Austin Davis
|
47087add15
|
Add support for fallback textures, throttling texture creation
|
2017-03-03 09:00:12 -08:00 |
|
Bradley Austin Davis
|
8db74413fd
|
Fix comment in GLBackend
|
2017-03-03 09:00:12 -08:00 |
|
Bradley Austin Davis
|
efad7da508
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2017-03-03 08:59:24 -08:00 |
|
David Rowe
|
854292b193
|
Merge branch 'tablet-ui-edit-js' into 21199
|
2017-03-03 17:51:12 +13:00 |
|
Seth Alves
|
807e15ade9
|
Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2
avoid animation blending for other avatars
|
2017-03-02 18:37:18 -08:00 |
|
Seth Alves
|
5f570c1ba8
|
fix up bounds handling in Line3DOverlay
|
2017-03-02 16:16:48 -08:00 |
|
Seth Alves
|
6a4d477381
|
fix up bounds handling in Line3DOverlay
|
2017-03-02 16:15:41 -08:00 |
|
Anthony J. Thibault
|
bc256f3e8f
|
Fix for multi-threaded access to maps in DebugDraw.
|
2017-03-02 14:42:06 -08:00 |
|
Zach Pomerantz
|
6a7ee4321b
|
suppress logs for file_cache
|
2017-03-02 13:30:51 -05:00 |
|
Seth Alves
|
cf37845f9e
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-02 10:06:38 -08:00 |
|
Zach Pomerantz
|
cca1f2fb25
|
include <atomic> in FileCache
|
2017-03-02 11:28:49 -05:00 |
|
Dante Ruiz
|
ea804578ce
|
Merge branch 'master' into menuFix
|
2017-03-02 16:06:32 +00:00 |
|
Andrew Meadows
|
a55ab94cd9
|
other avatars use jointData no Rig animation
|
2017-03-02 07:52:02 -08:00 |
|
ZappoMan
|
9e71801ae1
|
remove properties from RayToEntityIntersectionResult
|
2017-03-01 18:21:04 -08:00 |
|
Stephen Birarda
|
b586926d09
|
Merge pull request #9755 from birarda/master
increase max renderable web entity FPS to 30 for Youtube.com
|
2017-03-01 18:09:16 -08:00 |
|
Zach Pomerantz
|
1425eb0936
|
Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27
|
2017-03-01 21:01:37 -05:00 |
|