Sam Gateau
aac49e901b
merging with master (andthe big shader pr)
2018-08-07 09:16:30 -07:00
Sam Gateau
09d33177fc
Adjust Workload and better representation of the workload debuging features
2018-08-06 15:36:25 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts
...
Update shader pipeline, improve mac startup time
2018-08-06 15:30:46 -07:00
Brad Davis
dcdc3a323c
Use defines for packed textures to satisfy both GLES and GL 4.1
2018-08-06 14:35:36 -07:00
Brad Davis
a0ef0c0b13
Fix procedurals
2018-08-06 10:31:14 -07:00
Ken Cooke
496724f0db
formatting cleanup
2018-08-04 20:15:04 -07:00
Ken Cooke
2121e201d5
fix assert when azimuth is negative subnormal
2018-08-04 20:09:27 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac
...
Add DS option to disable HMAC packet authentication
2018-08-03 17:45:32 -07:00
MiladNazeri
a7a8214983
Merge pull request #13637 from ctrlaltdavid/M08513-a
...
Audio API JSDoc
2018-08-03 16:38:03 -07:00
Bradley Austin Davis
fc51b93691
Fix OSX build
2018-08-03 16:15:58 -07:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a
...
Don't allow Web surfaces created by non-client scripts to access files
2018-08-03 15:25:41 -07:00
Brad Davis
a1cd39f4c2
Fix some explicit bindings that should be binding, not location
2018-08-03 14:58:12 -07:00
Brad Davis
6ed7512112
Fix build failures after parabola merge
2018-08-03 14:58:12 -07:00
Brad Davis
df031b5d93
Fix procedural rendering with custom uniforms
2018-08-03 14:58:12 -07:00
Brad Davis
eca803503c
Fix resolution scaling
2018-08-03 14:58:12 -07:00
Brad Davis
8eb97dc79c
PR feedback
2018-08-03 14:58:12 -07:00
Brad Davis
a1a1a03bbc
Fixing crash on exit, deferred debugging tool
2018-08-03 14:58:11 -07:00
Brad Davis
ae8f841912
Shader refactoring for explicit bindings
2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23
Moving to cmake time shader compiling
2018-08-03 14:58:11 -07:00
Brad Davis
d6bcdcde3f
Fix DISABLE_QML behavior
2018-08-03 14:58:11 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent
...
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
2018-08-03 13:32:11 -07:00
David Rowe
fdd6b7e07b
Delete erroneous merge file
2018-08-04 07:29:57 +12:00
David Rowe
2270255d88
JSDoc review
2018-08-04 07:22:12 +12:00
Bradley Austin Davis
8e9c1e5c0a
Fix out of date comment
2018-08-03 11:38:39 -07:00
Sam Gateau
2013f1bd33
Merge pull request #13732 from AndrewMeadows/other-avatar-physics
...
reduce physics simulation cost of other-avatars
2018-08-03 09:33:59 -07:00
David Rowe
32e3bb0e1d
Merge branch 'master' into M08513-a
...
# Conflicts:
# libraries/audio/src/SoundCache.h
2018-08-03 10:29:32 +12:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
...
Enable physics after ES indicates all nearby entities received
2018-08-01 18:15:00 -07:00
Brad Davis
4b317a84d8
Don't allow Web surfaces created by non-client scripts to access files
2018-08-01 15:12:45 -07:00
Andrew Meadows
bd6f00e707
eliminate angular dynamics of other-avatars
2018-08-01 11:58:52 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352
...
Fix HMD.mountedChanged() API signal
2018-08-01 11:28:11 -07:00
Andrew Meadows
c939699879
ignore other-avatar angularVelocity in physics simulation
2018-08-01 11:22:58 -07:00
Andrew Meadows
0d92e2de0a
remove bits from other-avatar collision mask
2018-08-01 11:21:54 -07:00
John Conklin II
c67ef57ad3
Merge pull request #13713 from hyperlogic/bug-fix/leg-ik-bug-fixes-master
...
Leg IK fixes
2018-08-01 11:17:10 -07:00
John Conklin II
7a635b6a57
Merge pull request #13709 from thoys/fix/require-load-queue
...
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
2018-08-01 11:15:32 -07:00
Thijs Wenker
50dfb4dd55
Merge pull request #13681 from ctrlaltdavid/M19690
...
Fix ParticleEffect entity JSDoc
2018-08-01 19:31:54 +02:00
Anthony J. Thibault
fd780845bb
Code review feedback
2018-07-31 18:25:04 -07:00
Simon Walton
ecfba312ef
Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent
2018-07-31 15:54:54 -07:00
Simon Walton
33a46a6a82
Make ThreadedAssignment::setFinished() protected
2018-07-31 15:46:43 -07:00
Simon Walton
64fc3e1091
ThreadedAssignment calls virtual stop() upon domain disconnect
2018-07-31 15:30:33 -07:00
Thijs Wenker
003e826d60
move over definition so it could be linked in the assignment-client too
2018-08-01 00:23:34 +02:00
Simon Walton
a320308eaf
Fix sequence number encoding issue
...
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
2018-07-31 13:54:22 -07:00
Thijs Wenker
74343c71d8
CR fixes
2018-07-31 22:29:53 +02:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963
...
Support rendering of 'about' URLs in web entities
2018-07-31 09:44:31 -07:00
Seth Alves
1b47d3f274
Merge pull request #13717 from highfidelity/revert-13577-invisibleWebEntities
...
Revert "Allow empty web entities to be rendered"
2018-07-30 15:24:17 -07:00
John Conklin II
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent
...
MS15184: Remove deprecated functions in Agent API
2018-07-30 14:48:10 -07:00
David Rowe
b36b981b55
Merge branch 'master' into M19690
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
2018-07-31 08:41:32 +12:00
Anthony J. Thibault
58f95bd07b
assert fix
2018-07-30 13:14:32 -07:00
Brad Davis
c991053c93
Support rendering of 'about' URLs in web entities
2018-07-30 11:56:31 -07:00
Seth Alves
a6aaa71d02
Revert "Allow empty web entities to be rendered"
2018-07-30 11:54:52 -07:00
