SamGondelman
|
e8c5324e39
|
start removing branching
|
2018-10-25 11:59:04 -07:00 |
|
Jeff Clinton
|
67fe43ebb1
|
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
Small avatars now have a minimum jump height of 0.25 meters
|
2018-10-24 17:08:28 -07:00 |
|
David Back
|
5729d35c48
|
Merge pull request #14198 from dback2/entityListTypeFilter
Entity list type filter and X to clear search
|
2018-10-24 11:27:50 -07:00 |
|
Luis Cuenca
|
fac9188dfb
|
Merge pull request #14187 from luiscuenca/transitAddAnimation
Add animations to Avatar Transit
|
2018-10-24 10:51:21 -07:00 |
|
David Back
|
073040d1fc
|
Merge branch 'master' into entityListTypeFilter
|
2018-10-24 10:39:30 -07:00 |
|
Ryan Huffman
|
6221b9ee59
|
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll
MS19054: [CreateApp/EntityList] auto scroll
|
2018-10-24 10:36:21 -07:00 |
|
Howard Stearns
|
e61dd7dbc1
|
Merge pull request #14253 from roxanneskelly/Case19446
Case 19446 - Update via Sandbox Popup -- opens Old Interface
|
2018-10-24 10:02:13 -07:00 |
|
Brad Hefta-Gaub
|
f8e38e98e1
|
Merge pull request #14214 from huffman/feat/edit-defaults
Update default entity properties in Create
|
2018-10-24 10:00:46 -07:00 |
|
Brad Hefta-Gaub
|
5e27a5930e
|
Merge pull request #14186 from thoys/feat/create/entityList-contextMenu
MS19056: [CreateApp/Entity List] Context Menu
|
2018-10-24 09:58:32 -07:00 |
|
Brad Hefta-Gaub
|
01d41da574
|
Merge pull request #14268 from gcalero/dont_show_stats
Don't show stats in release builds
|
2018-10-24 09:50:10 -07:00 |
|
Thijs Wenker
|
5f35a32480
|
remove duplicate calls to refresh footer
|
2018-10-24 17:58:07 +02:00 |
|
Thijs Wenker
|
8e1cfb5a06
|
fix double click selection
|
2018-10-24 17:58:07 +02:00 |
|
Thijs Wenker
|
776b8b8fc7
|
CR and style fixes
|
2018-10-24 17:58:06 +02:00 |
|
Thijs Wenker
|
27e0c85b01
|
entity list auto scroll
|
2018-10-24 17:58:06 +02:00 |
|
Gabriel Calero
|
28c062b842
|
Don't show stats in release builds
|
2018-10-24 11:57:59 -03:00 |
|
John Conklin II
|
daa13b3706
|
Merge pull request #14193 from misslivirose/rc75-tutorial
Tutorial: bug 18725 & New Menu Content
|
2018-10-23 15:21:29 -07:00 |
|
John Conklin II
|
e21e7d30d7
|
Merge pull request #14126 from amantley/squattyPottyFix
Sit State for the seated user in HMD: Squatty Potty Fix
|
2018-10-23 15:20:49 -07:00 |
|
Kerry Ivan Kurian
|
3cf000a71b
|
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
|
2018-10-23 15:18:30 -07:00 |
|
John Conklin II
|
7019439356
|
Merge pull request #14260 from SamGondelman/resourceCrash
Fix ResourceCache crash on shutdown
|
2018-10-23 15:03:55 -07:00 |
|
Stephen Birarda
|
b789fa96f8
|
Merge pull request #14192 from Atlante45/fix/traits-race
Prevent race on internal client traits members
|
2018-10-23 14:53:11 -07:00 |
|
Roxanne Skelly
|
10ee5ac5b4
|
URL protocol returns the protocol string with the ':' attached
(how did this work before?!)
|
2018-10-23 14:46:13 -07:00 |
|
Brad Hefta-Gaub
|
04d251c321
|
Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes
Merged interstitial bug fixes
|
2018-10-23 14:30:55 -07:00 |
|
Stephen Birarda
|
061f86e550
|
Merge pull request #14051 from birarda/feat/improve-sock-addr-belongs
consider all node sockets in sockAddrBelongsToNode
|
2018-10-23 14:21:42 -07:00 |
|
Kerry Ivan Kurian
|
e7d1c2873a
|
Merge branch 'master' into log-resource-requests-2
|
2018-10-23 13:46:59 -07:00 |
|
Thijs Wenker
|
4e9f9b3edf
|
comply with copy/paste update
|
2018-10-23 22:42:56 +02:00 |
|
Thijs Wenker
|
3fa4ee0e1d
|
enable duplicate copy cut paste functionality of context menu
|
2018-10-23 22:42:55 +02:00 |
|
Thijs Wenker
|
4069ca2e0c
|
CR feedback
|
2018-10-23 22:42:55 +02:00 |
|
Thijs Wenker
|
e5ef589a3c
|
style
|
2018-10-23 22:42:54 +02:00 |
|
Thijs Wenker
|
4c3f5b3bbc
|
Entity List Context Menu
|
2018-10-23 22:42:54 +02:00 |
|
amantley
|
2df9d6c5e9
|
addressed missing changes for luis
|
2018-10-23 13:37:56 -07:00 |
|
Stephen Birarda
|
5cbddfe0c4
|
consider all sockets in findNodeWithAddr
|
2018-10-23 13:35:07 -07:00 |
|
Stephen Birarda
|
7b04cbd092
|
Merge pull request #14183 from Atlante45/feat/ccache
Add ccache support for Linux and Mac
|
2018-10-23 13:33:46 -07:00 |
|
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 |
|
Roxanne Skelly
|
be7a947ddd
|
Fix coding-standards issue
|
2018-10-23 13:25:59 -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 |
|
amantley
|
9bc92cb2a3
|
removed leftover triggers
|
2018-10-23 12:29:04 -07:00 |
|
SamGondelman
|
78f0afd39f
|
fix crash on shutdown
|
2018-10-23 12:13: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 |
|
luiscuenca
|
fa67e1b269
|
Remove logs and magic numbers
|
2018-10-23 11:51:15 -07:00 |
|
amantley
|
0d39343be4
|
changed if statement to switch in preferencesDialog.cpp, also removed print statement
|
2018-10-23 11:19:47 -07:00 |
|
Roxanne Skelly
|
a6fcf79bbd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into Case19446
|
2018-10-23 11:17:19 -07:00 |
|
Brad Hefta-Gaub
|
405b1d5725
|
Revert "Better imports for controls and styles"
|
2018-10-23 10:58:28 -07:00 |
|
amantley
|
39a16703e4
|
updated wording for the radio buttons for avatar leaning model
|
2018-10-23 10:52:14 -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 |
|