livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,671 Commits
2 Branches
0 Tags
297 MiB
C++ 86.3%
R 8.1%
GLSL 1.7%
HTML 1.1%
Python 0.8%
Other 1.9%
 
 
 
 
 
 
Go to file
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
.github update to control build channel from branch 2023-01-20 18:47:10 +00:00
doc Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer 2022-11-22 16:23:13 +01:00
etc Merge axon 2017-09-20 01:09:14 +02:00
fsutils Add Beta channel build support 2023-01-20 22:49:07 +00:00
indra Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-02-04 13:39:11 +01:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 01:41:17 +02:00
.clang-format DRTVWR-497 tweak clang-format rules for argument packing 2020-08-24 13:52:57 -06:00
.gitattributes More line ending normalization madness 2020-01-16 09:35:33 +01:00
.gitignore Don't copy fonts from 3p packages into the source folder 2023-01-23 18:12:20 +01:00
.pre-commit-config.yaml SL-15741: Add pre-commit configuration 2022-01-24 18:47:10 +02:00
BuildParams Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt Flip dates to 2023 2023-01-02 19:19:28 +01:00
LICENSE Renamed LICENSE.txt to follow naming scheme of other repos 2022-11-18 17:10:03 -05:00
README_BUILD_FIRESTORM_LINUX.txt Add example for using multithreaded xz compression to linux build instructions 2022-02-15 17:10:52 +01:00
README_BUILD_FIRESTORM_MACOSX.txt tip to default branch. 2014-12-12 09:36:00 +01:00
README_BUILD_FIRESTORM_WINDOWS.txt Update configure script and Windows readme file for VS2017 tools update 2020-07-24 00:20:08 +02:00
autobuild.xml Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 2023-02-04 13:39:11 +01:00
build.sh Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00
requirements.txt Extend GHA for Release builds (with Mac Codesigning) 2022-12-17 16:00:04 +00:00