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

104 Commits (e8554e70d3cd4a2e7db508aef86faea5ef815739)

Author SHA1 Message Date
Ansariel 0789d9bddf Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 01:41:17 +02:00
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 6259666be0 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llmath/lloctree.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/installers/windows/lang_da.nsi
#	indra/newview/installers/windows/lang_de.nsi
#	indra/newview/installers/windows/lang_en-us.nsi
#	indra/newview/installers/windows/lang_es.nsi
#	indra/newview/installers/windows/lang_fr.nsi
#	indra/newview/installers/windows/lang_it.nsi
#	indra/newview/installers/windows/lang_ja.nsi
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/installers/windows/lang_pt-br.nsi
#	indra/newview/installers/windows/lang_ru.nsi
#	indra/newview/installers/windows/lang_tr.nsi
#	indra/newview/installers/windows/lang_zh.nsi
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llvovolume.cpp
 2022-06-22 21:11:47 +02:00
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Beq cf1f63f938 FIRE-31417 - Autotune thread collision on settings access crashing win 
also FIRE-31326 and comments on summary Jira
 2022-02-24 21:48:16 +00:00
Beq 3ed58d8b63 Fix backgroundyield derp and stop settings reload during autotune 2021-11-10 17:06:00 +00:00
Ansariel 57df044612 FIRE-29930: Don't include general global settings in camera presets 2020-09-22 19:26:23 +02:00
Ansariel 400b0160ab Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 2020-05-04 10:31:19 +02:00
Andrey Lihatskiy ec77b2e0ea SL-13133 Numerical camera preset names sorting order fix 2020-04-28 19:07:55 +03: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
Ansariel 16c536e719 PresetCameraActive is set when the settings are actually saved 2020-04-10 20:10:15 +02: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 40394752f7 SL-12991 [Camera Presets] Sort all Camera preset lists in the same way 2020-04-07 21:26:13 +03:00
Mnikolenko Productengine 3bac0d4283 SL-12991 [Camera Presets] Sort all Camera preset lists in the same way 2020-04-07 19:15:40 +03: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 2e2bf007b8 Merge viewer-camus 2020-01-08 20:16:01 +01:00
Mnikolenko Productengine a2f0fd64e9 SL-12510 Revert changes and separate 'Save Graphic Preset' floater 2020-01-08 18:14:21 +02:00
maxim_productengine abd5277a7b SL-12424 WIP Save mousewheel zoom fraction in preset 2019-12-18 11:26:22 +02:00
Ansariel c7bff4510d Merge viewer-camus 2019-12-13 16:21:30 +01:00
maxim_productengine 5f86203f26 SL-12429 Use different setting name to prevent crash on old viewer 2019-12-10 15:44:01 +02:00
Ansariel 0087808903 Merge viewer-camus 2019-11-27 20:20:55 +01:00
maxim_productengine 716552a0c0 SL-12186 Don't copy templates from app_settings directory, because it's excessive 2019-11-19 11:55:02 +02:00
maxim_productengine 3824624ab1 SL-12186 Correctly populate list after creating default presets 2019-11-15 14:16:12 +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
maxim_productengine 382c184501 SL-12186 WIP Added ability to reset default presets and updated item list in 'My camera presets' floater 2019-11-12 16:26:34 +02:00
maxim_productengine 1fa0b3fe95 SL-12186 WIP Add new 'My camera presets' floater 2019-11-08 17:57:17 +02:00
maxim_productengine dd8128114c SL-12186 WIP Minor updates for 'Camera controls' and 'Save preset' floaters 2019-11-08 17:31:59 +02:00
Mnikolenko Productengine c75d443c83 SL-12186 WIP Updating UI for camera controls, including presets 2019-11-04 20:35:34 +02:00
Ansariel 44cea41212 Merge viewer-camus 2019-10-30 23:39:30 +01:00
Mnikolenko Productengine 915587de45 Fix crash on startup and restore missing settings 2019-10-29 13:27:21 +02: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 e2e117b3b8 Merge Firestorm LGPL 2018-09-27 00:16:21 +02:00
Graham Linden 2783783575 Merge to 5.2.0 2018-09-26 21:25:11 +01:00
Ansariel d93b92ec1d Merge viewer-bear 2018-09-12 20:13:12 +02:00
andreykproductengine a1e6383b5f MAINT-8926 Don't allow overwritting default preset 2018-08-22 19:32:50 +03:00
Ansariel b3baed5cbc Copy standard presets to the correct folder 2018-06-05 17:02:25 +02:00
Ansariel 1d1634c960 Add additional controls to a camera preset: ZoomTime, CameraPositionSmoothing, EditAppearanceLighting, FSDisableMouseWheelCameraZoom & DisableCameraConstraints 2018-06-05 16:22:08 +02:00
Ansariel 0f20304d76 Move "Advanced Camera View" into Preferences -> Move & View -> View and make things work properly 2018-06-05 16:13:26 +02:00
Ansariel efa8baca1d Merge viewer-camus 2018-06-05 13:21:11 +02:00
Oz Linden b778abe02b disambiguate boost list assignment by using a const for the value 2018-01-30 09:21:14 -05:00
Oz Linden a7911c4379 merge changes for 5.1.0-release 2018-01-19 11:18:29 -05:00
Jonathan Yap 9954d8d823 STORM-2145 Use string constant rather than a hardcoded string. 2018-01-18 17:13:07 -05:00
Jonathan Yap 2392581677 STORM-2145 Deal with preset files with spaces correctly 2018-01-16 18:02:47 -05:00
Jonathan Yap 9c7b634ba6 STORM-2145 Change line ending type of preset files 2018-01-16 11:27:49 -05:00