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

1197 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Ansariel 0789d9bddf Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 01:41:17 +02:00
Zi Ree 1add5d049a Linux/SDL2: update to SDL2-24-0, thanks PorkChop - might already help with FIRE-32074 2022-10-15 16:02:21 +02:00
Zi Ree 48282c7fea FIRE-31976 - Linux/X11: fix pasting text being cropped to 64k bytes 2022-10-05 00:10:45 +02:00
Zi Ree e977975008 FIRE-32123 - Attempt to fix Right-ALT cam on non AltGr keyboards while still keeping AltGr on AltGr keyboards working 2022-10-02 15:54:26 +02:00
Zi Ree 07c9d38526 Linux/SDL2 - FIRE-32214 - Add checkbox to Preferences/General to enable or disable IME text input, so regular keyboard input will not be affected 2022-09-26 02:02:12 +02:00
Ansariel 656dd12dfc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:35:44 +02:00
Ansariel 1f3b96dd9c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 19:56:19 +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 db864c11cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-13 20:14:22 +02:00
Zi Ree d42936ee6f Linux/SDL2: Add window position getter function 2022-09-11 18:25:48 +02:00
Ansariel 55f51f4829 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:02:33 +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
Nicky d4b7880dfe Remove extra ']'. 2022-08-17 15:32:28 +02:00
Mnikolenko ProductEngine 0243626011 SL-16985 FIXED [Mac] Key combinations for diacritical marks are not working 2022-08-16 13:42:07 +02:00
Ansariel 2205a61ae6 Speculative fix for FIRE-31473: Accessing "characters" property outside key-up or key-down event is not allowed according to the API doc - not sure if flagsChanged does count as such though (hopefully it compiles...) 2022-08-16 13:41:27 +02:00
Ansariel 94eff7cb1f Remove remnants of a change long gone already - maybe this might be a reason it causes FIRE-31473 now in conjunction with 83127d2299 2022-08-16 13:18:08 +02:00
Zi Ree 08acbbec54 Linux SDL2 - Make SDL2 default, remove USE__SDL2 flag, add USE_SDL1 flag instead to go back to SDL1 if needed 2022-08-09 14:48:20 +02:00
Ansariel 49b6f9b312 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 14:52:20 +02:00
Ansariel 6d09c9ff89 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 12:37:05 +02:00
Nicky 3866fcfdc3 Streamline SDL1/SDL2 propgation and handle it in one place rather than having it multiple times 
in the cmake files.
 2022-08-04 00:46:42 +02:00
Zi Ree 2ab6dd9344 Linux SDL2 - make keyboard input work for the CEF plugin, still a couple funky keys left to deal with later 2022-08-03 13:56:01 +02:00
Zi Ree d0e86fb534 re-apply the alt/ctrl filter in SDL_TEXTINPUT to prevent extra characters showing up in text boxes when using e.g. alt+h 2022-08-02 13:57:46 +02:00
Ansariel b7d3cab3f2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:51:12 +02:00
Ansariel d7953c1e94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:03:54 +02:00
Nicky 97d41439c4 Disable texture decode thread if shared context are not available (SDL1). 2022-08-01 19:32:26 +02:00
Zi Ree 7404a86a91 Linux SDL2 - Make AltGr outside text input fields not trigger regular Alt functions, might have an impact on non-AltGr keyboards, though 2022-08-01 16:52:19 +02:00
Zi Ree 8cd3733ad6 Linux SDL2 - Attempt to make AltGr in text input fields work, so e.g. German keyboard users can type @ € and such characters again. 2022-08-01 15:45:32 +02:00
Zi Ree b85418417f Linux SDL2 - Make screen black when window opens so it doesn't look like a crash 2022-07-30 22:26:06 +02:00
Zi Ree b374ba8c66 Make numpad enter behave the same as regular enter/return 2022-07-30 17:50:14 +02:00
Zi Ree b232bc4082 Linux SDL2 - Fix first click when activating the viewer window not coming through 2022-07-30 16:37:38 +02:00
Zi Ree 264237a070 Linux SDL2 - Also exclude scrolllock just to be on the safe side 2022-07-29 14:17:59 +02:00
Zi Ree 28b82cb645 Linux SDL2 - Fix main enter/return key not working when capslock or numlock are engaged 2022-07-29 13:35:18 +02:00
Zi Ree 017d872d2e Changed LL_WARNS into LL_DEBUGS for successful OpenGL context creation 2022-07-28 18:03:28 +02:00
Zi Ree 1f81f59409 Add support for shared OpenGL contexts when using SDL2 for multithreaded OpenGL image processing 2022-07-28 17:53:47 +02:00
Nicky 99b924a7fc Implementations for pure virtual methods from base class (needed for threaded texture decode. Or at least to make things compile first). 2022-07-28 12:06:55 +02:00
Ansariel 5bb868ab3d OSX build fix 2022-07-27 13:07:32 +02:00
Ansariel 2c0edbac18 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 22:04:20 +02:00
Ansariel fc11575657 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 20:28:29 +02:00
Ansariel 3a4a0bd3d2 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-06-29 17:25:32 +02:00
Ansariel bd414ee0d0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-29 17:21:22 +02:00
Ansariel cfb6c083fe Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/llfilesystem/lldiskcache.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
 2022-06-24 22:18:44 +02:00
Maxim Nikolenko 264ad0ce0c mac build fix 2022-06-23 15:17:49 +03: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
Mnikolenko Productengine ff65e23f20 SL-17515 FIXED Extreme Mouse Sensitivity for Certain Actions 2022-06-03 14:08:04 +03:00
Ansariel e60b6e45e4 Manually apply fix for SL-17474 Device context not properly released at shutdown 2022-05-30 19:19:32 +02:00
Andrey Kleshchev ce0286c33b SL-17474 Device context not properly released at shutdown 2022-05-30 15:02:03 +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 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 11:41:45 +02:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 02:51:33 +03:00