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

2803 Commits (7c29d1fb340e988b558b28b3a6fa9fb488ca8422)

Author SHA1 Message Date
Ansariel 31c3417ce6 Update FMOD Studio on OSX with package built by Kitty 2022-09-26 14:44:49 +02:00
Zi Ree 3e52bb4314 Linux - FModStudio update - packaged by PorkChop, thank you! 2022-09-23 17:40:59 +02:00
Ansariel 1b3bf53ff3 Update FMOD Studio to 2.02.08 on Windows 2022-09-23 12:36:28 +02:00
Zi Ree 71ab85a0c2 Linux - Update jemalloc 3p library for better memory management - Patch by PorkChop, thank you! 2022-09-20 17:46:35 +02:00
Zi Ree 09a30fa49e Fixed bogus SDL2 conflicts every time autobuild.xml was touched. Patch by PorkChop, thank you! 2022-09-18 17:14:31 +02:00
Zi Ree 85db6ad4d5 New CEF and Dullahan for Linux, picking up fixes for MOAP issues - new libraries built by PorkChop. Thank you! 2022-09-17 05:41:29 +02:00
Ansariel cf85e854e5 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-09-15 21:14:13 +02:00
Callum Linden 3248eb87dc SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin 2022-09-14 14:52:31 -07:00
Ansariel db864c11cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-13 20:14:22 +02:00
Liny 745ad55aa2 Fix FIRE-32044 Voice cannot be used in a pure 64-bit Linux environment. 2022-09-10 16:37:14 -07:00
Zi Ree 6d3248cc17 FIRE-31945 - 3p-SDL2 rebuild done by PorkChop to include inpout methods for japanese text entry in the configure flags, as an attempt to fix this issue 2022-09-09 17:49:58 +02:00
Zi Ree c987ab1bbe Update libndof to use SDL2 - patch by PorkChop, thank you! 2022-09-02 16:58:25 +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 6f2265d387 Linux; Updated colladadom, compiled for C++17 support; Original author "Pork Chop <mygoditsfullofstars@phoenixviewer.com>" 2022-08-14 16:03:39 +02:00
Nicky c7e04f0cae Mac; Update Collada with a C++17 compatible version. 2022-08-11 22:29:02 +02:00
Ansariel 4d5b5a5ae3 Enable c++17 since it seems LL is hesitant to finally do it... 2022-08-11 21:56:48 +02:00
Ansariel 11e6cf4980 Fix wrong name 2022-08-10 19:32:37 +02:00
Nicky 1147d8ee1e Update fmodstudio 2022-08-07 14:22:52 +02:00
Ansariel d7953c1e94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:03:54 +02:00
Zi Ree 5230df4b14 Linux - Update 3p libs, fix linux-crash-logger, contributed by Pork Chop, thank you! 2022-08-01 13:35:25 +02:00
Ansariel f583a8233d No need for 32bit OSX/Linux GLOD 2022-08-01 12:08:59 +02:00
Beq 00875f93d0 Restore GLOD alongside MeshOpt 2022-07-31 22:11:35 +01:00
Nicky 5be4dd156c OSX; update fmodstudio to 2.02.07 2022-07-24 13:20:32 +02:00
Ansariel d407396a00 Update FMOD Studio to 2.02.07 on Windows 2022-07-23 12:54:26 +02:00
Ansariel 9300613edc Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-06-29 21:57:31 +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
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03: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 a0c7370ce3 Update Havok 2022-06-03 20:26:02 +02: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
Andrey Lihatskiy a426e8ddb3 DRTVWR-543 post-merge cleanup 2022-05-27 19:05:14 +03: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
Andrey Kleshchev 14e3104f86 SL-17452 Fixed anscii usage dullahan side 2022-05-21 01:11:38 +03:00
Ansariel a4d60d06ec Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 10:43:31 +02:00
Ansariel 7991aaffa0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 09:59:12 +02:00
Ansariel 6e83be2167 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-29 14:27:09 +02:00
Nicky 5b7825df1e Update SDL2. 2022-04-25 21:25:46 +02:00
Nicky e5f684f085 Make SDL2 a cmake option, use SDL2 Mixer for audio playback, this might open a good way to a full open source way (no FModStudio needed). But here be dragons still. 2022-04-25 21:24:29 +02:00
Ansariel 15354e86ba Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-04-21 14:27:51 +02:00
Andrey Lihatskiy c944641900 SL-17240 slvoice notarization fix 2022-04-20 02:14:27 +03:00
Ansariel b8b0c8ec3b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 15:42:14 +02:00
Ansariel 2daf0cb2fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-19 14:24:09 +02:00
Ansariel c1a4be7dae Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/llappearance/lltexlayer.cpp
#	indra/llinventory/llparcel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
 2022-04-19 13:21:52 +02:00
Ansariel 1aaa765d26 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 12:33:48 +02:00
Ansariel ad0aa3422f Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-04-19 00:23:41 +02:00
Ansariel 07040f7eb0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 00:15:01 +02:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-18 20:43:49 +03:00