Seth Alves
a3f4aeb182
code review
2017-07-24 19:41:30 -07:00
Seth Alves
d1037a49ae
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-24 19:23:30 -07:00
Stephen Birarda
26be7e1a01
Merge pull request #10999 from birarda/bug/html-path-on-mac-build
...
fix create tab load on OS X
2017-07-24 10:12:40 -07:00
Seth Alves
a1107deef1
cleanups
2017-07-23 08:21:50 -07:00
Seth Alves
47ea32f4d3
vertex color support in ModelScriptingInterface
2017-07-23 08:06:26 -07:00
Seth Alves
6e0394865e
fix bug in getNumElements that kept it from working on buffer-views with a non-zero offset
2017-07-23 08:05:09 -07:00
Seth Alves
6f86b266cb
support writing of vertex colors
2017-07-23 08:04:34 -07:00
Seth Alves
5e04e84953
make OBJ reader able to handle files where some vertices have colors and others don't
2017-07-22 11:57:51 -07:00
Seth Alves
c2667fc89b
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-20 16:34:38 -07:00
Seth Alves
72e5fecb4e
do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex
2017-07-20 16:34:34 -07:00
Clément Brisset
c128a3ff86
Merge pull request #11001 from Atlante45/fix/debug-builds
...
Fix debug builds startup crash
2017-07-20 13:31:55 -07:00
Seth Alves
8a0b43981c
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-20 12:28:58 -07:00
trent
559e2e0ebb
Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex.
2017-07-20 13:09:17 -04:00
trent
ff3e9263ef
Stupid tabs.
2017-07-20 11:40:42 -04:00
trent
d71b0802a7
Added vertex color support to OBJReader.h|cpp.
2017-07-20 11:38:42 -04:00
Stephen Birarda
3936ee93f0
use default scripts path in EditTabView to fix load on OS X
2017-07-19 16:34:04 -07:00
Atlante45
70a5916ef3
Fix debug builds startup crash
2017-07-19 16:18:01 -07:00
Seth Alves
be48268be8
getMeshes handles registration point
2017-07-19 15:02:40 -07:00
Seth Alves
8a732e7d4b
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-19 13:58:07 -07:00
Seth Alves
750b7192af
trying to get the resulting model to line up with the originals
2017-07-19 13:58:03 -07:00
Clément Brisset
d76039387a
Merge pull request #10992 from Atlante45/fix/heap-use-after-free
...
Fix potential data corruption in the FileCache
2017-07-19 10:44:02 -07:00
Seth Alves
a8698c2fbc
EntityScriptingInterface::getMeshes support for Model entities
2017-07-19 08:59:09 -07:00
Andrew Meadows
d48f45f7e6
Merge pull request #10990 from druiz17/bug-help-issue
...
fixed another instance of the tablet getting stuck on the help screen
2017-07-19 08:37:56 -07:00
Andrew Meadows
a069620013
Merge pull request #10970 from Atlante45/feat/ac-shutdown-info
...
AC shutdown info + PPID watcher on Unix
2017-07-19 08:34:45 -07:00
Dante Ruiz
fdfeab77eb
made requested changes
2017-07-19 16:28:16 +01:00
Andrew Meadows
8dafc30bf9
fix debug build: stub pure virtual function
2017-07-18 15:57:00 -07:00
David Kelly
4d4d9421d3
Merge pull request #10983 from davidkelly/dk/marketplaceIDHack
...
Get marketplaceID into imported entities
2017-07-18 15:25:49 -07:00
Atlante45
497fd7f714
Pin File pointer during eject
2017-07-18 13:45:46 -07:00
Chris Collins
e99683fdcf
Merge pull request #10985 from jherico/audio_deadlock
...
Trying to resolve QML / Audio deadlocks
2017-07-18 12:40:03 -07:00
Dante Ruiz
06a69c8bd7
fixed another tablet stuck on help screen
2017-07-18 20:27:55 +01:00
David Kelly
c4d5d16eb3
cr feedback
2017-07-18 11:12:06 -07:00
Andrew Meadows
888f2f64a5
Merge pull request #10981 from druiz17/bug/delete-avatar-entity
...
Fixed not being able to delete avatar entities when switching domains
2017-07-18 10:09:34 -07:00
Clément Brisset
bcc9cf7c60
Merge pull request #10947 from Atlante45/fix/ignore-ac-crash
...
Fix Avatar/Audio Mixer crash
2017-07-18 09:59:30 -07:00
Brad Davis
9f13533560
Ensure input and output device containers are protected by mutex
2017-07-18 08:58:17 -07:00
Dante Ruiz
7fe47e4e2f
Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity
2017-07-18 16:51:41 +01:00
Dante Ruiz
d504000604
made requested changes
2017-07-18 16:51:21 +01:00
Brad Hefta-Gaub
d94365cc44
Merge pull request #10979 from zfox23/hoverOverlay_lasers
...
Create/Destroy Hover Overlays using hand controller lasers
2017-07-18 08:44:48 -07:00
Andrew Meadows
5f4df0da2b
Merge pull request #10847 from AndrewMeadows/entitymap
...
faster EntityItem lookup by EntityItemID
2017-07-18 08:04:37 -07:00
David Kelly
061f084d9f
Get marketplaceID into imported entities
...
Rather than doing this on the backend, we can do it here at the
time we import. Later we will have some support for getting
an entities identity hash and querying the backend to get a
marketplaceID for them as needed. However for now this is enough
to get us moving forward.
2017-07-17 15:08:30 -07:00
Dante Ruiz
21d760a533
make sure to lock data
2017-07-17 22:11:05 +01:00
utkarshgautamnyu
758ae9825d
Merge pull request #10939 from highfidelity/bug/6118
...
Record total number of ATP/HTTP/File bytes downloaded during session
2017-07-17 13:53:21 -07:00
Dante Ruiz
282b364fad
Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity
2017-07-17 21:28:17 +01:00
Dante Ruiz
f6208a394c
delete avatar entity when switching domains
2017-07-17 21:27:55 +01:00
Zach Fox
974dff36b0
Make hover overlays work for hand controller lasers
2017-07-17 13:16:53 -07:00
Zach Fox
aadf407842
Merge pull request #10978 from zfox23/hoverOverlayInterface
...
New HoverOverlayInterface skeleton
2017-07-17 13:16:32 -07:00
Zach Fox
19b42b0180
CR feedback
2017-07-17 13:15:23 -07:00
Zach Fox
4b9797c179
Comment explaining category debugs
2017-07-17 11:35:27 -07:00
Zach Fox
0a4ab23356
Remove unnecessary include
2017-07-17 11:32:47 -07:00
Zach Fox
147474e19a
Logging category and filter
2017-07-17 11:17:59 -07:00
Andrew Meadows
99aad77e53
Merge pull request #10954 from jherico/qml_crashes_again
...
Still trying to address QML crashes
2017-07-17 10:21:23 -07:00
