Lirusaito
4de23007a5
Added crouch toggle, global bool called isCrouch, function agent_toggle_down bound to toggle_down.
...
Shift+crouch=toggle, crouch doesn't work while toggle crouched, at the moment.
Formatted keys.ini to be completely aligned.
2012-01-11 11:04:12 -05:00
Lirusaito
61beedd3d9
Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
...
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
2012-01-09 05:40:03 -05:00
Siana Gearz
fd22d80dfd
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
indra/newview/llmanipscale.cpp
indra/newview/llmeshrepository.cpp
indra/newview/llviewerregion.cpp
indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
Siana Gearz
b8eb3076ce
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32
2011-11-23 23:21:14 +01:00
Shyotl
83e8a9076b
Several gl calls now wrapped via LLRender (gGL) as prep for future changes:
...
glMatrixMode -> gGL.matrixMode
..GL_MODELVIEW -> LLRender::MM_MODELVIEW
..GL_POJECTION -> LLRender::MM_PROJECTION
..GL_TEXTURE -> LLRender::MM_TEXTURE
glMultMatrix -> gGL.multMatrix
glLoadMatrixf -> gGL.loadMatrix
glPushMatrix -> gGL.pushMatrix
glPopMatrix -> gGL.popMatrix
glLoadIdentity -> gGL.loadIdentity
glRotatef -> gGL.rotatef
glTransformf -> gGL.transformf
glOrtho -> gGL.ortho
glColor3f -> gGL.diffuseColor3f
glColor3fv -> gGL.diffuseColor3fv
glColor4f -> gGL.diffuseColor4f
glColor4fv -> gGL.diffuseColor4fv
glColor4ubv -> gGL.diffuseColor4ubv
glLightModelfv(GL_LIGHT_MODEL_AMBIENT -> gGL.
2011-11-21 15:55:44 -06:00
Siana Gearz
4ce0345842
Fix setting adult, mostly
2011-11-06 16:35:49 +01:00
Shyotl
008bebd817
Merge with siana/future
2011-10-13 00:03:56 -05:00
Shyotl
30a95e7f45
Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes.
2011-10-03 22:45:13 -05:00
Shyotl
cd86b3a69b
Refactoring.
...
-New LLWearableType class, uses LLDictionary for typeindex<->typename<->assettype<->typelabel conversions.
-LLAvatarDefines cleaned up. Uses LLDictionary for Mesh, TE, Baked lookups/conversions.
-LLAgentWearables TEWearable stuff removed. Use LLAvatarDefines.
-LLWearable WearableType conversions yanked. Use LLWearableType.
-LLVOAvatar TEWEarable stuff removed. Use LLAvatarDefines.
-EWearableType now LLWearableType::EType
-LLWearable::getID() renamed to LLWearable::getAssetID()
VOAvatar cleanup.
-Removed redundant TEWearable functions.
-Some code migrated to F32 LLVOAvatar::calcMorphAmount(). No functional change.
-LLVOAvatar::removeMissingBakedTextures virtual. Implementation moved to VOAvatarSelf
2011-10-03 15:00:43 -05:00
Shyotl
74dc875a27
Beginning to pull LLVOAvatarSelf out from LLVOAvatar.
2011-10-02 02:51:10 -05:00
Shyotl
417f5084b4
Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places.
2011-09-03 19:30:42 -05:00
Shyotl
fd317a4092
newview V3 partial merge.
2011-08-30 01:05:59 -05:00
Shyotl
7e9f8c7bf8
Several LLStat variables migrated into the LLViewerStats class.
2011-08-28 00:56:57 -05:00
Shyotl
17bb0799e0
Added LLAgentUI. Includes improved buildLocationString.
2011-07-31 19:05:53 -05:00
Shyotl
35e0b9b6ff
Data-alignment. SSE intrinsics.
2011-07-19 21:35:35 -05:00
Shyotl
0663a3f028
Added checkboxes to groups list for visibility, groupchat, and notices...
...
-Required addition of an extra texture overlay for list headers, as normal button overlay is used for sort arrows.
-Added padding to italic text in scroll list, as the text clipped outside of the element.
-Groups list is now sortable and has header visible.
-'none' entry always be first in the list, regardless of sort order.
-LLGroupMgrGroupData::mListInProfile removed. Was unreferenced and always false. LLGroupMgrGroupData doesn't handle show/chat/notify properties
2011-06-23 03:56:09 -05:00
Shyotl
5d8ac68d3a
Groups/agent profile floaters now update when a group visbility changes.
...
Apply button in group settings doesn't behave quite as badly after changing notices/chat/show in profile settings.
Groups floater now bolds visible groups, italicized if active (this may need to be something more noticeable)
2011-06-21 12:03:28 -05:00
Shyotl
cfcc0a946d
mAutoPilotFinishedCallback cleared upon autopilot termination.
2011-06-16 22:52:36 -05:00
Shyotl
07a34f7be5
Missed a file..
2011-06-14 14:15:39 -05:00
Shyotl
c57b97c8df
LLAgentWearables Transition (1/1)
2011-06-09 01:35:49 -05:00
Shyotl
ec9da17ed0
Merging broke compile. Fixing and removing a few no-longer-needed global constants.
2011-06-08 17:06:28 -05:00
Shyotl
1434051f4e
LLAgentCamera transition (2/2)
2011-06-07 22:39:23 -05:00
Shyotl
49b893c806
Removed most OGPX related code.
2011-05-28 17:11:10 -05:00
Shyotl
4e47446be1
LLVOAvatar class members reorganized to line up with V2 better. Added accessors from v2 where applicable. mBakedTextureData renamed to mBakedTextureDatas
2011-05-14 12:38:47 -05:00
Shyotl
7e16e0624a
Scare everyone with a big-arsed warning. Horray!
2011-05-07 01:41:28 -05:00
Shyotl
779fe9cfaa
General cleanup. Potential line-width inconsistency tweak. Wearable creation cleanup.
2011-05-06 00:20:41 -05:00
Shyotl
2dff12433c
Avatar Physics innital commit. No edit panel. SavedSettings not plugged in yet.
2011-04-28 10:09:11 -05:00
Siana Gearz
b34d9fb88e
MultiAttach unbork attempt
2011-04-01 05:13:39 +02:00
Siana Gearz
4b4096857f
Merge commit 'a028c4edba8a5ddb340afc8eebb56b06b363bab1'
2011-04-01 05:13:12 +02:00
Siana Gearz
2298aee369
Merge branch 'master' of github-siana:siana/SingularityViewer
2011-03-26 01:06:43 +01:00
Siana Gearz
b6b18b0693
Adjustments to MultiAttach
2011-03-26 01:06:34 +01:00
Shyotl
b887d3147e
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
...
Conflicts:
indra/llrender/llglstates.h
2011-03-25 17:54:52 -05:00
Shyotl
f73c666f0e
Added isAgentAvatarValid() helper function from v2
...
Nullchecks
Flight-state tweaks
2011-03-25 17:50:06 -05:00
Siana Gearz
179f4ddabb
The Octopus Feature
...
___
.-' `'.
/ \
| ;
| | ___.--,
_.._ |0) ~ (0) | _.---'`__.-( (_.
__.--'`_.. '.__.\ '--. \_.-' ,.--'` `""`
( ,.--'` ',__ /./; ;, '.__.'` __
_`) ) .---.__.' / | |\ \__..--"" """--.,_
`---' .'.''-._.-'`_./ /\ '. \ _.-~~~````~~~-._`-.__.'
| | .' _.-' | | \ \ '. `~---`
\ \/ .' \ \ '. '-._)
\/ / \ \ `=.__`~-.
jgs / /\ `) ) / / `"".`\
, _.-'.'\ \ / / ( ( / /
`--~` ) ) .-'.' '.'. | (
(/` ( (` ) ) '-;
` '-; (-'
2011-03-24 23:54:23 +01:00
Siana Gearz
919d321d4a
MultiAttach only on SL
2011-03-16 13:44:12 +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
Siana Gearz
2550e2b6f2
OpenGrid protocol is dead. byebye o/
2011-01-31 19:59:28 +01:00
siana
774e20a764
1.5.2 release, assorted fixes
2011-01-02 17:23:37 +01:00
Siana Gearz
e1b9109bee
I hate being unsat when pressing ESC
2010-11-29 00:23:02 +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
dcb1155033
Idle update perf fix
2010-11-13 05:27:02 +01:00
Siana Gearz
17a0d13b0c
Merge shyotl, setting include broken (disabled)
2010-11-09 15:14:34 +01:00
Siana Gearz
18149fdfed
RLVa fixes
2010-11-07 18:52:25 +01:00
Siana Gearz
740b570168
Merged in RLVa. Viewer broken!
2010-11-07 05:05:47 +01:00
unknown
4929460c66
COA stuff rolled into gSavedSettings.
...
Added common script<->client command junk.
2010-10-19 18:50:47 -05: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