Bradley Austin Davis
|
5416de9a02
|
Merge pull request #13951 from jherico/feature/spirv
Bug 15087: Updating our shader tool chain to enable SPIRV optimization
|
2018-10-23 13:27:49 -07:00 |
|
tapalisa
|
7a684081f0
|
Merge pull request #14235 from huffman/feat/edit-copy-paste
Add copy/paste functionality to edit.js
|
2018-10-23 13:18:12 -07:00 |
|
Brad Hefta-Gaub
|
447bfae828
|
Merge pull request #13884 from ctrlaltdavid/M17853
Highlight tablet when it is near-grabbable
|
2018-10-23 12:31:41 -07:00 |
|
Howard Stearns
|
93fde18b3e
|
Merge pull request #14258 from highfidelity/revert-13401-better_imports_for_controls_and_styles
Revert "Better imports for controls and styles"
|
2018-10-23 12:05:32 -07:00 |
|
Brad Hefta-Gaub
|
405b1d5725
|
Revert "Better imports for controls and styles"
|
2018-10-23 10:58:28 -07:00 |
|
Stephen Birarda
|
b007e4d874
|
Merge pull request #14049 from birarda/security-vuln
update some server console dependencies after npm audit
|
2018-10-23 10:45:54 -07:00 |
|
Brad Davis
|
5a43462218
|
Remove unneeded shader directive
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
dd97c4fcd2
|
Fix shadergen parallelism
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
85b92a372d
|
Don't use optimized GLSL on android for now
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
4cf4a5582d
|
Fix Android build on Windows hosts
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
3f2f5b18ec
|
Reimplement procedural uniforms without extension requirements
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
c8e664a0a1
|
New SPIRV Shader toolchain
|
2018-10-23 10:40:12 -07:00 |
|
Brad Davis
|
8ce2081349
|
Add python discovery
|
2018-10-23 10:40:10 -07:00 |
|
Sam Gateau
|
dc150add71
|
Merge pull request #14257 from jherico/fix/uniforms_again
Bug 19488: Fix access to uniforms at index 0
|
2018-10-23 10:00:51 -07:00 |
|
Brad Davis
|
339b25a362
|
Fix access to uniforms at index 0
|
2018-10-23 08:36:18 -07:00 |
|
Brad Hefta-Gaub
|
e125107a9f
|
Merge pull request #14248 from FlameSoulis/fix/eslint
Update eslint - add HifiAbout [bug 19479]
|
2018-10-22 17:24:22 -07:00 |
|
Sam Gateau
|
40b77c338c
|
Merge pull request #14176 from jherico/fix/fb19156
Add additional safety checks to gl::Uniform::load
|
2018-10-22 14:12:36 -07:00 |
|
Ryan Huffman
|
573df2d922
|
Move copy/paste/cut to SelectionManager
|
2018-10-22 13:56:08 -07:00 |
|
Ryan Huffman
|
e0851c4807
|
Add cut to Create, and update shortcuts
|
2018-10-22 13:56:08 -07:00 |
|
Ryan Huffman
|
65fdd16d90
|
Cleanup copy/paste changes
|
2018-10-22 13:56:07 -07:00 |
|
Ryan Huffman
|
9cc2add4a0
|
Add copy/paste functionality to edit.js
|
2018-10-22 13:56:07 -07:00 |
|
David Rowe
|
35c1241c98
|
Fix tablet highlighting not working if start up in HMD
|
2018-10-23 09:08:38 +13:00 |
|
John Conklin II
|
e40a021339
|
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
Better imports for controls and styles
|
2018-10-22 11:50:09 -07:00 |
|
John Conklin II
|
bd480bab80
|
Merge pull request #14226 from Atlante45/fix/octree-scene-stats
Only track stats for compatible packets
|
2018-10-22 11:45:16 -07:00 |
|
John Conklin II
|
b3698388ea
|
Merge pull request #14245 from huffman/feat/default-grabbable-setting
Add a 'grabbable' option to the new-model dialog
|
2018-10-22 11:42:40 -07:00 |
|
Stephen Birarda
|
3c79a79487
|
Merge pull request #14163 from Atlante45/fix/bw-recorder
Fix crash with BandwidthRecorder
|
2018-10-22 10:11:26 -07:00 |
|
Clément Brisset
|
bca3a3c1b6
|
Merge pull request #14217 from hyperlogic/bug-fix/cmake-cmp0074-warning-fix
Squelch cmake warning CMP0074 without requiring an update to cmake 3.12.
|
2018-10-22 10:01:35 -07:00 |
|
Seth Alves
|
a2d4c236c1
|
Merge pull request #14220 from SamGondelman/pickFree
Fix PickManager::removePick heap use after free
|
2018-10-22 09:48:22 -07:00 |
|
Stephen Birarda
|
ea3bdeb26e
|
Merge pull request #14181 from Atlante45/feat/timebox-packet-processing
Timebox packet processing
|
2018-10-22 09:43:30 -07:00 |
|
Stephen Birarda
|
154414e42e
|
Merge pull request #14189 from Atlante45/fix/archive-timeout
Increase content archive upload timeout
|
2018-10-22 09:40:57 -07:00 |
|
Seth Alves
|
2ce8ed25f8
|
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
|
2018-10-20 13:40:53 -07:00 |
|
Brad Hefta-Gaub
|
508e75edeb
|
Merge pull request #14178 from roxanneskelly/sysTrayIcons
Sys tray icons
|
2018-10-20 12:27:04 -07:00 |
|
Brad Hefta-Gaub
|
23ddb7dea6
|
Merge pull request #14207 from Atlante45/fix/white-spheres
Remove pending avatars data structure
|
2018-10-20 12:09:51 -07:00 |
|
Ryan Huffman
|
9d13902cd3
|
Improve paramater names in model dialog window
|
2018-10-20 11:26:12 -07:00 |
|
Ken Cooke
|
f68a8d7379
|
Merge pull request #14037 from birarda/bug/agent-flush-encoder
fix agent audio packet send when encoder is flushed
|
2018-10-19 20:53:52 -07:00 |
|
Sam Gateau
|
6005b934ad
|
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
minor bug fix and optimization in ModelEntity animation
|
2018-10-19 17:02:48 -07:00 |
|
Brad Hefta-Gaub
|
e6ec32e515
|
Merge pull request #14222 from SamGondelman/material
Fix material entity opacity maps
|
2018-10-19 16:45:31 -07:00 |
|
Ryan Huffman
|
f1258e4445
|
Add a 'grabbable' option to the new-model dialog
|
2018-10-19 16:42:45 -07:00 |
|
Brad Hefta-Gaub
|
219302a9b6
|
Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit
Cap the number of domain-server duplicate check-ins sent upon retransmission
|
2018-10-19 16:41:09 -07:00 |
|
Brad Hefta-Gaub
|
cd4e9a3e08
|
Merge pull request #13889 from alexiamandeville/controllerModelUpdates
Updating highlight textures on Rift Controller
|
2018-10-19 16:39:17 -07:00 |
|
Brad Hefta-Gaub
|
3fab542009
|
Merge pull request #14170 from Atlante45/fix/invisible-agents
Fix non-avatar agents appearing as avatars
|
2018-10-19 16:36:51 -07:00 |
|
Brad Hefta-Gaub
|
e276698f21
|
Merge pull request #14234 from r3tk0n/18518-record-unsub
18518 - Make record.js unsubscribe from messaging channel
|
2018-10-19 16:36:09 -07:00 |
|
Brad Hefta-Gaub
|
1ff69844f2
|
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
hide progress overlays if interstitial mode
|
2018-10-19 16:35:42 -07:00 |
|
Brad Davis
|
a93aa68901
|
Add additional safety checks to gl::Uniform::load
|
2018-10-19 16:20:09 -07:00 |
|
Brad Hefta-Gaub
|
881f7f0142
|
Merge pull request #14242 from jherico/fix/light_channels
Fix light color serialization
|
2018-10-19 16:17:21 -07:00 |
|
Brad Hefta-Gaub
|
c6fff83805
|
Merge pull request #14145 from ctrlaltdavid/M17223
JSDoc fixes
|
2018-10-19 16:16:19 -07:00 |
|
David Rowe
|
71ec5f3612
|
Fix tablet highlighting when using the Create and Shapes apps
|
2018-10-20 11:57:46 +13:00 |
|
Brad Hefta-Gaub
|
acc6d3e45c
|
Merge pull request #14144 from ctrlaltdavid/M17222
Fix and fill in JSDoc for MyAvatar flying-related functions
|
2018-10-19 15:57:04 -07:00 |
|
David Rowe
|
eb179363f6
|
Merge branch 'master' into M17853
# Conflicts:
# scripts/system/controllers/controllerDispatcher.js
|
2018-10-20 11:19:26 +13:00 |
|
Anthony Thibault
|
2bc99d3894
|
CMP0074 Warning: Proper check for cmake versions 4.x and higher
|
2018-10-19 15:17:29 -07:00 |
|