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 |
|
Kerry Ivan Kurian
|
a2a6acd45c
|
Improve code formatting
|
2018-10-22 14:04:59 -07:00 |
|
Kerry Ivan Kurian
|
a1bb685176
|
Remove cruft
|
2018-10-22 14:00:08 -07:00 |
|
Zach Fox
|
f5a5c0dad3
|
Attempt to fix wearable bug?
|
2018-10-22 14:00:06 -07:00 |
|
Zach Fox
|
1023e6d2b9
|
Fix ClipboardScriptingInterface:
|
2018-10-22 14:00:04 -07:00 |
|
Zach Fox
|
f9cc4f5a69
|
Count unique source and url pairs
|
2018-10-22 14:00:01 -07:00 |
|
Zach Fox
|
de93bbb08b
|
Only show unique resources
|
2018-10-22 13:59:59 -07:00 |
|
Zach Fox
|
d44f9e2ccc
|
Tons of improvements
|
2018-10-22 13:59:57 -07:00 |
|
Zach Fox
|
bccca94111
|
Prevent duplicate resources in logs. Thanks to Roxanne!
|
2018-10-22 13:59:55 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
55c1a88404
|
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
|
2018-10-22 13:59:50 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Stephen Birarda
|
3aac294a92
|
optimize sockAddrBelongsToNode and reduce connection filter usage
|
2018-10-22 13:57:30 -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 |
|
Wayne Chen
|
2143664e33
|
Merge pull request #10 from danteruiz/mergedInterstitialBugFixes
remove magic numbers
|
2018-10-22 12:55:06 -07:00 |
|
Dante Ruiz
|
1ce1902fa8
|
remove magic numbers
|
2018-10-22 12:49:24 -07:00 |
|
David Back
|
ddbe02dd4e
|
CR changes and fix extra info toggle
|
2018-10-22 11:56:47 -07: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 |
|
Wayne Chen
|
d008bfa523
|
partial requested code changes
|
2018-10-22 11:29:36 -07:00 |
|
David Back
|
f5616acba9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
|
2018-10-22 11:21:27 -07:00 |
|
Wayne Chen
|
7284c3ad53
|
Merge branch 'intersttiial-do-not-intersect-web' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes
|
2018-10-22 10:28:35 -07:00 |
|
Wayne Chen
|
e2b90aac9d
|
Merge branch 'interstitialIgnoreFix' of https://github.com/wayne-chen/hifi into mergedInterstitialBugFixes
|
2018-10-22 10:28:12 -07:00 |
|
Wayne Chen
|
d12ee393d7
|
Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes
|
2018-10-22 10:27:13 -07:00 |
|
Wayne Chen
|
4a8348e0d1
|
Merge branch 'interstitial-loading-imporvements' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes
|
2018-10-22 10:14: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 |
|
Wayne Chen
|
27813d4948
|
Merge branch 'fix/loadingscreen-optimization' of https://github.com/FlameSoulis/hifi into mergedInterstitialBugFixes
|
2018-10-22 10:05:55 -07:00 |
|
Wayne Chen
|
afd8baca87
|
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialIgnoreFix
|
2018-10-22 10:01:57 -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 |
|
amantley
|
eb3db9a571
|
added default to case statement
|
2018-10-20 16:13:41 -07:00 |
|
Luis Cuenca
|
e1c760b566
|
Merge branch 'master' into transitAddAnimation
|
2018-10-20 15:30:23 -07:00 |
|
luiscuenca
|
f8d67d124f
|
Hold flickering fixed and refactor
|
2018-10-20 15:22:25 -07:00 |
|
amantley
|
e693275b10
|
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
|
2018-10-20 13:42:23 -07:00 |
|
amantley
|
5efb889de5
|
removed unused variables
|
2018-10-20 13:42:17 -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 |
|
amantley
|
dfdc6aee7e
|
Merge branch 'master' into squattyPottyFix
|
2018-10-20 13:39:55 -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 |
|
amantley
|
a427ddb235
|
removed extraneous print statements
|
2018-10-20 09:16:05 -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 |
|
amantley
|
55daeb11cd
|
moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure
|
2018-10-19 18:43:02 -07:00 |
|