Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 18:10:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44658 commits 76 branches 59 tags 1.2 GiB
Commit graph

44658 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
ba8660ff28 Merge pull request #8212 from samcake/skin 
One less warning
 2016-07-07 19:51:59 -07:00
samcake
fa62a0a73c One less warning 2016-07-07 18:05:36 -07:00
Brad Hefta-Gaub
70e068ddb7 Merge pull request #8210 from samcake/skin 
Skin
 2016-07-07 17:18:02 -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
Brad Davis
828be94089 Fix rendering of overlay spheres with alpha 2016-07-07 14:04:59 -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
samcake
8f2bf2b423 Integrating the scattering to the local lights 2016-07-06 17:13:16 -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
howard-stearns
110f5e9e2a Don't compare distance when no intersection. 2016-07-06 15:08:57 -07:00
howard-stearns
9495d93a72 Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit 2016-07-06 15:06:51 -07:00
Howard Stearns
8ef9f48221 An objective test of basic performance on struggling machines. 2016-07-06 13:42:46 -07:00
Ryan Huffman
7d803b7513 Fix model overlays not correctly scaling 2016-07-06 11:54:39 -07:00
Sam Gondelman
7a529b1484 Merge pull request #8188 from jherico/export_fix 
Fix export entities by region
 2016-07-06 10:27:19 -07:00
samcake
66b65391a4 Cleaning up the lighting equations 2016-07-05 18:21:49 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
Andrew Meadows
a9dd2c7015 Merge pull request #8172 from sethalves/fix-issue-8159 
fix canRezTmp logic (incorrectly) resets valid lifetimes to the maximum value
 2016-07-05 14:47:05 -07:00
samcake
16c5a085d8 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-05 10:50:04 -07:00
Brad Davis
d6250d4c5a Fix export entities by region 2016-07-05 10:37:53 -07:00
Clément Brisset
7c0879d919 Merge pull request #8183 from humbletim/fix-typedarrays 
fix TypedArray byte ordering and .subarray indexing
 2016-07-05 10:00:15 -07:00
Brad Hefta-Gaub
372f8245e6 Merge pull request #8162 from SamGondelman/snapshotFix 
Snapshot takes picture of HMD window instead of preview
 2016-07-05 09:25:59 -07:00
Brad Hefta-Gaub
e6df17d01d Merge pull request #8185 from ctrlaltdavid/20984 
QA READY: prevent users window from being dragged off screen
 2016-07-05 09:16:39 -07:00
David Rowe
0ad7aa72fb Prevent users window from being dragged offscreen 2016-07-04 14:34:38 +12:00
Brad Hefta-Gaub
87cdb4144d Merge pull request #8182 from kencooke/master 
floating-point versions of the audio resampler and reverb
 2016-07-03 18:48:22 -07:00
Ken Cooke
f43c6447e1 remove unneeded #pragma 2016-07-03 11:46:23 -07:00
Ken Cooke
014f6fa259 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:40:32 -07:00
Ken Cooke
f7c9957bb1 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:33:05 -07:00
Sam Gondelman
34042d51ad Merge pull request #8180 from ctrlaltdavid/fix-users-border 
don't show users border when hover mouse if logged out
 2016-07-03 03:14:17 -07:00
humbletim
b7874116b9 fix TypedArray byte ordering and .subarray end indexing 2016-07-02 23:36:08 -04:00