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

44638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
eac144f354 experimenting 2016-07-11 09:52:24 -07:00
Seth Alves
1cf57b27a9 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 08:57:11 -07:00
Clément Brisset
e893b17047 Merge pull request #8220 from highfidelity/revert-8215-fix/crash-packet-list 
Revert "Fix crash in packet list"
 2016-07-08 18:31:53 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
Clément Brisset
f7b3155178 Merge pull request #8213 from birarda/long-script-name 
Interface changes for new Marketplace
 2016-07-08 16:57:25 -07:00
Stephen Birarda
15eb1dbafd Merge pull request #8215 from Atlante45/fix/crash-packet-list 
Fix crash in packet list
 2016-07-08 16:30:06 -07:00
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16:06 -07:00
Atlante45
f0fcb94a6a Typos 2016-07-08 16:00:34 -07:00
Stephen Birarda
11aafc0f48 use endsWith for scriptURL check 2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6 handle running of non .svo.json JSON files from mp CDN 2016-07-08 15:47:56 -07:00
Atlante45
b665f38c1f Don't process DomainList packets from 2 DS 
case 1037
 2016-07-08 15:16:41 -07:00
Atlante45
97da515585 Assign random UUID to DS without one. 2016-07-08 15:15:58 -07:00
Atlante45
70cf25bd8b Add missing read locks to LimitedNodeList's hash 2016-07-08 15:15:58 -07:00
Stephen Birarda
5bce924eda keep signature for askToLoadScript 2016-07-08 14:34:42 -07:00
Brad Hefta-Gaub
d78eb19e44 Merge pull request #8194 from jherico/glow_lines 
Support for glowing 3D line overlays
 2016-07-08 12:50:35 -07:00
Brad Davis
ae1dd29a7a Fix depth writing for glow lines 2016-07-08 10:27:53 -07:00
Stephen Birarda
216e47b29a hide the long URL prefix of scripts from marketplace 2016-07-08 09:43:11 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
Brad Davis
829a871d6f Merge pull request #8208 from SamGondelman/qmlFixes 
Fixed issues in Browser.qml and UpdateDialog.qml
 2016-07-07 19:51:37 -07:00
Brad Davis
c644c87e69 Fix glow line vanishing, improve transparency interaction 2016-07-07 19:01:41 -07:00
Brad Hefta-Gaub
4c100ecc95 Merge pull request #8203 from jherico/zorder 
Ensure newly shown windows are popped to the top of the zorder
 2016-07-07 16:14:50 -07:00
Brad Hefta-Gaub
33d13956b7 Merge pull request #8206 from jherico/sphere_alpha 
Fix rendering of overlay spheres with alpha
 2016-07-07 15:39:29 -07:00
SamGondelman
99fc472d77 fixed errors in Browser.qml and UpdateDialog.qml 2016-07-07 14:06:57 -07:00
Brad Davis
828be94089 Fix rendering of overlay spheres with alpha 2016-07-07 14:04:59 -07:00
Brad Davis
8ca3630cfa Support glow effect in 3D line overlays 2016-07-07 13:36:48 -07:00
Brad Davis
790f74da1d Support geometry shaders 2016-07-07 13:36:47 -07:00
Andrew Meadows
e4828b03b1 fix crash when building shape before model loaded 2016-07-07 13:32:30 -07:00
Brad Davis
23700dc90f Ensure newly shown windows are popped to the top of the zorder 2016-07-07 13:16:59 -07:00
Brad Hefta-Gaub
348c7491b8 Merge pull request #8198 from jherico/gpu_perf_testing 
Rendering performance testing tool
 2016-07-07 12:28:14 -07:00
Brad Hefta-Gaub
6e724d246a Merge pull request #8200 from jherico/batch_cache 
Batch optimizations
 2016-07-07 12:26:49 -07:00
Brad Hefta-Gaub
eafd8999bc Merge pull request #8202 from jherico/cpu_opt_modelbounds 
Optimize updateModelBounds
 2016-07-07 11:52:44 -07:00
Brad Hefta-Gaub
6d78c9e7ad Merge pull request #8201 from huffman/fix/add-missing-loading-images 
Add missing loading images for Asset Browser
 2016-07-07 11:35:43 -07:00
Brad Davis
dfdc1ca1c6 Ensuring render thread is highest priority 2016-07-07 11:14:56 -07:00
Brad Davis
b73fe24848 PR feedback 2016-07-07 11:12:55 -07:00
Brad Davis
eff1c65388 Reduce the number of temporary objects in batch commands 2016-07-07 11:12:55 -07:00
Brad Davis
721cd79b57 Aggressive batch pre-allocation 2016-07-07 11:12:54 -07:00
Brad Davis
c7382ea886 Optimize updateModelBounds 2016-07-07 11:11:26 -07:00
Brad Davis
5be238db08 Suppressing glew link warnings 2016-07-07 11:10:59 -07:00
Brad Davis
09f2a10613 Add rendering performance tool 2016-07-07 11:10:58 -07:00
Ryan Huffman
d2fedee656 Add missing loading images for Asset Browser 2016-07-07 10:22:52 -07:00
Brad Hefta-Gaub
7724065298 Merge pull request #8196 from howard-stearns/loaded-machine 
an objective test of basic performance on struggling machines
 2016-07-07 09:02:31 -07:00
Brad Hefta-Gaub
abcd1e0062 Merge pull request #8164 from SamGondelman/macHMDPreview 
Added Mac preview image if VSync is enabled
 2016-07-07 09:01:40 -07:00
Brad Hefta-Gaub
c9fd4894be Merge pull request #8189 from jherico/entity_script_safety 
Don't trigger entity scripts without scripting interface
 2016-07-07 09:01:18 -07:00
Brad Hefta-Gaub
10500d0773 Merge pull request #8191 from howard-stearns/basic-hand-controller-edit 
basic hand-controller editing
 2016-07-07 08:58:54 -07:00
Brad Davis
5220b52cd9 Don't trigger entity scripts without scripting interface 2016-07-06 18:13:15 -07:00
SamGondelman
d05a27e0e6 embed image locally 2016-07-06 17:27:53 -07:00
Brad Hefta-Gaub
41a74f7652 Merge pull request #8193 from huffman/fix/model-overlay-dims 
Fix model overlays not correctly scaling
 2016-07-06 16:17:22 -07:00
Howard Stearns
74ef82f800 add 'dynamic' property as a load 2016-07-06 16:15:02 -07:00
Andrew Meadows
3c4f9f8016 refert debug hack 2016-07-06 15:51:17 -07:00
howard-stearns
110f5e9e2a Don't compare distance when no intersection. 2016-07-06 15:08:57 -07:00