Jeff Clinton
|
870619b19d
|
Merge pull request #14412 from amantley/avatarPipelineOffsets
Avatar Pipeline Joint Rotation Offsets Handling
|
2018-11-19 08:54:29 -08:00 |
|
Alexander Ivash
|
64d05e33c1
|
second attempt to fix all other shutdown QML warnings at once
|
2018-11-18 00:24:45 +05:30 |
|
Sam Gateau
|
837b321004
|
merging with master
|
2018-11-17 10:35:05 -08:00 |
|
Seth Alves
|
b72f462028
|
Merge pull request #14406 from danteruiz/master-disable-interstitial
disable interstitial for master
|
2018-11-16 20:13:50 -08:00 |
|
Sam Gateau
|
5f062bbcf5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-11-16 20:05:08 -08:00 |
|
Simon Walton
|
3baebf55c5
|
Don't enforce key presence in models.json
|
2018-11-16 17:33:13 -08:00 |
|
Jason Najera
|
da3ea682ba
|
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2
MS19550 - Don't show help for HMDs that aren't plugged in and active
|
2018-11-16 15:49:46 -08:00 |
|
sam gateau
|
9dd6c8d9d9
|
Merge branch 'master' of github.com:highfidelity/hifi into one
|
2018-11-16 11:55:44 -08:00 |
|
Sam Gondelman
|
968ffe7ec3
|
Merge branch 'master' into branching
|
2018-11-16 10:25:02 -08:00 |
|
Seth Alves
|
d19cdc62d7
|
Merge pull request #14135 from ElderOrb/FB18573
FB18573 - Other avatars' avatar entities may appear to be successfull…
|
2018-11-16 10:05:22 -08:00 |
|
Sam Gateau
|
0166d7748a
|
Merging with master around rc76 cut time
|
2018-11-15 22:52:37 -08:00 |
|
r3tk0n
|
34224c4f16
|
Fix XBox One controller detection.
|
2018-11-15 14:08:21 -08:00 |
|
John Conklin II
|
60c538309a
|
Merge pull request #14411 from SamGondelman/fading
Fix for avatar flashing on fade out
|
2018-11-15 13:58:43 -08:00 |
|
John Conklin II
|
83660ab8e1
|
Merge pull request #14128 from Zvork/ao
Improved Ambient Occlusion
|
2018-11-15 13:57:13 -08:00 |
|
John Conklin II
|
8177d5bbcd
|
Merge pull request #14275 from Atlante45/fix/injector-crash
Rework audio data memory ownership model to fix injector crashes
|
2018-11-15 13:25:42 -08:00 |
|
amantley
|
3bf4a7844d
|
moved the jointrotationoffsets to hfmModel.h from fbx.h
|
2018-11-15 10:56:17 -08:00 |
|
SamGondelman
|
597ff773e1
|
fix for avatar flashing
|
2018-11-15 10:52:22 -08:00 |
|
amantley
|
f9829c270d
|
merged new fbx.h
|
2018-11-15 10:19:04 -08:00 |
|
amantley
|
c8cd65c3bd
|
added getter for the orginal cluster bind matrix values in AnimSkeleton
|
2018-11-15 09:58:10 -08:00 |
|
Olivier Prat
|
0401858129
|
Cleaned up do_draw in GLESBackend
|
2018-11-15 18:34:41 +01:00 |
|
Olivier Prat
|
ed42c94772
|
Merge branch 'master' of http://github.com/highfidelity/hifi into ao
|
2018-11-15 17:55:29 +01:00 |
|
Sam Gondelman
|
a5fe4709a9
|
Update Fade.slh
|
2018-11-14 17:50:21 -08:00 |
|
amantley
|
80ebde1036
|
started cleanup of pr
|
2018-11-14 17:27:45 -08:00 |
|
Sam Gondelman
|
a206d9e25a
|
Merge branch 'master' into branching
|
2018-11-14 17:08:08 -08:00 |
|
amantley
|
8256c652fc
|
added the hook to put the copy of the mutated bind poses into tthe skeleton
|
2018-11-14 17:02:25 -08:00 |
|
Atlante45
|
31033ad685
|
Update TTS audio API use
|
2018-11-14 15:42:39 -08:00 |
|
Brad Davis
|
b7c567af08
|
Fix procedurals using the iGlobalTime input
|
2018-11-14 15:28:22 -08:00 |
|
Dante Ruiz
|
f17723c216
|
disable interstitial for master
|
2018-11-14 14:50:38 -08:00 |
|
SamGondelman
|
8dbb2d806b
|
local entities are always collisionless
|
2018-11-14 14:48:07 -08:00 |
|
Clement
|
d2a1bb4806
|
CR
|
2018-11-14 14:46:08 -08:00 |
|
Clement
|
7192aed131
|
Rework audio data memory ownership model
|
2018-11-14 14:45:18 -08:00 |
|
Seth Alves
|
1593c1185a
|
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
|
2018-11-14 12:29:09 -08:00 |
|
SamGondelman
|
079d1dcbd6
|
convert clientOnly to entityHost and add local entities
|
2018-11-14 11:25:37 -08:00 |
|
John Conklin II
|
92a23ec0a9
|
Merge pull request #14294 from SimonWalton-HiFi/max-json-size
Allow for large Models.json file
|
2018-11-14 11:20:35 -08:00 |
|
sabrina-shanman
|
2d30902813
|
Fix OBJBaker not setting combineParts
|
2018-11-14 09:11:56 -08:00 |
|
Olivier Prat
|
85a3938cbe
|
Switch to app for ambient occlusion debug script
|
2018-11-14 11:55:11 +01:00 |
|
Olivier Prat
|
45e0f65972
|
Merge branch 'ao' of http://github.com/Zvork/hifi into ao
|
2018-11-14 09:48:24 +01:00 |
|
Simon Walton
|
452c212c4f
|
Add Paths entry parsing to json parser
|
2018-11-13 17:58:12 -08:00 |
|
Simon Walton
|
82e21e89e4
|
Merge remote-tracking branch 'upstream/master' into max-json-size
|
2018-11-13 17:26:20 -08:00 |
|
sabrina-shanman
|
e08bc7296f
|
Merge branch 'master' into hfm_serializer
|
2018-11-13 15:41:49 -08:00 |
|
John Conklin II
|
79e67ad45f
|
Merge pull request #14238 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
|
2018-11-13 15:07:21 -08:00 |
|
Sam Gondelman
|
13f650d514
|
Merge pull request #14093 from SamGondelman/police
Case 19409, Case 19468: Fading fixes and shader cleanup
|
2018-11-13 15:00:23 -08:00 |
|
Jeff Clinton
|
6c90d7ed11
|
Merge pull request #14343 from ElderOrb/FB19514
FB19514 - Interface crashes on attempt to apply new animation url via…
|
2018-11-13 14:59:50 -08:00 |
|
Simon Walton
|
167a8fdc04
|
Merge branch 'master' into max-json-size
|
2018-11-13 14:57:06 -08:00 |
|
amantley
|
a8d7b0503d
|
removed more cruft
|
2018-11-13 14:24:18 -08:00 |
|
Simon Walton
|
a65466f154
|
Use traditional C strings rather than raw strings
|
2018-11-13 13:33:36 -08:00 |
|
Brad Hefta-Gaub
|
bb2239c0bd
|
Merge pull request #14359 from howard-stearns/no-url-logging
remove urls from logs in Interface
|
2018-11-13 13:19:30 -08:00 |
|
John Conklin II
|
7e7817212c
|
Merge pull request #14321 from jherico/fix/19256
Case 19256: Switch back to Qt for GL context creation by default
|
2018-11-13 13:14:22 -08:00 |
|
Brad Davis
|
099ffa23ec
|
PR feedback
|
2018-11-13 12:19:20 -08:00 |
|
amantley
|
c80ade98ec
|
cleaned up white space
|
2018-11-13 12:10:10 -08:00 |
|
Brad Hefta-Gaub
|
153b8920be
|
Merge pull request #14348 from sabrina-shanman/hfm_library
(case 19302) Create the HFM library and namespace
|
2018-11-13 12:03:53 -08:00 |
|
Brad Hefta-Gaub
|
6e2024350d
|
Merge pull request #14282 from gcalero/android_new_login
Change Android login flow (MS case 19470)
|
2018-11-13 12:02:10 -08:00 |
|
amantley
|
f83edf4b7f
|
joint offsets working. reset working. to do: handling extra joints
|
2018-11-13 11:29:01 -08:00 |
|
Brad Hefta-Gaub
|
4bafcd2cfa
|
Merge pull request #14271 from SamGondelman/oculus
Case 19475: Fix various Oculus Store test failures
|
2018-11-13 11:06:39 -08:00 |
|
Howard Stearns
|
938b45d3da
|
more removal
|
2018-11-13 11:05:45 -08:00 |
|
Howard Stearns
|
ad7266062d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-13 10:33:27 -08:00 |
|
Simon Walton
|
df2bc6ba5c
|
Remove unused function
|
2018-11-13 10:18:30 -08:00 |
|
John Conklin II
|
85e5c1d6ef
|
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations
Send avatar-joint translations at world scale
|
2018-11-13 10:04:30 -08:00 |
|
Howard Stearns
|
545b85bc9d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-13 09:55:54 -08:00 |
|
Howard Stearns
|
fc62700587
|
Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging
|
2018-11-13 09:55:09 -08:00 |
|
Gabriel Calero
|
3d4893aba2
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-11-13 10:43:36 -03:00 |
|
Sam Gondelman
|
f68706e72f
|
Merge pull request #14252 from gcalero/enable_aec_by_default
Enabled AEC by default (bug 19210)
|
2018-11-12 16:15:33 -08:00 |
|
sabrina-shanman
|
93c7578f54
|
Convert hfm::Serializer to use hifi-namespaced types
|
2018-11-12 16:12:21 -08:00 |
|
sabrina-shanman
|
5b6e2aae5a
|
Remove/move some unused serializer imports
|
2018-11-12 16:12:21 -08:00 |
|
sabrina-shanman
|
8e0fb0f9c4
|
Remove unused alternate read functions in FBXSerializer
|
2018-11-12 16:12:21 -08:00 |
|
sabrina-shanman
|
f971294d6d
|
Make HFMSerializer return a smart pointer to an HFMModel
|
2018-11-12 16:12:21 -08:00 |
|
sabrina-shanman
|
5a9af5b2c3
|
Correct the folder location in the FBXSerializer header/source top comment
|
2018-11-12 16:12:21 -08:00 |
|
sabrina-shanman
|
baa8cdb054
|
Remove combineParts from the Serializer interface
|
2018-11-12 16:12:21 -08:00 |
|
sabrina-shanman
|
0cbe0bd266
|
Add missing copyright comment and header guard to OBJSerializer.h
|
2018-11-12 16:12:20 -08:00 |
|
sabrina-shanman
|
00f2b4eeb9
|
Make the existing model serializers based on HFMSerializer
|
2018-11-12 16:12:20 -08:00 |
|
sabrina-shanman
|
0271f7d334
|
Create the HFMSerializer interface class
|
2018-11-12 16:12:20 -08:00 |
|
sabrina-shanman
|
83cc90ace0
|
Re-name GLTFReader to GLTFSerializer and do the same for other model readers
|
2018-11-12 16:12:20 -08:00 |
|
Simon Walton
|
6ee837d47c
|
OctreeDataUtils - use new json from DS also; allow upload of large domains
|
2018-11-12 15:43:09 -08:00 |
|
John Conklin II
|
0370c60398
|
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
Case 18436: consistent handling of CapsuleShape dimensions
|
2018-11-12 15:25:42 -08:00 |
|
sabrina-shanman
|
753557736e
|
Merge branch 'master' into hfm_library
|
2018-11-12 15:03:30 -08:00 |
|
amantley
|
bcd651a65d
|
adding the member variable to keep track of the orig bind matrices to fbx.h
|
2018-11-12 14:39:48 -08:00 |
|
amantley
|
3f732baf86
|
Merge remote-tracking branch 'upstream/master' into avatarPipelineOffsets
|
2018-11-12 14:38:17 -08:00 |
|
John Conklin II
|
ec4f2f781d
|
Merge pull request #14352 from Atlante45/feat/solo-source
[master] Add audio soloing feature
|
2018-11-12 14:07:30 -08:00 |
|
Roxanne Skelly
|
762033580d
|
And remove another url log item.
|
2018-11-12 13:48:08 -08:00 |
|
Roxanne Skelly
|
7a14cb1bbc
|
Remove additional url logging message.
|
2018-11-12 13:36:14 -08:00 |
|
SamGondelman
|
df1a848811
|
fix fade out
|
2018-11-12 12:58:40 -08:00 |
|
Howard Stearns
|
66ae01e0c3
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-12 12:55:20 -08:00 |
|
Simon Walton
|
8c347fae70
|
Fixes for domain server use of changed OctreeDataUtils
|
2018-11-12 12:45:01 -08:00 |
|
amantley
|
92befbc5bf
|
implementing backup of cluster matrices
|
2018-11-12 11:12:56 -08:00 |
|
John Conklin II
|
512b847684
|
Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash
AnimDebugDraw: Prevent multi-threaded access to shared map collection.
|
2018-11-12 10:47:01 -08:00 |
|
John Conklin II
|
9d404a6cf3
|
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
|
2018-11-12 10:45:52 -08:00 |
|
John Conklin II
|
33da88f174
|
Merge pull request #14351 from luiscuenca/tweakTransitAnimations
Tweak transit animations
|
2018-11-12 10:39:56 -08:00 |
|
Brad Hefta-Gaub
|
22dd958582
|
Merge pull request #14297 from jherico/feature/vcpkg
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
|
2018-11-12 09:52:02 -08:00 |
|
John Conklin II
|
dc4b967ff5
|
Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position
Clamp avatar-joint translations that hit the compressed-format limit
|
2018-11-11 16:27:56 -08:00 |
|
amantley
|
5bb2378cd9
|
changes to get the engineer working
|
2018-11-09 15:10:14 -08:00 |
|
Zach Fox
|
be5dc36ccd
|
Actually fix build error...hopefully!
|
2018-11-09 14:23:15 -08:00 |
|
SamGondelman
|
1d1510e18e
|
Merge remote-tracking branch 'upstream/master' into police
|
2018-11-09 13:32:41 -08:00 |
|
Jeff Clinton
|
b9c11aad7b
|
Merge pull request #14259 from SamGondelman/webLock
Case 18986: Enable interaction with locked web entity
|
2018-11-09 12:21:13 -08:00 |
|
SamGondelman
|
b3abd97707
|
projected materials and repeat property
|
2018-11-09 10:47:07 -08:00 |
|
Zach Fox
|
df7486d0f5
|
Remove unused variable, fixing unix build warning
|
2018-11-09 10:40:46 -08:00 |
|
Zach Fox
|
5cf2041c65
|
Remove unused variable
|
2018-11-09 10:38:20 -08:00 |
|
Sam Gateau
|
e263776b19
|
Address the mac bug with ResourceBUffer implemented with TBO
|
2018-11-09 13:22:27 -03:00 |
|
Angus Antley
|
fd365b5509
|
added debug print to fbx reader to see if the fst is being read correctly
|
2018-11-09 07:22:36 -08:00 |
|
Angus Antley
|
dce040978c
|
works two joint avatar with luis's new code. remains to do the engineer
|
2018-11-09 01:31:27 -08:00 |
|
Olivier Prat
|
4e89e9ed2a
|
Fixed draw / do_draw in GLBackends
|
2018-11-09 09:58:17 +01:00 |
|