livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,389 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

77 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
PanteraPolnocy cc21b21341 FIRE-30781 Add TPP camera preset to their list, based on Penny Patton's optimized camera settings (right shoulder) 2022-10-07 00:11:11 +02:00
Ansariel 8c2deb6f8d Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llimagegl.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/lltracker.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
 2022-02-22 14:52:56 +01:00
Andrey Kleshchev e24acd81e0 SL-16892 Fix crash at getCameraOffsetInitial 
getCameraOffsetInitial() call can happen before init()
 2022-02-21 21:31:19 +02:00
Kitty Barnett 93a457689d Merge branch 'rlva/development' into master 2020-06-13 22:05:19 +02:00
Kitty Barnett fa07fe8d1c Merge branch 'rlva/development' (v2.2.3) into rlva/development 2020-06-13 21:04:48 +02:00
Kitty Barnett 386943e007 Merge branch 'viewer/build' nto rlva/development 2020-06-13 20:59:05 +02:00
Kitty Barnett 5be88df318 Add @setcam_eyeoffsetscale:<multiplier>=n and @setcam_eyeoffsetscale[:<multiplier>]=force 2020-06-13 00:01:49 +02:00
Kitty Barnett 9b58b4b7c8 @setcam_eyeoffset and @setcam_eyeoffsetscale fix-ups due to camera presets 2020-06-12 16:05:34 +02:00
Kitty Barnett fd313a7061 Merge branch 'lindenlab/camera-presets' into rlva/development 2020-06-12 15:38:34 +02:00
Ansariel 8abb2cd6b3 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersavecamerapreset.cpp
#	indra/newview/llpanelvolumepulldown.cpp
#	indra/newview/llpanelvolumepulldown.h
#	indra/newview/llpresetsmanager.cpp
#	indra/newview/skins/default/xui/en/floater_camera.xml
 2020-04-23 19:21:00 +02:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Mnikolenko Productengine 70d340a1bf SL-12993 Focus on avatar after saving new preset 2020-04-13 20:02:58 +03:00
Mnikolenko Productengine 944b908be1 SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of Camera preset, not as separate setting 2020-04-10 18:38:56 +03:00
Ansariel d11b42035e Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 2020-04-08 09:02:18 +02:00
Mnikolenko Productengine aefd01bd9c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-03-27 20:00:27 +02:00
Ansariel 86d76c5cd1 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 2020-03-19 09:05:51 +01:00
maxim_productengine 3e403ffb4f SL-4495 Add setting to ignore Hover height when setting Camera position 2020-03-16 17:48:23 +02:00
Ansariel 6146e81f79 Merge branch 'DRTVWR-460' of https://bitbucket.org/pe_devs/viewer-projects 2020-02-03 15:47:03 +01:00
maxim_productengine 2c7a8a2485 SL-12618 FIXED The camera zoom position is incorrect after selecting the preset in some cases 2020-01-30 17:51:41 +02:00
Ansariel a9c2d26fa9 Merge DRTVWR-460 2020-01-28 23:06:49 +01:00
maxim_productengine fcbccd59d9 SL-12424 Allow saving offsets based on current camera position 2020-01-17 17:54:40 +02:00
Kitty Barnett 1ca7b29edf Merge branch 'appearance/misc' into rlva/development 2019-12-27 15:49:47 +01:00
Ansariel 4d09c68e4c Merge Firestorm LGPL 2019-12-13 15:35:54 +01:00
AndreyL ProductEngine b0265f9756 Merged in lindenlab/viewer-release 2019-12-13 02:21:48 +02:00
Ansariel 0087808903 Merge viewer-camus 2019-11-27 20:20:55 +01:00
maxim_productengine f4d4fb2ad0 SL-12288 Enhancement for Rotate and Track camera controls 2019-11-22 14:34:20 +02:00
Ansariel ab8a179b25 Merge viewer-camus 2019-11-14 21:42:07 +01:00
maxim_productengine 7637f34386 SL-12186 WIP Get rid of excessive offset settings as we moved to store data in xml 2019-11-13 17:39:40 +02:00
maxim_productengine 4778417f25 SL-12186 WIP Use appropriate offset names when saving presets 2019-11-13 15:55:02 +02:00
Mnikolenko Productengine c75d443c83 SL-12186 WIP Updating UI for camera controls, including presets 2019-11-04 20:35:34 +02:00
Ansariel b69aff5a05 Merge viewer-neko 2019-07-05 18:04:36 +02:00
maxim_productengine dbb613a2d8 SL-11456 Allow scaling of HUD attachments 2019-07-02 16:52:21 +03:00
Graham Linden ac2fc3029f Backout tabs v spaces changes. 
'warn-on-failure:no-tabs'
 2019-03-12 08:56:26 -07:00
Graham Linden 3e56002245 Tabs -> spaces. 2019-03-11 08:11:09 -07:00
Ansariel 3979b3b4e5 Merge Firestorm LGPL 2019-02-10 14:23:02 +01:00
Ansariel 5508ad6ff4 FIRE-23470: Fix camera controls zoom glitch 2019-01-12 14:17:47 +01:00
Ansariel 5e3bbc20a5 Merge Firestorm LGPL 2018-08-03 02:07:41 +02:00
Graham Linden bd7ad9c157 Merge viewer-release 2018-08-02 23:02:42 +01:00
Ansariel 106d34da3a Merge viewer-neko 2018-06-12 21:54:15 +02:00
Ansariel efa8baca1d Merge viewer-camus 2018-06-05 13:21:11 +02:00
Andrey Kleshchev a902b360f2 MAINT-8478 Unable to unzoom camera after zooming object behind draw distance 2018-06-06 12:10:57 +00:00
Jonathan Yap 5c4ae5b11a STORM-2145 Camera Presets -- some initial work 2017-02-23 17:50:36 -05:00
Kitty Barnett 0046a76489 Merged with default tip (Revision 353c4cb529e2) 
--HG--
branch : RLVa
 2016-10-03 22:39:14 +02:00
Kitty Barnett a21ad8481e Merged with RLVa update tip 2016-06-24 00:48:37 +02:00
Kitty Barnett ba91b3eabb Added @setcam_avdistmin[:<distance>]=n|y, @setcam_avdistmax[:<distance>]=n|y, @setcam_focusdistmin[:<distance>]=n|y and @setcam_foccusdistmax[:<distance>]=n|y 
--HG--
branch : RLVa
 2016-06-08 01:54:40 +02:00
Kitty Barnett 056d8cff55 Added @setcam=n|y, @setcam_eyeoffset[:<vector3>]=n|y, @setcam_focusoffset[:<vector3>]=n|y, @setcam_fov[:<angle>]=n|y, @setcam_fovmin[:<angle>]=n|y and @setcam_fovmax[:<angle>]=n|y 
--HG--
branch : RLVa
 2016-05-16 01:32:12 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel a45d3d8421 Merge Viewer-Bear 2015-06-20 15:35:15 +02:00
Mnikolenko ProductEngine 71babaf882 MAINT-147 FIXED Allow follow cam scripts after closing Build tools floater. 2015-03-10 11:29:17 +02:00