Richard Linden
|
17e9c872ad
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-11-11 19:17:49 -08:00 |
|
Xiaohong Bao
|
0c60e32808
|
Merge
|
2013-10-21 16:57:38 -06:00 |
|
Dave Parks
|
0e116741a0
|
MAINT-2968 Fix for crash on AMD hardware running current drivers.
|
2013-10-10 18:00:11 -05:00 |
|
Richard Linden
|
80dfbbaacd
|
merge from viewer-release
|
2013-10-08 11:59:24 -07:00 |
|
Richard Linden
|
59628d6f85
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-10-01 14:28:39 -07:00 |
|
Graham Linden
|
badb8a945d
|
NORSPEC-259 revive fix stomped with materials->bear merge
|
2013-09-26 09:23:47 -07:00 |
|
Graham Linden
|
95e34d86b9
|
The unbearable lightness of being norspec
|
2013-09-18 18:24:16 -07:00 |
|
Graham Linden
|
63757692b6
|
NORSPEC-362 Fix leak of deferred color attachments
|
2013-09-11 20:40:11 -07:00 |
|
Richard Linden
|
52da9f5f49
|
merge with viewer-release
|
2013-09-09 18:58:41 -07:00 |
|
Graham Linden
|
e8bd9afbe6
|
Merge viewer-release 3.6.5 Cocoa
|
2013-09-09 13:10:45 -07:00 |
|
simon
|
e7ac4695e3
|
Merge viewer-release
|
2013-09-09 12:59:17 -07:00 |
|
Xiaohong Bao
|
d8c02bf062
|
Merge
|
2013-08-19 16:09:28 -06:00 |
|
Oz Linden
|
70cacc4d17
|
merge changes for 3.6.3-release
|
2013-08-19 15:51:40 -04:00 |
|
Graham Linden
|
3f186aab77
|
Merge in viewer-release
|
2013-08-19 12:10:40 -07:00 |
|
Graham Linden
|
80256fdbf5
|
NORSPEC-349 make render targets use original formats when resizing impostors and fix alpha for deferred impostor shader
|
2013-08-15 10:07:41 -07:00 |
|
Graham Linden
|
dc63061714
|
NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking obey vertex alpha
|
2013-08-15 09:37:54 -07:00 |
|
Graham Linden
|
93b3f1297e
|
MAINT-3338 fix disable of particle glow on false suspicion of lying network data
|
2013-10-21 13:20:34 -07:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |
|
Geenz
|
3a8ad62d9b
|
Merge with latest viewer-release.
|
2013-07-11 19:46:20 -04:00 |
|
callum_linden
|
bd41392b7e
|
Merge with viewer-bear which was just merged with viewer-release
|
2013-06-28 13:36:41 -07:00 |
|
callum_linden
|
b6b4b59138
|
Merge with viewer-release
|
2013-06-27 18:03:47 -07:00 |
|
Graham Linden
|
c07f47dee8
|
NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sources
|
2013-06-24 19:28:02 -07:00 |
|
Dave Parks
|
45b1466de6
|
Review cleanup
|
2013-06-18 19:51:02 -05:00 |
|
Dave Parks
|
ccd04cd66c
|
Occlusion culling overhaul.
|
2013-06-18 17:24:21 -05:00 |
|
Geenz
|
3779e51bfc
|
Merged with https://bitbucket.org/lindenlab/viewer-beta
|
2013-05-13 22:22:51 -04:00 |
|
simon
|
ee2fce8790
|
Merge downstream code and viewer-beta
|
2013-05-09 14:10:45 -07:00 |
|
simon
|
c7f7c4bc4d
|
Merge viewer-beta
|
2013-05-09 13:14:49 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
simon
|
066f2acadf
|
Forgot to commit @#! merge
|
2013-04-11 16:23:36 -07:00 |
|
simon
|
b42b789723
|
Merge in downstream code (chui fixes, materials)
|
2013-04-11 16:18:34 -07:00 |
|
simon
|
c7bab8ab8b
|
Merge
|
2013-04-11 16:04:21 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Graham Madarasz (Graham Linden)
|
98e02a5d76
|
Merge new boost and add OS X 10.8 mods
|
2013-02-22 09:49:58 -08:00 |
|
Graham Madarasz (Graham Linden)
|
2fd0e6e8f9
|
Merge viewer-cat and resolve conflict with alternate self
|
2013-02-21 16:50:04 -08:00 |
|
Dave Parks
|
615af0c556
|
MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black borders
|
2012-12-18 16:39:48 -06:00 |
|
Logan Dethrow
|
0302573348
|
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
|
2012-12-11 16:38:10 -05:00 |
|
prep
|
e0432f98ee
|
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
|
2012-11-28 16:36:34 -05:00 |
|
Dave Parks
|
5d34ac552f
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development
|
2012-11-20 17:03:55 -06:00 |
|
Nyx Linden
|
49caededb4
|
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
|
2012-09-19 17:05:56 +00:00 |
|
Dave Parks
|
cb96ab1a6f
|
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
|
2012-07-18 15:49:47 -05:00 |
|
Dave Parks
|
cfc5236e64
|
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
|
2012-07-18 15:49:47 -05:00 |
|
callum
|
2eedd0c3c0
|
Merge with tip
|
2012-06-15 13:00:49 -07:00 |
|
Dave Parks
|
b93a23aa82
|
MAINT-1147 Fix for frame stall on region crossing.
|
2012-06-13 18:05:56 -05:00 |
|
Nicky
|
86e84ae75e
|
Crashfix; handle errors in release builds more gracefully.
|
2012-09-01 15:24:54 +02:00 |
|
Dave Parks
|
e3a5125b41
|
MAINT-616 Potential fix for corrupted mip maps.
|
2012-05-25 17:58:12 -05:00 |
|
Dave Parks
|
efda0814cb
|
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
|
2012-05-24 10:50:48 -05:00 |
|
Dave Parks
|
b7cfd8c7f0
|
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
|
2012-05-21 23:33:25 -05:00 |
|
Dave Parks
|
f53fa08c70
|
MAINT-708 Use texture compression to minimize memory bloat (experimental)
|
2012-03-02 13:35:10 -06:00 |
|
Dave Parks
|
f9f247c5a6
|
SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase.
|
2011-12-07 16:36:26 -06:00 |
|
Dave Parks
|
c4aa8c50da
|
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
|
2011-10-04 02:31:54 -05:00 |