Commit Graph

166 Commits

Author SHA1 Message Date
Siana Gearz
04b3dee767 Merge remote-tracking branch 'shyotl/V2TextureSystem' 2011-04-26 00:28:58 +02:00
Siana Gearz
b6c0436c1b Merge branch 'master' of github.com:siana/SingularityViewer 2011-04-26 00:23:01 +02:00
Shyotl
5954e0d71c Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llfloaterexport.cpp
2011-04-24 03:31:31 -05:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
Siana Gearz
955ca21298 OpenSim compatible prim backup 2011-04-19 01:33:09 +02:00
Siana Gearz
25b4452a12 Sometimes i build offline too 2011-04-18 23:39:47 +02:00
Siana Gearz
5d5231fe8c Removed Import/Export 2011-04-18 23:28:27 +02:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Siana Gearz
fd8866c411 Sione's Media Filter 2011-04-08 19:53:41 +02:00
Shyotl
e756140e1d 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-03-31 03:22:01 -05:00
Siana Gearz
179f4ddabb The Octopus Feature
___
                     .-'   `'.
                    /         \
                    |         ;
                    |         |           ___.--,
           _.._     |0) ~ (0) |    _.---'`__.-( (_.
    __.--'`_.. '.__.\    '--. \_.-' ,.--'`     `""`
   ( ,.--'`   ',__ /./;   ;, '.__.'`    __
   _`) )  .---.__.' / |   |\   \__..--""  """--.,_
  `---' .'.''-._.-'`_./  /\ '.  \ _.-~~~````~~~-._`-.__.'
        | |  .' _.-' |  |  \  \  '.               `~---`
         \ \/ .'     \  \   '. '-._)
          \/ /        \  \    `=.__`~-.
     jgs  / /\         `) )    / / `"".`\
    , _.-'.'\ \        / /    ( (     / /
     `--~`   ) )    .-'.'      '.'.  | (
            (/`    ( (`          ) )  '-;
             `      '-;         (-'
2011-03-24 23:54:23 +01:00
Siana Gearz
689337eb8c Merge remote branch 'origin/unimap2' 2011-03-16 01:40:29 +01:00
Siana Gearz
34fe62ba53 Need not this any longer, it's all in git 2011-03-15 16:33:09 +01:00
Siana Gearz
e63279a692 Amazon world map 2011-03-13 02:52:56 +01:00
Siana Gearz
633b6d22f2 Emerald Local Assets 2011-03-03 03:30:58 +01:00
Siana Gearz
8d85f67757 Imprudence AO 2011-03-01 04:16:54 +01:00
Siana Gearz
f7109a0131 Ripped out Inertia AO 2011-02-27 16:34:57 +01:00
Siana Gearz
d2896a0947 OpenSim compatible world map. YUCK!!! 2011-02-24 11:31:39 +01:00
Shyotl
3deb857ba1 Disabled llcommon.dll copying build step as it's now being linked statically. 2011-02-23 01:46:29 -06:00
siana
31b3c8e755 Singularity 1.5.4(2) fixes 2011-02-21 15:15:55 +01:00
Shyotl
000f102722 Backwards compatability for pre VC9 installs lacking updated resource compiler. (Uses pre-vista icon format)
To support newer icon with VC8:
 -Replace VC/bin/rcdll.dll with newer from Windows SDK 7.0
 -Run develop.py with -DVISTA_ICON:BOOL=ON setting
2011-02-15 17:17:45 -06:00
Siana Gearz
d962b05a9e Hippo Grid Manager 2011-01-29 18:23:56 +01:00
Siana Gearz
7805feb08f Now we're Vivox license compliant 2011-01-07 17:07:00 +01:00
Siana Gearz
037593aa99 Google tcmalloc 2011-01-01 02:56:41 +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
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +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
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
9dffb18c25 ld.gold on linux, useless spam 2010-11-13 04:45:10 +01:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00
Siana Gearz
d7a1575ad2 Merged Ascent progress - title picker 2010-11-08 22:59:46 +01:00
Siana Gearz
740b570168 Merged in RLVa. Viewer broken! 2010-11-07 05:05:47 +01:00
Beeks
395100fef6 Henri's Group Title picker.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 22:48:00 -04:00
Beeks
537e396882 Qarl's new Align tool.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-22 02:40:40 -04:00
unknown
4929460c66 COA stuff rolled into gSavedSettings.
Added common script<->client command junk.
2010-10-19 18:50:47 -05:00
Siana Gearz
3d60deaf31 Worked through rejects from sg1.5 merge. Went in smoothly O.o 2010-10-18 13:45:04 +02:00
Beeks
015bfe5bd7 Preliminary work for Day Cycle selecting.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-06 14:44:29 -04:00
November
fdebf7f06a Git is hard. Let's go shopping. (Branding changes, minor cleanup, cache isolated, new Vorbis libs in install.xml) 2010-09-26 22:54:00 -07:00
Beeks
c8e5512b5c Complete removal of Export Region code - There is no reason to even leave this in commented.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-14 22:41:23 -04:00
Beeks
0be0d095fc TPV Compliance issues resolved:
Message Builder is removed entirely as per requested
Message Log was updated to be less dependent on the message builder for later removal
Version reporting was fixed - Missed some tidbits from Inertia removal

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-06 23:16:43 -04:00
CharleyLevenque
892573dfb4 Contact list categories and searching 2010-09-06 16:17:53 -04:00
CharleyLevenque
b3e955cc28 Package builder fixes, show friends with custom tag/color. 2010-09-03 02:46:20 -04:00
Beeks
a600ae694c Windlight and graphic control attachment to the bottom right is finally in.
Added Windlight Water options to it.
Known issue where it starts in collapsed mode when it should be expanded, or visa versa.

While working on the overlay bar, the IM counter got mixed in a bit so that may start working soon.

Rolled back some changes made in an attempt to clean up the vertical IM tabs.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-08-31 21:03:06 -04:00
Beeks
dfa2e001ff Merge branch 'master' of github.com:Beeks/Ascent
Conflicts:
	indra/newview/CMakeLists.txt
2010-08-29 14:43:08 -04:00
Beeks
98bd948613 Git is saying I can't just pull the updates, so I'm forced to push this so I can sync. It's unfinished and shouldn't be used or touched really.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-08-29 14:39:59 -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
bd689b1dd2 Let's all hijack skins. Also here's some half-finished code to fix the preview window. 2010-08-25 00:40:02 -04:00
CharleyLevenque
4bac221317 Added in Emerald's 'Chatbar as Command Line' 2010-08-23 01:29:10 -04:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
phr0z3nt04st
82aef8fa4c Massive commit, beefed up the audio crash prevention, made a blacklist for assets, added sound explorer, fixed import, added item button to vfs explorer.
JELLY ROLL
2010-07-08 00:20:37 -05:00