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

1603 Commits (c5e3ace94de01ed61ed43284ea72dacec197cdc9)

Author SHA1 Message Date
Brad Kittenbrink a6774ca4dd Fixed DRTVWR-559 mac build with new glext package that includes KHR/khrplatform.h 2022-06-24 02:56:30 -07:00
Brad Kittenbrink 6b85705951 fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h 2022-06-23 22:53:36 -07:00
Dave Parks 31e2fa5e50 SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps). 2022-06-21 22:44:30 -05:00
Brad Kittenbrink d1dc9c35a9 tinygltf also updated mac and 32bit windows packages with new public build for SL-17214 2022-06-09 10:06:21 -07:00
Brad Kittenbrink 5b76111b27 tinygltf updated with new public build for SL-17214 2022-06-09 10:02:49 -07:00
Dave Houlton 2dc376aa53 SL-17214 add 3p-tinygltf dependency to autobuild.xml 2022-06-08 13:33:59 -06:00
Dave Parks 6c6d9a10f8 SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation. 2022-05-20 13:31:18 -05:00
Dave Parks 3400e5fd30 SL-17284 Reflection probe tuning and optimization take 1 2022-05-16 17:21:08 +00: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
Nat Goodspeed ae4f64eee7 SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix. 2022-03-28 16:45:22 -04:00
Nat Goodspeed 9e2f571687 SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix. 2022-03-28 16:43:22 -04:00
Nat Goodspeed 9d7f8156c6 SL-17079: Update to viewer-manager build 569958 2022-03-25 15:53:28 -04: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
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
 2022-02-28 21:54:21 +02:00
Nat Goodspeed a6430f42f3 SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555 2022-02-15 16:11:59 -05:00
Nat Goodspeed f09b0a6a08 SL-16842, SL-14300: Update to viewer-manager build 568552 2022-02-15 16:10:36 -05:00
Nat Goodspeed 7491a56144 SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix. 2022-02-11 13:58:49 -05:00
Nat Goodspeed 78e32d943e SL-16842: Update to viewer-manager build 568451 2022-02-11 13:58:04 -05:00
Nat Goodspeed 9bd45e6fab SL-13792: Merge branch 'DRTVWR-555' into DRTVWR-553-555. 
This picks up the change to 32-bit Windows viewer-manager.
 2022-02-08 20:09:52 -05:00
Nat Goodspeed 846413c961 DRTVWR-555: Update to viewer-manager build 568310 2022-02-08 20:08:42 -05:00
Andrey Lihatskiy 967707cfd0 Merge branch 'DRTVWR-555' into DRTVWR-553+555 
# Conflicts:
#	autobuild.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/viewer_manifest.py
 2022-02-08 23:22:59 +02:00
Nat Goodspeed e37f8c6020 SL-16788: Update to viewer-manager build 568156 2022-02-04 11:58:53 -05:00
Andrey Kleshchev ca26bb40ce SL-16787 Updater launch issues. 2022-02-04 01:36:47 +02:00
Nat Goodspeed 1de684a8ea SL-13792: Update to viewer-manager build 568036 2022-02-02 11:33:03 -05:00
Nat Goodspeed a0dcfeb10e SL-13792: Update to viewer-manager build 568005 2022-02-01 16:34:51 -05:00
Nat Goodspeed 7b6269fd10 SL-13792: Update to viewer-manager build 567997 2022-02-01 14:43:57 -05:00
Andrey Lihatskiy 2dd192ce36 DRTVWR-540 Updated LLCA to CT build 567974 2022-02-01 18:54:48 +02:00
Nat Goodspeed 91743a9dfa SL-13792: Use new Python 3 SLVersionChecker. 
On Mac, execute the packaged SLVersionChecker directly rather than invoking
system Python on our manually-bundled scripts.
 2022-01-31 18:07:42 -05:00
Andrey Kleshchev f8441963fc Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 
Final merge of DRTVWR-542 into DRTVWR-546, this only picks up a merge fix for updater.
 2022-01-13 21:27:14 +02:00
Andrey Lihatskiy 6c029e4858 DRTVWR-533 Updated LLCA to CT build 567162 2022-01-11 02:30:30 +02:00
Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK 
# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
 2022-01-10 23:51:52 +02:00
Andrey Lihatskiy 747dbb7da2 Merge branch 'master' into DRTVWR-540-maint 2021-12-26 14:01:06 +02:00
Andrey Lihatskiy 83b4ea59fc Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Andrey Kleshchev 2800905ac3 Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt 
+resolved viewer-manager's inherited conflict
 2021-12-15 21:36:58 +02:00
Andrey Kleshchev aa309c2eef updated viewer-manager after merge 2021-12-15 21:23:03 +02:00
Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
#	indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
 2021-12-15 21:16:47 +02:00
Bennett Goble 0b95b9d008 Merge branch 'master' into SL-15742 2021-12-11 10:29:37 -08:00
Bennett Goble f729cfc33f SL-15742: Convert build scripts to Python 3 
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.

Breaking change: Python 2 support ending

Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.

Notes

- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
 2021-12-10 14:42:49 -08:00
Andrey Kleshchev 850767eb21 SL-16396 Updater fails with "takes exactly 3 arguments" error 2021-11-29 21:55:45 +02:00
Andrey Kleshchev 27e4e245d9 Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 2021-11-29 20:33:13 +02:00
Andrey Kleshchev 98b416ff5c SL-16396 Updater fails with "takes exactly 3 arguments" error 2021-11-23 22:56:05 +02:00
Andrey Lihatskiy 49dd88e86c Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llviewerinput.cpp
 2021-11-19 04:45:15 +02:00
Andrey Kleshchev 472509dff4 SL-16235 Update fmod to 2.02.03 2021-11-18 20:35:42 +02:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Andrey Kleshchev 5ccdcf51a3 Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt 2021-11-16 02:22:54 +02:00
Andrey Lihatskiy 0505c6ebbb Merge branch 'master' into DRTVWR-534 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2021-11-16 01:21:55 +02:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Andrey Kleshchev 5534781acf SL-15333 Crash in glh_init_extensions 2021-11-12 17:21:50 +02:00