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

604 Commits (d1a0841f6c4bfc03ac22c395420e71b2674dcb22)

Author SHA1 Message Date
Ansariel 25060135c8 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llviewermenu.cpp
 2024-02-08 16:36:25 +01:00
Alexander Gavriliuk 7075717b7c SL-20363 Add Advanced option 'Debug Unicode' 2024-02-08 13:17:18 +03:00
Ansariel 394c8e17d5 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/lltextbase.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2024-01-26 00:32:06 +01:00
Alexander Gavriliuk 03870e0cf3 SL-20756 The emoji in the profile floater is displayed schematically 2024-01-11 20:55:19 +01:00
Ansariel b32cd27b4c Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	autobuild.xml
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llmath/llvolume.cpp
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
#	indra/newview/llviewermenu.cpp
 2023-12-18 19:25:49 +01:00
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489 
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
 2023-12-15 07:06:15 +02:00
Ansariel c9109c6f00 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-09-20 12:54:29 +02:00
Ansariel ff5645511e Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/Python.cmake
#	indra/newview/llvovolume.cpp
 2023-09-09 11:40:54 +02:00
Ansariel b064b04077 Modern C++ thank you! Kokua can yoink the old stuff... 2023-09-03 19:35:23 +02:00
Andrey Kleshchev 35c0f1a769 SL-20205 Clipping of label "Water" 2023-08-29 13:22:53 +03:00
Callum Prentice c5d7f3c4c1 DRTVWR-489: trivial merge conflict fix 2023-07-18 10:51:51 -07:00
Ansariel 181ac13338 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llerrorthread.cpp
 2023-07-18 11:09:03 +02:00
Ansariel 1e4f4dea32 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	indra/llcommon/llsdserialize.h
#	indra/llui/lltextbase.cpp
 2023-05-18 13:23:19 +02:00
Alexander Gavriliuk 671978e392 SL-19575 Create emoji gallery (fix bug with drawing emojis in chat history) 2023-05-17 19:06:57 +02:00
Ansariel 5baeb998eb Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lltextbase.cpp
 2023-03-30 13:08:32 +02:00
Alexander Gavriliuk d1b414e48b SL-17045 LSL editor cursor position desynchronization 2023-03-24 22:17:36 +01:00
Ansariel 2c51fe5aad Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfilepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llvovolume.cpp
 2023-03-22 17:35:43 +01:00
Rye Mutt cdb3c018af SL-19336 Unload avatar and group icons from memory when not visible to reduce memory pressure on extremely large friends lists 2023-03-03 19:44:22 +02:00
Ansariel 3079cda486 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llvoicevivox.h
 2023-02-10 00:50:19 +01:00
Kitty Barnett 77afc073c5 Merge branch 'xcode-14.1' into DRTVWR-489-emoji 2023-02-08 17:18:37 +01:00
Ansariel 62b11fc825 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/lang_zh.nsi
#	indra/newview/llappviewer.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolfocus.h
#	indra/newview/llviewerhelp.h
#	indra/newview/llvoicevivox.h
 2023-02-04 13:39:11 +01:00
Callum Prentice 3185bdea27 DRTVWR-489-emoji: As part of the work to get macOS version of the Viewer working, the flag was introduced to warn (and therefore error out) when a virtual override was not marked with the 'override' keyword. Fixing this up involved a large number of changes and this commit represents just those changes - nothing specially from the DRTVWR-489 viewer 2023-01-26 14:45:45 -08:00
Ansariel 9e3079f859 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontregistry.cpp
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/widgets/chat_editor.xml
 2023-01-23 16:49:24 +01:00
Callum Linden cbb7480ca7 Fix merge conflicts after auto merge 2023-01-20 16:23:41 -08:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 2022-12-12 20:53:11 +02:00
Kitty Barnett 7ebaa2d2e5 Merge branch contribution/emoji into DRTVWR-489-emoji 2022-11-09 23:25:02 +01:00
Kitty Barnett 62d62abe9c [FIXED] Using the Windows emoji picker or pasting text containing emojis doesn't create emoji segments (=emoji size is same size as the text size) 
-> Partial revert of 063fe59
 2022-11-09 00:08:43 +01:00
Kitty Barnett c40d3351d5 Commit immediately if the user already typed a full shortcode 2022-11-02 19:08:02 +01:00
Kitty Barnett 8d08f417dc Show tooltip when hovering over an emoji text segment (currently will show its shortcode) 2022-10-23 16:29:03 +02:00
Kitty Barnett 063fe5953a Create a separate segment for emoji characters so that we can display them in a slightly larger font size than the surrounding text 2022-10-23 16:26:49 +02:00
Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmenugl.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llnetmap.cpp
 2022-10-20 10:51:25 +02:00
Rye Mutt bbd8df15de Fix menu leaks and lazy creation in text editing and scroll lists 2022-10-19 16:28:03 -04:00
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 1f3b96dd9c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 19:56:19 +02:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Ansariel 22b72a328b Slight optimization 2022-09-14 14:20:40 +02:00
Zi Ree a5cb6dab38 Linux/SDL2 - IME support for composing Japanese, Chinese, etc. input. Tested with ibus/mozc giving over-the-top editing with candidate clause selection, Media pages in the internal web browser do not yet have accurate input placement 2022-09-14 11:19:51 +02:00
Ansariel 3d7c5c52d9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:26:51 +02:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Andrey Lihatskiy 55da4ea8bb Merge branch 'master' into DRTVWR-565-maint-P 
# Conflicts:
#	indra/newview/llfloateroutfitsnapshot.cpp
 2022-08-31 00:36:22 +03:00
Ansariel 18341f0d76 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 23:19:12 +02:00
Andrey Lihatskiy 5c18921e9a Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 00:16:09 +03:00
Kitty Barnett bab70f6f15 Review + resolve minor issues 2022-08-29 00:01:43 +02:00
Kitty Barnett 5440464a9c Merge branch 'contribution/emoji' 2022-08-28 00:08:38 +02:00
Ansariel ec1ef8c495 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-17 17:50:46 +02:00
Ansariel c85bcbd7de FIRE-29425: User-selectable font and size for notecards 2022-08-16 18:27:13 +02:00
Ansariel 9c4c27a56f Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-01 22:07:39 +02:00
Andrey Kleshchev 4c3f343799 SL-17045 LSL editor cursor position desynchronization 
1. Fixed cursor position calculations
2. Fixed selection rect calculation
 2022-07-26 19:43:04 +03:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00