samcake
|
916d8c4522
|
merging with upstream master, adjusting to the new Task constructor
|
2018-04-16 13:24:53 -07:00 |
|
samcake
|
b32be91bb1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-16 13:22:58 -07:00 |
|
Sam Gateau
|
19aa49832b
|
Merge pull request #12750 from SamGondelman/androidPrimitives
Forward pipelines for primitives
|
2018-04-16 11:18:56 -07:00 |
|
John Conklin II
|
5705bac87f
|
Merge pull request #12723 from ctrlaltdavid/21801
HMD API JSDoc
|
2018-04-16 11:12:26 -07:00 |
|
samcake
|
c18cee9862
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-16 10:38:06 -07:00 |
|
Sam Gateau
|
4041894fc5
|
Merge pull request #12902 from samcake/workload
Workload: merging with master
|
2018-04-16 10:25:31 -07:00 |
|
Sam Gateau
|
3ac4a1db2d
|
Merge pull request #12850 from SimonWalton-HiFi/early-trace
Enable Interface tracing from earliest execution point
|
2018-04-16 10:24:55 -07:00 |
|
samcake
|
5d34329873
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-16 09:21:26 -07:00 |
|
samcake
|
67c72497f7
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-04-16 09:19:07 -07:00 |
|
Ken Cooke
|
3630198c27
|
Merge pull request #12886 from kencooke/audio-gverb-deadcode
Remove dead code
|
2018-04-16 08:20:38 -07:00 |
|
Seth Alves
|
7f285c5f90
|
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
Fix unprotected tree traversals
|
2018-04-14 14:33:25 -07:00 |
|
Sam Gateau
|
2d6bddf5d2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-13 19:27:55 -07:00 |
|
Sam Gondelman
|
7c65c9c444
|
Merge pull request #12888 from SamGondelman/statsAssert
Rollback some recent QML changes on Android
|
2018-04-13 16:35:28 -07:00 |
|
John Conklin II
|
6def70791e
|
Merge pull request #12864 from sethalves/backtrace-annotations
switch to backtrace's newer crashpad blob
|
2018-04-13 15:34:05 -07:00 |
|
samcake
|
1cd662acdb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-13 14:43:11 -07:00 |
|
SamGondelman
|
8005547d03
|
rollback some qml changes on android
|
2018-04-13 14:28:00 -07:00 |
|
Anthony Thibault
|
f2c38a77a6
|
Merge pull request #12877 from hyperlogic/bug-fix/avatar-recording-mtu-overflow
Fix for avatar recording playback on avatars with many joints
|
2018-04-13 14:26:32 -07:00 |
|
John Conklin II
|
08ca30cf43
|
Merge pull request #12870 from druiz17/fix-grab-js
fix grab.js unable to grab other entities
|
2018-04-13 12:17:46 -07:00 |
|
John Conklin II
|
008c7be369
|
Merge pull request #12787 from druiz17/fix-offscreen-windows
hide desktop windows when switching into HMD mode
|
2018-04-13 12:17:15 -07:00 |
|
Melissa Brown
|
fd7b3b75f9
|
Merge pull request #12884 from Atlante45/fix/build-instructions
Update docs with correct qt version
|
2018-04-13 11:12:06 -07:00 |
|
Ken Cooke
|
ee6e9ee81e
|
Remove dead code left over from Gverb
|
2018-04-13 10:36:13 -07:00 |
|
samcake
|
ff93be80f5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-13 08:49:40 -07:00 |
|
Ken Cooke
|
a5feb07bdf
|
Merge pull request #12863 from kencooke/audio-gainadj-stereo
Support per-avatar gain adjustment on stereo input streams
|
2018-04-13 06:52:54 -07:00 |
|
Sam Gateau
|
79e92a52ea
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-12 23:51:23 -07:00 |
|
Seth Alves
|
3830f65df5
|
Merge pull request #12875 from druiz17/update-baking-tools
Update baking script to include skyboxes.
|
2018-04-12 19:46:46 -07:00 |
|
John Conklin II
|
98f6899c3d
|
Merge pull request #12839 from SamGondelman/matMigrate
Migrate materials from userData to materialData
|
2018-04-12 18:24:33 -07:00 |
|
Sam Gateau
|
27e728ff67
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-12 18:11:18 -07:00 |
|
John Conklin II
|
fc487ea322
|
Merge pull request #12831 from ctrlaltdavid/21829
Model overlay fixes
|
2018-04-12 17:04:55 -07:00 |
|
Simon Walton
|
76468f7f26
|
Use existing DISABLE_WATCHDOG global to turn off thread entirely
|
2018-04-12 16:58:13 -07:00 |
|
John Conklin II
|
ec10fcb7b7
|
Merge pull request #12868 from SamGondelman/missingAlpha
Fix for missing alpha on server restart
|
2018-04-12 16:42:34 -07:00 |
|
John Conklin II
|
5322195eee
|
Merge pull request #12867 from ctrlaltdavid/21836-a
Fix location.protocol value for serverless domains
|
2018-04-12 16:28:31 -07:00 |
|
Clement
|
157ca8cd68
|
Update docs with correct qt version
|
2018-04-12 16:21:26 -07:00 |
|
John Conklin II
|
3d90f93cf1
|
Merge pull request #12812 from SamGondelman/compression
Support ETC2/EAC compressed textures
|
2018-04-12 16:04:08 -07:00 |
|
Andrew Meadows
|
1e82a952b1
|
Merge pull request #12882 from samcake/workload
Workload: merging upstream master back
|
2018-04-12 15:49:32 -07:00 |
|
samcake
|
39d67517fb
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-04-12 15:45:50 -07:00 |
|
samcake
|
bfdde6513f
|
Mergin with master
|
2018-04-12 15:45:27 -07:00 |
|
Sam Gateau
|
3f45f091fc
|
Merge pull request #12880 from AndrewMeadows/more-correct-stats
workload: more correct stats names
|
2018-04-12 15:35:20 -07:00 |
|
John Conklin II
|
67a8e6c82e
|
Merge pull request #12824 from SamGondelman/matFix
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
|
2018-04-12 15:30:11 -07:00 |
|
John Conklin II
|
9123c05eb3
|
Merge pull request #12859 from samcake/one
Fix a bug when switching shadow on/off in front of mirror
|
2018-04-12 15:25:05 -07:00 |
|
Anthony J. Thibault
|
da319b9af6
|
Changed version constants into a enum class, to fix macosx warnings.
|
2018-04-12 15:09:01 -07:00 |
|
Andrew Meadows
|
6633304773
|
fix typo
|
2018-04-12 15:02:24 -07:00 |
|
John Conklin II
|
40ae2913eb
|
Merge pull request #12847 from SamGondelman/clientMat
Fix client-only materials on non-avatars
|
2018-04-12 14:53:34 -07:00 |
|
Andrew Meadows
|
d553f85e83
|
adding pickManager and pointerManager to stat summary
|
2018-04-12 14:23:48 -07:00 |
|
Andrew Meadows
|
060c391d47
|
more correct stat names
|
2018-04-12 14:23:48 -07:00 |
|
Andrew Meadows
|
df98758366
|
Merge pull request #12878 from samcake/workload
Workload: updating with upstream master
|
2018-04-12 14:20:52 -07:00 |
|
Stephen Birarda
|
e2e0a50dd2
|
Merge pull request #12879 from highfidelity/RC66
RC66 merge back to master
|
2018-04-12 14:12:59 -07:00 |
|
Ken Cooke
|
2593d224c5
|
CR feedback
|
2018-04-12 13:24:31 -07:00 |
|
John Conklin II
|
1834325970
|
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by
set lastEditedBy in local tree whenever a script adds or edits an entity
|
2018-04-12 13:02:05 -07:00 |
|
John Conklin II
|
9ccf23ec94
|
Merge pull request #12866 from birarda/serverless-baked-skybox
RC66: use serverless content with baked skybox and help textures
|
2018-04-12 12:54:37 -07:00 |
|
samcake
|
e2f9eef5e2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-12 12:27:27 -07:00 |
|