Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72978 commits 71 branches 56 tags 1.2 GiB
Commit graph

72978 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wayne Chen
c4aabfda44 adding prototype functions 2018-10-29 08:47:09 -07:00
Wayne Chen
955b0a580e adding hooks for application for pause/resume 2018-10-25 17:25:44 -07:00
Wayne Chen
5e73fe3e41 more wip 2018-10-25 14:11:55 -07:00
Wayne Chen
75efc465b4 adding logging in qml wip 2018-10-24 17:34:42 -07:00
Wayne Chen
030b5a2745 resetting bodyLoader first source 2018-10-24 17:31:20 -07:00
Wayne Chen
951c4b2961 updating tablet implementation 2018-10-24 17:26:18 -07:00
Wayne Chen
fad147656b tablet implementationWIP 2018-10-24 10:47:32 -07:00
Wayne Chen
331b09c8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-24 09:16:24 -07:00
Wayne Chen
eb36abbff6 more wip 2018-10-23 23:10:16 -07:00
Wayne Chen
3522fe5263 some work to profile screen 2018-10-23 22:19:54 -07:00
Wayne Chen
c34d18065c adding login dialog properties 2018-10-23 17:02:53 -07:00
Wayne Chen
c28f0fd232 updating qml, adding new glyphs font 2018-10-23 16:22:42 -07: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
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
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
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
amantley
0d39343be4 changed if statement to switch in preferencesDialog.cpp, also removed print statement 2018-10-23 11:19:47 -07:00
Wayne Chen
d5b7fe62db modularizing qml font in login 2018-10-23 11:00:42 -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
Wayne Chen
56656a9079 adding button font modularity/using cairo 2018-10-23 10:46:19 -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
Wayne Chen
2a0a099397 adding steam svg 2018-10-23 10:04:21 -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
Wayne Chen
162502923a image for steam login button 2018-10-23 10:00:35 -07:00
Wayne Chen
c087b0f196 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-23 08:51:45 -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
amantley
8cb09c37ee changed the ui to the settings/controls 2018-10-22 21:26:30 -07:00
Wayne Chen
137b240a47 more changes to functions 2018-10-22 20:03:12 -07:00