samcake
|
ba7590712a
|
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
|
2016-07-11 18:33:57 -07:00 |
|
samcake
|
0e99a4ac97
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-07-11 10:49:28 -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 |
|
samcake
|
2fbdb22493
|
Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward
|
2016-07-08 18:14:05 -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 |
|
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 |
|
samcake
|
ed67fe4051
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-07-08 09:04:40 -07:00 |
|
samcake
|
37f7596183
|
Trying to unify the shaders with/without scattering eve more but found a scribe bug. REnder emissive and lightmap during forward pass
|
2016-07-08 09:04:10 -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 |
|
samcake
|
fff2a9a5a2
|
REfactoring the shading functions interface to account for scattering
|
2016-07-07 21:16:28 -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 |
|
samcake
|
fa62a0a73c
|
One less warning
|
2016-07-07 18:05:36 -07:00 |
|
samcake
|
5827993125
|
Fixing warnings
|
2016-07-07 16:30:10 -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 |
|
samcake
|
1eb4acf815
|
Unifying the lighting pass for scaterring and not
|
2016-07-07 15:41:00 -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 |
|