Zach Fox
|
ee9519bf1b
|
Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018
|
2018-04-16 10:12:34 -07:00 |
|
Zach Fox
|
071bf35683
|
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
|
2018-04-16 10:11:44 -07:00 |
|
John Conklin II
|
40e34f578a
|
Merge pull request #12891 from samcake/rc66-backToFXAA
RC66: Reverting TAA to FXAA in rc66 until we fix the aa on tablet
|
2018-04-16 09:57:39 -07:00 |
|
John Conklin II
|
fbb7138e6c
|
Merge pull request #12896 from hyperlogic/bug-fix/reduce-elbow-flapping-rc66
RC66: Reduce avatar elbow fluttering by disabling pole vectors
|
2018-04-16 09:56:59 -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 |
|
David Rowe
|
06bb873e8d
|
Include JSDoc Web pages in the install
|
2018-04-16 16:08:26 +12:00 |
|
Anthony J. Thibault
|
63ee8c0ccb
|
Fix for character walk animations in desktop mode.
(cherry picked from commit f19b1d9890)
|
2018-04-15 19:51:55 -07:00 |
|
Anthony J. Thibault
|
f4096c3931
|
Disable elbow pole vectors, solve from joint limit centers.
(cherry picked from commit 69f462baeb)
|
2018-04-15 19:51:26 -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 |
|
David Rowe
|
df31d20430
|
Fix overlay toggling
|
2018-04-14 17:06:34 +12:00 |
|
Simon Walton
|
b469cdfda2
|
More shaders to deferred compile scheme
|
2018-04-13 17:52:33 -07:00 |
|
samcake
|
8e7b9dfa2b
|
Reverting TAA to FXAA in rc66 until we fix the aa on tablet
|
2018-04-13 17:30:30 -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 |
|
Simon Walton
|
1ab31d9116
|
Defer some shader compilation to a batch job - WIP
|
2018-04-13 15:38:48 -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 |
|
John Conklin II
|
3982472cf2
|
Merge pull request #12851 from druiz17/rc66-spwan-fix
serverless-domain named landing-points(RC66)
|
2018-04-13 14:58:36 -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
|
2b9cf829a2
|
Merge pull request #12887 from samcake/rc66
RC66: Exposing more texture memory budget options
|
2018-04-13 13:33:46 -07:00 |
|
Dante Ruiz
|
159d10c054
|
Merge pull request #13 from sethalves/serverless-domain-named-paths
code review
|
2018-04-13 13:22:44 -07:00 |
|
Seth Alves
|
426d18ed2a
|
code review
|
2018-04-13 13:20:06 -07:00 |
|
samcake
|
b88b668a06
|
Exposing more texture memory budget options
|
2018-04-13 12:19:53 -07:00 |
|
samcake
|
e6085a90d6
|
Exposing more texture memory budget options
|
2018-04-13 12:17:50 -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 |
|
Dante Ruiz
|
1a0f40d070
|
Merge pull request #12 from sethalves/serverless-domain-named-paths
code review
|
2018-04-13 11:04:23 -07:00 |
|
Seth Alves
|
0e081a3944
|
code review
|
2018-04-13 10:42:22 -07:00 |
|
Ken Cooke
|
ee6e9ee81e
|
Remove dead code left over from Gverb
|
2018-04-13 10:36:13 -07:00 |
|
Dante Ruiz
|
cadfc8bdbb
|
Merge branch 'RC66' of github.com:highfidelity/hifi into rc66-spwan-fix
|
2018-04-13 09:09:21 -07:00 |
|
Dante Ruiz
|
e839a15f03
|
Merge pull request #11 from sethalves/serverless-domain-named-paths
code review
|
2018-04-13 09:07:05 -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 |
|
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 |
|
Seth Alves
|
a56f3f4a10
|
code review
|
2018-04-12 19:06:12 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
John Conklin II
|
e47dca77ec
|
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
entity-server will expire stale simulation ownership
|
2018-04-12 12:04:52 -07:00 |
|