Commit graph

64619 commits

Author SHA1 Message Date
Andrew Meadows
2b1b75450d fix assert 2018-02-13 08:57:20 -08:00
Andrew Meadows
d59c3898dc add 'workload' logging profile 2018-02-13 08:57:20 -08:00
Andrew Meadows
cfb64ad693 add LoggingCategory data member to JobContext 2018-02-13 08:57:20 -08:00
Andrew Meadows
342ba5f8aa add 'task' lib dependency to HMD plugins 2018-02-13 08:57:20 -08:00
Andrew Meadows
724e2f7e66 add CMakeLists.txt for new 'task' library 2018-02-13 08:56:11 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
Andrew Meadows
955af21aba use explicit cast to avoid windows warning 2018-02-13 08:54:44 -08:00
Andrew Meadows
a8ad846f2b cleanup 2018-02-13 08:54:44 -08:00
Andrew Meadows
be38a4bc71 creating workload lib 2018-02-13 08:54:44 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
John Conklin II
3377aaceea
Merge pull request #12343 from NissimHadar/saveSnapshotWithName
Added option to select snapshot filename in scripts.
2018-02-12 15:22:04 -08:00
Atlante45
94973fa1d0 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-02-12 15:21:01 -08:00
Cain Kilgore
d1ecc85fb3 Merge branch 'master' of https://github.com/highfidelity/hifi into 21668 2018-02-12 23:19:20 +00:00
Cain Kilgore
5048bf16cb Fixed Async Prompts/Assets/Dialogs 2018-02-12 23:01:19 +00:00
John Conklin II
92b60fdd9c
Merge pull request #12383 from highfidelity/RC63.4
HOTFIX 63.4
2018-02-12 14:57:24 -08:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow
Shadow performance / acnee improvements
2018-02-12 14:41:13 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
Misc bug fixes
2018-02-12 14:31:38 -08:00
SamGondelman
ad40961864 fix tangents (I think), update material rendering when transform changes 2018-02-12 13:46:27 -08:00
Atlante45
e15ab2ca6c CR 2018-02-12 13:32:48 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
Stephen Birarda
f95893f070 updates to electron-packager and node-notifier for CVEs 2018-02-12 11:09:10 -08:00
Dante Ruiz
1a25332575 fix indenting 2018-02-12 10:59:25 -08:00
Dante Ruiz
3c84318918 fixing merge conflict 2018-02-12 10:57:55 -08:00
Dante Ruiz
d381beb213 cleaning up code 2018-02-12 10:53:42 -08:00
samcake
bc51f3643d Adding a check for item existence before calling the update on the render::Item 2018-02-12 10:21:50 -08:00
Bradley Austin Davis
f6fbac25b0 Prevent deadlock crashes when building shaders at startup 2018-02-12 09:49:28 -08:00
Bradley Austin Davis
4bb329696a Don't trigger a backtrace exception on quitting while in HMD 2018-02-12 08:49:20 -08:00
Bradley Austin Davis
288443d74b Fix for deadlock triggering while loading QML engine 2018-02-12 08:49:10 -08:00
David Back
dc92250b1a change var names 2018-02-09 17:37:53 -08:00
David Back
ff0b632978 get avatars in range 2018-02-09 17:37:30 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests
Fix shared unit tests
2018-02-09 17:18:35 -08:00
Dante Ruiz
5325b22b01 working on lambdas 2018-02-09 16:46:11 -08:00
John Conklin II
a961021101
Merge pull request #12378 from druiz17/save-avatarUrl
save avatarUrl when setting new skeletonModelUrl
2018-02-09 16:04:35 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2
Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 15:51:46 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
Dante Ruiz
fccb4297f7
Merge pull request #12379 from samcake/pastel
fixing the scattering bad ambient lighting
2018-02-09 13:55:42 -08:00
ZappoMan
0ed3a18118 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-09 13:24:31 -08:00
David Back
7bcfd0cf8d
Merge pull request #12114 from dback2/polymaterials
Additional mtl spec support & fixes for Poly & more
2018-02-09 13:18:14 -08:00
John Conklin II
64c5b883b1
Merge pull request #12243 from RebeccaStankus/log-filtering
Some improvements to the log window
2018-02-09 12:50:49 -08:00
John Conklin II
1d0e358246
Merge pull request #12234 from dback2/newEditGrab
New Edit Selected Entity Manipulation Handles
2018-02-09 12:23:34 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars,
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
John Conklin II
02e9bd4fbc
Merge pull request #12348 from druiz17/fix-lasers-going-to-origin
Fix lasers going to origin when trying to far grab.
2018-02-09 11:48:00 -08:00
Atlante45
46449256ce CR 2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00
samcake
e64c029424 fixing the scattering bad ambient lighting 2018-02-09 11:32:29 -08:00
Dante Ruiz
b3a3d92131 Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-02-09 10:31:43 -08:00
Bradley Austin Davis
7102cf44b8 Fixing merge errors 2018-02-09 10:30:57 -08:00
Bradley Austin Davis
dbc4b1533d Fixing build warnings in minipromises 2018-02-09 10:12:32 -08:00
Dante Ruiz
beb41495d5 save avatarUrl when setting new skeletonModelUrl 2018-02-09 09:35:24 -08:00
Sam Gateau
047d24fe5e
Merge pull request #12340 from jherico/fix/shader_length
Fix overlimit shader char strings
2018-02-09 09:31:15 -08:00