Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 11:20:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
73285 commits 69 branches 56 tags 1.2 GiB
Commit graph

73285 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alexia Mandeville
68ab5475fe
Remove duplicate display crash options 2018-10-23 14:13:09 -07:00
sam gateau
4565422876 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-23 14:02:15 -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
SamGondelman
8807b90474 fix emitRadiusStart 2018-10-23 13:33:14 -07:00
Howard Stearns
97bc84ed87 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-23 13:32:35 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -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
Howard Stearns
a79fe4df79 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-23 13:09:33 -07:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
Alexia Mandeville
178b8ef37b
Removed duplicate menu items 
Removed duplicates:
Console...
API Debugger
 2018-10-23 12:55:02 -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
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
25213febfd REmoving the uneeded extra property 2018-10-23 10:05: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
sam gateau
702f6229b8 Removing the pseudo fix for lod culling that is not ready in this pr 2018-10-23 08:50:10 -07:00
Brad Davis
339b25a362 Fix access to uniforms at index 0 2018-10-23 08:36:18 -07:00
amantley
3e8663f8e9 removed the dropdown from the avatar app, because it is in settings controls now 2018-10-22 22:31:26 -07:00
Sam Gateau
60447bc521 Adding the missing MetaType on the overlay... 2018-10-22 22:27:16 -07:00
amantley
8cb09c37ee changed the ui to the settings/controls 2018-10-22 21:26:30 -07:00
Sam Gateau
93f5e2db81 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-10-22 20:02:52 -07:00