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

2588 Commits (b14d460dcab28f8da0b48809ff1e09412e29fe53)

Author SHA1 Message Date
Ansariel b14d460dca Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer 2021-11-10 21:21:51 +01:00
Ansariel 6254497151 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-10 21:17:02 +01:00
Liny 4336023179 Fix typo breaking mac builds 2021-11-07 14:49:38 -08:00
Nicky 3d795fde53 Revert to VLC 2.2.8 2021-11-07 20:10:49 +01:00
Andrey Lihatskiy a37a36c408 SL-16299 Updated dullahan to CT build 565428; entitlements cleanup 2021-11-04 01:10:46 +02:00
Andrey Lihatskiy 6921edcc39 SL-16293 Updated vlc to CT build 565299 2021-11-01 21:23:12 +02:00
Nicky 2935c125fe Linux; Update openssl. 2021-10-16 14:17:39 +02:00
Ansariel 4bdc1843ca Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-10-14 22:50:36 +02:00
Andrey Lihatskiy fb170ffe21 Merge branch 'master' into DRTVWR-545-maint-mix 2021-10-14 00:35:08 +03:00
Ansariel 111fdfb897 Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer 2021-10-12 14:33:22 +02:00
Ansariel bff236d893 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-10-12 14:27:41 +02:00
Ansariel b7009017c5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-10-12 13:01:21 +02:00
Ansariel 160f44375e Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer 2021-10-12 12:59:35 +02:00
Nicky 0d0446ba81 OSX; Update FMOD Studio to 2.02.03 2021-09-29 00:27:02 +02:00
Nicky 04e45c3bd8 Linux; Update FMOD Studio to 2.02.03 2021-09-29 00:23:47 +02:00
Nicky abd5f7a899 Linux; Update dullahan once more. 2021-09-28 23:58:53 +02:00
Andrey Lihatskiy adcd08fbf4 Revert "Merge branch 'c++17' into DRTVWR-522-maint" 
This reverts commit 203ea3a70a, reversing
changes made to 8e3f077886.

# Conflicts:
#	indra/newview/llmachineid.cpp
 2021-09-28 19:22:18 +03:00
Ansariel ba9bc78ba1 Update FMOD Studio to 2.02.03 for Windows 2021-09-28 10:20:11 +02:00
Nicky ef7ee0a17b Linux; Update the windows voice bundle, include windows 64 bit voice as a new option. 2021-09-27 00:27:49 +02:00
Andrey Lihatskiy 717fe2cc5c DRTVWR-520 Updated dullahan to codeticket build 563968 2021-09-23 10:57:37 +03:00
Andrey Lihatskiy 4a411d9896 Revert "DRTVWR-520 Updated dullahan to codeticket build 562751" 
This reverts commit adb724564d.
 2021-09-21 19:31:04 +03:00
Ansariel 7a845ee23b Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522 2021-09-20 12:59:14 +02:00
Ansariel e885a73b62 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-09-20 11:38:13 +02:00
Ansariel f843a97aeb Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-09-20 11:26:51 +02:00
Ansariel 7f1ebf1df8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-09-20 11:24:49 +02:00
Ansariel cd4f90e2c0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-09-20 11:18:53 +02:00
Nicky e0b7570685 Linx, Update CEF once more, tweak packaging. 2021-09-13 13:11:56 +02:00
Nicky 035befac70 Linux; Update CEF. 2021-09-12 01:24:08 +02:00
Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
 2021-09-03 00:18:26 +03:00
Andrey Lihatskiy ecf819b38b DRTVWR-521 Updated llca to codeticket build 563493 2021-09-01 20:48:34 +03:00
Ansariel f2cd97a055 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-31 14:49:52 +02:00
Ansariel e0948b78b1 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-08-31 14:46:36 +02:00
Nicky 07fb63a528 OSX; KDU 8.2 2021-08-31 14:44:39 +02:00
Andrey Lihatskiy 203ea3a70a Merge branch 'c++17' into DRTVWR-522-maint 2021-08-27 19:24:05 +03:00
Ansariel e3e2904847 Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/CMakeLists.txt
#	indra/newview/viewer_manifest.py
 2021-08-24 14:57:18 +02:00
Ansariel 33c20ba190 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewermacosx.cpp
#	indra/newview/llappviewerwin32.h
#	indra/newview/viewer_manifest.py
#	indra/win_crash_logger/llcrashloggerwindows.cpp
 2021-08-24 14:49:13 +02:00
Nicky de3f5d2ed6 Linux; KDU 8.2 2021-08-23 18:19:37 +02:00
Nicky b2569a06e6 Windows; Update KDU to 8.2 2021-08-23 17:55:59 +02:00
Andrey Lihatskiy 76da77d2a9 SL-15588 Updated llphysicsextensions_tpv to codeticket version 562599 2021-08-14 00:12:24 +03:00
Andrey Lihatskiy adb724564d DRTVWR-520 Updated dullahan to codeticket build 562751 2021-08-12 23:13:18 +03:00
Andrey Lihatskiy 97f09de4fc Merge branch 'master' into DRTVWR-520-apple-notarization 
# Conflicts:
#	autobuild.xml
#	build.sh
#	indra/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewermacosx.cpp
#	indra/newview/llappviewerwin32.h
#	indra/newview/viewer_manifest.py
#	indra/win_crash_logger/llcrashloggerwindows.cpp
 2021-08-12 23:13:12 +03:00
Ansariel c4c25c6853 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-08-10 13:53:07 +02:00
Ansariel 362946572f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-08-10 12:58:35 +02:00
Andrey Lihatskiy 3f501ec2d0 Merge branch 'master' into DRTVWR-522-maint 2021-08-10 06:43:37 +03:00
Andrey Lihatskiy 12836d5f91 Merge remote-tracking branch 'origin/master' into DRTVWR-521-maint 2021-08-10 06:27:44 +03:00
Ansariel ca4e15c930 Merge branch 'DRTVWR-531' of https://bitbucket.org/lindenlab/viewer 2021-08-09 14:27:13 +02:00
Ansariel 5776bd5410 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-09 11:10:17 +02:00
Ansariel 2251bbbce7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-08-02 09:28:56 +02:00
Nicky 7c81cd821f Linux FMOD Studio 2.02.02 2021-08-01 09:01:15 +02:00
Ansariel 81ae59fea5 Update FMOD Studio to 2.02.02 on Windows 2021-07-30 01:44:32 +02:00