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

2008 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Ansariel 026b8ff411 Update URL of message template 2022-11-21 20:40:50 +01:00
Zi Ree 66cecee628 Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop! 2022-10-30 20:30:12 +01:00
Beq 6924ce21a0 Python cmake hack for GHA (you will need python >3.9 now) 
this is to get around the issue of windows on github finding the wrong python in cmake due to our existing hacks for cygwin.
 2022-09-17 22:28:05 +01: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 78d8048f38 Add -Wno-unused-variable for Mac. 2022-08-14 19:56:40 +02:00
Nicky a9ddc09824 Split Linux warning supression into their own block, disable deprecation warnings thanks to our old boost library ... 2022-08-14 16:18:04 +02:00
Nicky e8179b39d9
Bring back -Wno-pragmas for older GCC versions. 2022-08-14 09:48:13 +00:00
Ansariel b3ec34054a Clean up compile definitions a bit 2022-08-13 12:05:46 +02:00
Nicky 62ecb56640 Move viewer specific warnings from variables to viewer cmake. 2022-08-12 18:14:52 +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 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
Ansariel d7953c1e94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:03:54 +02:00
Zi Ree b3c2c103d6 Fix Linux meshoptimizer library lining - use static .a instead of .o 2022-08-01 04:40:02 +02:00
Beq 00875f93d0 Restore GLOD alongside MeshOpt 2022-07-31 22:11:35 +01:00
Ansariel e32a4d3ed4 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-06-30 20:52:57 +02:00
Nicky 3fcfa778ae Handle variables for OSX signing a bit more graceful and do't force them 
right into the cache.
See https://alexreinking.com/blog/how-to-use-cmake-without-the-agonizing-pain-part-2.html
 2022-06-30 15:09:14 +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 bd414ee0d0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-29 17:21:22 +02:00
Ansariel 9e003e13c3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-06-18 15:50:56 +02:00
Nicky db77862253 Enable signing for OSX. 2022-06-15 19:33:46 +02: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 e5c7fd4fff Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llrender/llgl.cpp
#	indra/newview/llface.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 12:55:19 +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
Ansariel c9407feece Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-05-10 19:14:02 +02:00
Andrey Kleshchev c0adc5e181 SL-17376 Fix viewer failing due to missing vcruntime140_1 2022-05-09 21:22:22 +03:00
Ansariel b1c9d24934 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 11:19:36 +02: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
Andrey Kleshchev f3add82a4c Merge branch master (D550) into DRTVWR-546 
# Conflicts:
#	indra/newview/llappviewer.h
 2022-05-04 20:10:29 +03:00
Andrey Lihatskiy 7fff7eecb6 Merge branch 'master' into DRTVWR-543-maint 2022-05-04 18:51:05 +03:00
Ansariel 074f7096b7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-04 15:00:53 +02:00
Ansariel 6e83be2167 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-29 14:27:09 +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 ac2ee57edb Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/lllocationinputctrl.h
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/viewer_manifest.py
#	indra/viewer_components/login/lllogin.cpp
 2022-04-19 15:27:35 +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 a637e255f3 Merge branch 'DRTVWR-550-mfa' of https://bitbucket.org/lindenlab/viewer 2022-03-25 09:20:10 +01:00
Andrey Kleshchev be820f2eb9 Revert "Debug Fmod with logging" 
This reverts commits b21c17eee9 and 2f78338aeb.
'Debug Fmod' was not an intended commit, was meant for local testing. But might be a good idea to make this a part of DebWithRelInfo or provide a cmake switch.
 2022-03-14 18:38:44 +02:00
Ansariel b79d1ac171 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-08 14:19:36 +01:00
Brad Kittenbrink 89ab1e4525 Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa 2022-03-07 00:19:11 -08:00
Nicky 4525ae3901 Use add_compile_definitions with cmake 3.12.0 now being a thing of the present. 2022-03-02 15:55:35 +01:00
Nicky 974c00f6de Add apr so's to be copyed into sharedlibs 2022-03-02 14:49:29 +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
Nicky Dasmijn 3e77876ac4 Merged in nd_cleanup_v2 (pull request #891) 
Remove all boost, fix calling functions on nullptrs, initialize vars

Approved-by: Maxim Nikolenko
Approved-by: Nat Linden
Approved-by: Andrey Lihatskiy
 2022-03-02 02:39:07 +00:00
Nicky de70b18dd1 Linux; Update slvoice, include 32 bit libs. 2022-03-01 22:44:44 +01:00
Ansariel d34e3a9ab4 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-03-01 19:31:32 +01:00
Ansariel e10dea5fe2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 18:09:12 +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