Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 11:49:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73129 commits 76 branches 59 tags 1.2 GiB
Commit graph

73129 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
David Back
9afb111fbe add link, fix group order 2018-10-22 18:42:06 -07:00
David Back
d5dc93e800 QA fixes and reset server script status 2018-10-22 18:31:21 -07:00
Ryan Huffman
d7dce456b2 Fix incorrect default entity properties in Create 2018-10-22 18:29:27 -07:00
amantley
472ab1c613 Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-22 17:50:56 -07:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -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
Roxanne Skelly
91f9227686 Case 19446 - Update via Sandbox Popup -- opens Old Interface 2018-10-22 15:44:16 -07:00
Alexia Mandeville
3cc78896ac
Removed duplicate speech control menu item 2018-10-22 15:39:23 -07:00
Clement
e3e197ff5c 2 spaces in cmake files 2018-10-22 15:32:29 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
David Back
e5caf01681 CR change for body click event 2018-10-22 14:51:54 -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
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