Commit Graph

36 Commits

Author SHA1 Message Date
Shyotl
5036cfe566 Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-04-01 05:16:04 +02:00
Siana Gearz
179f4ddabb The Octopus Feature
___
                     .-'   `'.
                    /         \
                    |         ;
                    |         |           ___.--,
           _.._     |0) ~ (0) |    _.---'`__.-( (_.
    __.--'`_.. '.__.\    '--. \_.-' ,.--'`     `""`
   ( ,.--'`   ',__ /./;   ;, '.__.'`    __
   _`) )  .---.__.' / |   |\   \__..--""  """--.,_
  `---' .'.''-._.-'`_./  /\ '.  \ _.-~~~````~~~-._`-.__.'
        | |  .' _.-' |  |  \  \  '.               `~---`
         \ \/ .'     \  \   '. '-._)
          \/ /        \  \    `=.__`~-.
     jgs  / /\         `) )    / / `"".`\
    , _.-'.'\ \        / /    ( (     / /
     `--~`   ) )    .-'.'      '.'.  | (
            (/`    ( (`          ) )  '-;
             `      '-;         (-'
2011-03-24 23:54:23 +01:00
siana
15c01ed310 Merge remote branch 'shyotl/V2Renderer'
Conflicts:
	indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
Siana Gearz
919d321d4a MultiAttach only on SL 2011-03-16 13:44:12 +01:00
Shyotl
862ce4807c V2 walk/run animations 2011-03-10 23:18:22 -06:00
Shyotl
60f3104eb6 V2 walk/run animations 2011-03-10 23:06:18 -06:00
Shyotl
996aaf6345 V2 spatial partition, and all the pipeline changes that go with it.
Note: Deferred mode is not finished, and thus broken. Don't use!
2011-03-10 23:05:04 -06:00
Shyotl
7deee9336c V2 llmath merge 2011-02-22 21:44:04 -06:00
Siana Gearz
b719b6ddd4 Auto deruth rework. 2011-01-13 06:00:59 +01:00
Siana Gearz
9983d0b803 Display Name work 2010-12-13 00:31:01 +01:00
Siana Gearz
f9dcb1bb09 RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF 2010-11-25 23:47:11 +01:00
Siana Gearz
6866a36a5c Display names from Phoenix. Thanks Wolfspirit!
That's quite a piece of work. I have NO idea how Jess can downplay the
effort that went into this.

And it's still not complete, local chat is not affected, perhaps group
chat too.
2010-11-20 15:25:57 +01:00
Siana Gearz
c21d066454 Auto deruth, backport from 2.x 2010-11-19 12:41:08 +01:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00
Siana Gearz
740b570168 Merged in RLVa. Viewer broken! 2010-11-07 05:05:47 +01:00
Siana Gearz
f079cf07ae Puh some fixes mostly to ripout 2010-10-18 22:39:19 +02:00
Siana Gearz
5a67fcd623 Revert "THE BIGGIE."
This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
2010-10-18 18:27:09 +02:00
unknown
3b0bfc40bc -LLCached[COA]Control can now be static const. Use for readonly access.
-const'd all readonly LLCached[COA]Controls to prevent altering by mistake.
-added get() accessor to LLCached[COA]Controls to return cached type explicitly without manual casts.
-added missing operators to LLCachedCOAControl
-Converted a few more settings to LLCached[COA]Control
-Fixed LLColor4U -> LLSD -> LLColor4 problems in LLCachedControl

Ascent functionality fixes:
-Tag coloring pulled out of getClientInfo(Redundant. idleUpdateNameTag already handled it)
--Tag and color substituted at render-time. Simple boolean logic. Neglible perf penalty.
-Fixed llinfos spam if AscentShowSelfTagColor = false
-Client tag updated less superfluously
2010-10-12 00:44:16 -05:00
Beeks
bbbee73eae Updated multiple attachment code from Henri.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-30 14:03:18 -04:00
Beeks
ec55705bdd THE BIGGIE.
Holy hell, this was an interesting one to implement. I wish I understood it better. Unfortunately I think this marks the end of trying to re-implement the Local Inventory for Temp and Local textures. It's just not feasible now that the entire inventory system has been whipped into a code shitstorm.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-22 06:48:48 -04:00
Beeks
fa0143f917 New color tag system is basically in, but commented out. Color works, but takes a while to update for the user.
Couple of minor bugfixes with color settings - We need to finish the color settings that we have planned and soon, since one of a set of four got pushed in without the matching set.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-03 16:38:05 -04:00
Beeks
4650ca453c Removed the OTR button - Probably not going to bother with OTR.
Added some code for a later feature in llagent and llvoavatar.
Performed a minor tweak to the client tag code that was incorrect.
Removed Emerald's color options in the tag dropdown in accordance of them theoretically being removed tomorrow.
2010-09-03 03:13:42 -04:00
Beeks
d9cf8144e4 Client definitions were mucked with to poke Emerald.
People complained about the color of Friends in the avatar list, so I started adding support to change that (And made it account-specific as all the color stuff is designed to be). Didn't finish it, though.
The windlight popup is still broke as fuck when you start up, opening and closing it fixes it but no amount of basic common sense fixes it.
Changes to the client definitions to try to add our own colors worked, but the definitions file fucked off in the process so the client ID thing is sort of broken. Rather than trying to fix it, I think we'll just move onto the method described by Hazim/Zwagoth, which was closer to what we'd been trying to develop. I propose we just make people show up as Ascent and remove the tag reporting, honestly.
2010-09-02 22:10:56 -04:00
Beeks
f0cb6acf40 Breast physics is more fully implemented - Default values may be too subtle for some users, look for them in the Vanity preferences.
Client Tags are corrected, it was using the wrong value after being set.
Show LookAt now has a checkbox option in the Security tab for people who don't want to use the Advanced menu.
Logout/Teleport screen options are now controlled.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-08-29 23:51:20 -04:00
CharleyLevenque
137dc30c14 Fully implemented Breast Physics, but the boobies still don't bounce. Put in some other stuff for OTR (I think?) Finally added the client_definitions XML file to the versioning system. 2010-08-29 07:01:20 -04:00
Beeks
998d985130 In theory this fix should help alleviate some of the issues with crashes. I'm not positive. It basically sounds like the problem is the client tag info trying to get the texture of a half-loaded avatar and exploding. LL put in an option to basically pretty much ignore that the file wasn't loaded yet and just plow through blindly.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-08-28 16:15:37 -04:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
Hazim Gazov
f026ffaeca add support for additional metadata stored in the comments of the baked eye layer 2010-08-07 23:38:12 +00:00
phr0z3nt04st
7f8b62d70e Massive commit, mainly client tag stuff and random id0 and random mac,
red name if not actually in the sim in active speakers for voice.
2010-07-01 22:16:03 -05:00
phr0z3nt04st
0ba33c9fb4 Added Alpha Layer support and Additional Attachments, plus I reverted my
localhost on outgoing log hack and added the original values back in.
2010-05-13 20:53:47 -05:00
Hazim Gazov
c32adc2304 Fixed several compile errors with VS2005 2010-04-23 02:10:18 -03:00
Hazim Gazov
4ecf6055ce Maybe this will help it build on windows 2010-04-22 10:45:18 -03:00
Hazim Gazov
9dbe415796 fixing some more merge errors 2010-04-22 00:11:47 -03:00
Hazim Gazov
a9803a0f96 accidentally removed a bit of llvoavatar.h 2010-04-22 00:03:18 -03:00
Hazim Gazov
a7463f4db5 fixed the damn header file 2010-04-21 23:56:50 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00