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

661 Commits (c513ebb777b5345416683404454125cd94de838c)

Author SHA1 Message Date
Ansariel 210f59a923 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderview.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llstatbar.cpp
#	indra/llui/lltabcontainer.h
#	indra/llwindow/lldxhardware.cpp
#	indra/llwindow/lldxhardware.h
#	indra/llwindow/llkeyboard.cpp
#	indra/llwindow/llkeyboard.h
#	indra/llwindow/llkeyboardheadless.cpp
#	indra/llwindow/llkeyboardheadless.h
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowsdl.cpp
#	indra/llwindow/llwindowsdl.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/llavatarlist.cpp
#	indra/newview/llavatarlistitem.h
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llchiclet.cpp
#	indra/newview/llfasttimerview.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloatermap.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltoolcomp.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolface.cpp
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolpie.cpp
 2024-02-18 16:22:54 +01:00
Ansariel c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +02:00
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 8d15d83fa0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-09-06 18:25:13 +02:00
Ansariel 4ef7d45e4d Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llagentcamera.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-09-06 18:24:58 +02:00
Andrey Kleshchev f059ace6f7 SL-20205 Clipping of label "Water" 2023-09-04 23:20:13 +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
Ansariel 652e89917e Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2023-08-16 13:30:37 +02:00
Maxim Nikolenko 5430efbb31
SL-20139 pressing the Tab key should paste tooltip only when hovering functions in LSL editor 2023-08-15 20:38:02 +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
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +02:00
Ansariel b61dfd131d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:36:16 +02:00
Andrey Lihatskiy 2ed401882e Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
 2022-05-26 02:56:29 +03:00
Ansariel 455b750cde Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-03-02 12:04:09 +01:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-02 10:12:19 +01:00
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 13:41:42 +02:00
Andrey Lihatskiy e70fe3a50d Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-02-28 22:01:18 +02:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
 2022-02-28 21:56:25 +02:00
Ansariel 6638d1d367 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-26 12:31:20 +01:00
Andrey Kleshchev e129986a49 SL-3007 Ability to report abuse from chat 2022-01-24 23:37:21 +02:00
Ansariel 9c3cdd37f3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-16 13:43:53 +01:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Ansariel 78f9a28191 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542 2022-01-13 21:12:09 +01:00
Ansariel 453c99af39 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-10 23:15:08 +01:00
Ansariel 9c0973f787 FIRE-31179: Fix double-clicking on friend list item might execute underlying URL in opened IM window 2022-01-04 15:00:41 +01:00
Ansariel c2f8517118 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00
Ansariel be25e64888 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 13:54:22 +01:00
Andrey Lihatskiy 981cdca0a5 Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/llui/lltextbase.h
#	indra/newview/VIEWER_VERSION.txt
 2021-11-16 01:34:29 +02:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2021-11-12 17:31:39 +01:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Ansariel 7bef9a1605 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-10-12 13:34:36 +02:00
Andrey Kleshchev bdb4a90e7c SL-16157 Crash at LLFontGL::maxDrawableChars 2021-10-08 02:12:36 +03:00
Ansariel 3c1d189bb8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 09:26:10 +02:00
Ansariel 40e8c0a192 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-08 18:58:22 +02:00
Zi Ree a52eff1b89 Workaround for broken participant list: always show group moderation tools regardless of user permissions, change toggle mute chat to explicit mute and unmute so accidents can no longer happen 2021-06-08 15:37:16 +02:00
Andrey Kleshchev f655bb1f27 Merge branch master (DRTVWR-515) into DRTVWR-483 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
 2021-05-06 22:13:40 +03:00
Ansariel 9768f25de0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 02:08:40 +02:00
Ansariel bc76d48967 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-30 09:32:45 +02:00
Andrey Lihatskiy e5a428f362 Merge branch 'master' into DRTVWR-521-maint 2021-04-30 03:00:32 +03:00
Ansariel 4841acd297 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-17 22:44:52 +02:00
Ansariel 6d26efe266 FIRE-30892: Pressing the Home key in the script editor should go to the first non-whitespace character on a line; Contribution by Testicular Slingshot 2021-04-03 09:59:07 +02:00
Ansariel 914f8988db Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-04 09:12:20 +01:00
Ansariel e3cb162f51 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 22:05:58 +01:00
Ansariel f3961a9510 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 20:17:57 +01:00
Ansariel 148e6eede7 FIRE-30805: Replace "agentself" with "agent" when copying SLUrls 2021-03-03 19:52:34 +01:00
Ansariel 35781178ec Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-02 21:19:39 +01:00
Ansariel be546fc9a1 Fix some XUI parser warnings 2021-02-19 10:30:55 +01:00
Ansariel fd06acc270 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 21:22:24 +01:00