d90263f4c4
No idea where these changes came from, but they break local Windows builds 100%
2022-09-25 13:19:48 +02:00
6569f18332
Apply GHA fixes from Nicky's branch that I managed to miss.
2022-09-23 11:23:19 +01:00
c607ff35d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/Python.cmake
2022-09-18 00:24:15 +02:00
9e19e6712b
updates for GHA to get windows to work.
...
also requires python hackery pushed as separate commit pending a better solution.
2022-09-17 22:26:27 +01:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
55f51f4829
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-31 17:02:33 +02:00
718f9fdf7a
Set correct root project name and build type in CMake and don't use VSTool by default
2022-08-13 17:09:24 +02:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
5cdd8cdb6e
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:43:21 +02:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
b96f92f884
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-19 20:31:00 +02:00
b3bfe05494
SL-10025 - via Cathy Foil, all bones now have standard alias 'avatar_' + name.
...
# Conflicts:
# scripts/content_tools/anim_tool.py
2022-05-18 23:31:08 +03:00
307db06310
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
2022-05-18 23:30:02 +03:00
cca7e12e1b
Bring packages formater step on par with 3p installation:
...
- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to
autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle
errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
2022-04-07 02:35:47 +02:00
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
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
c5e258f40f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 08:38:19 +01:00
1168b43580
Windows; use VS_DEBUGGER_WORKING_DIRECTORY to get rid of vstool if
...
possible. Enable by passing --no-vstool to configure
2022-02-26 13:55:14 +01:00
0aa59b2bee
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-22 13:40:40 +01:00
97a273e241
Make sure all bugsplat crashes land in one database per channel.
2022-02-18 22:31:31 +01:00
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
31e8e6fac0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-10 12:42:15 +01:00
c7f39b5043
Linux; bring back breakpad. No upload to bugsplat implemented yet.
2022-02-09 23:04:31 +01:00
b8bcbd9af5
For the moment nnly accept --crashreporting when building a windows viewer. Bugsplat on OSX yields in an unusable viewer (FIRE-31306) and Linux is without crash reporting.
2022-02-08 17:43:03 +01:00
ae2644535b
Linux; Do not build with OpenAL unless really requested.
2022-02-08 09:55:35 +01:00
719702a95a
Fix template verifier erroneously failing checksum check
2022-02-02 12:16:51 +01:00
89b5acfcbf
Fix broken message template check
2022-02-02 12:09:30 +01:00
abe4857fd3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 10:13:39 +01:00
61a842ee43
Debug builds are gone
2022-01-26 19:02:00 +01:00
08fe29a658
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-22 11:46:16 +01:00
55ce47676b
Add option to enable compiler cache (if found).
2022-01-17 18:25:04 +01:00
5929d4780d
Enable ninja build generator for all platforms
2022-01-17 16:54:33 +01:00
43614cfdaa
Remove obsolete scripts.
2022-01-17 14:38:04 +01:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
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
2ba4a164e2
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
2021-12-16 12:32:34 +01:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
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
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
ef7f27b0d5
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-16 16:30:20 +01:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
3209ad92d6
DRTVWR-530 Mac buildfix: changed the license to opensource
2021-11-16 03:36:33 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
a42b5d6809
SL-15999 - made cwd handling a bit more robust in perfbot_run.py
2021-10-22 18:49:54 +01:00
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
910daee888
SL-15999 - perfbot allow --num to default to number of creds
2021-10-21 14:31:03 +01:00
8af72281f5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 13:34:50 +02:00
b7009017c5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 13:01:21 +02:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
23ec0fb50c
SL-16124 - switch default region to Lag Me 5 now that it is set up and working
2021-10-01 15:22:22 -07:00
b3382719ad
SL-16124 First pass at a Python3 script to launch multiple non-interactive Viewers with differing command line options
2021-10-01 12:33:37 -07:00
ea32c0fba2
Strip off _x64 when converting channel > bugsplat db. We do not want x64 and x86 crashes in different databases.
2021-09-26 12:25:45 -04:00
69fd209c83
SL-13313 Updated message_template.msg.sha1
2021-08-31 22:27:45 +03:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
5002c9caf4
Make the configure script smarter by automatically setting up bugsplat in case crashreporting is desire (and a channel is set).
2021-07-15 22:38:40 +02:00
fde4bd2cbc
SL-15177 Add slp-csv converting script
2021-05-12 15:07:17 +03:00
584ec4b4cc
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-22 07:31:19 +02:00
d2f76612a7
SL-15031 - more viewerstats.py support for cleaning up unused settings
2021-04-07 19:48:27 +01:00
704aeb09d8
SL-15031 - option to remove unreferenced settings
2021-04-06 16:32:19 +01:00
b09601e60a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 20:19:15 +02:00
6c1dc74b75
SL-15031 - include settings_per_account stats
2021-04-01 15:55:57 +01:00
2e255caae1
SL-15031 - ViewerStats analysis compare to settings.xml
2021-03-30 16:59:17 +01:00
e0b4149215
SL-15031 - chmod flag
2021-03-26 14:43:05 +01:00
61ab982120
SL-15031 - ViewerStats analysis script
2021-03-26 14:42:40 +01:00
d640123781
Incorporate Tracy profiler as 3p
2021-03-21 14:29:03 +00:00
7362cbf117
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-18 11:56:46 +01:00
57c560fa0e
Merge branch 'master' into DRTVWR-521-maint
2021-02-17 21:23:31 +02:00
c8562a5477
Update message template hash
2021-01-17 13:36:02 +01:00
6305dc1ed8
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 13:33:56 +01:00
7cd921d97b
SL-13313 Update links to master message_template.msg
2021-01-15 14:33:23 +02:00
71ba69e82a
SL-13313 Support RegionInfo5 block in RegionInfo message, and add log message
2021-01-12 16:22:17 +02:00
d8ec51961f
Merge branch 'DRTVWR-517' of https://bitbucket.org/lindenlab/viewer
2020-12-10 19:40:18 +01:00
e3de5de3c1
Merge remote-tracking branch 'origin/master' into DRTVWR-517
2020-11-13 13:59:36 +00:00
57aabe08e3
Try bundling the VC redistributable runtime DLLs of the Visual Studio version first - improved version based on work by Chorazin Allen
2020-11-13 08:59:52 +01:00
538e8fb64e
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-05 09:22:31 +01:00
5b89548761
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-23 12:14:36 +02:00
bf72ffd84b
SL-13705 - added --deleted option to collect info on no-longer-needed text in translated files. Processing needs to be automated as the list is unfeasibly long.
2020-09-18 16:22:54 +01:00
f20b29dcb7
SL-13705 - language list defaults to the standard supported set of FR, ES, IT, PT, JA, DE. '--lang all' will also use this list
2020-09-16 12:51:59 +01:00
713d896d36
SL-13705 - added metadata tab to translation spreadsheet, showing invocation info
2020-09-15 15:49:26 +01:00
a74b366d22
SL-13705 - single output file with one tab per translation language
2020-09-15 13:53:39 +01:00
a1d24974e8
SL-13705 - lock all columns except C in the excel file (apparently google sheets does not respect this setting on import)
2020-09-14 20:34:51 +01:00
822a4fb7d2
SL-13705 - Additional cell/column properties specified in excel output
2020-09-11 21:47:37 +01:00
1eaa76f2f0
SL-13705 - quieter output
2020-09-11 19:37:04 +01:00
3788fdbb03
SL-13705 - fixes and spreadsheet format changes
2020-09-10 19:53:13 +01:00
932f66929d
SL-13705 - support multiple or all languages. more logic for excluding irrelevant fields
2020-09-10 18:58:41 +01:00
cef702d0c5
SL-13705 - bug fixes and comments
2020-08-14 14:11:34 +01:00
f28437adc7
SL-13705 - modified_strings.py handles more cases
2020-08-13 14:54:45 +01:00
1f9852f04c
SL-13705 - modified_strings.py added, for translation support
2020-08-12 18:27:00 +01:00
59de1d58d4
SL-13705 - modified-strings.sh added, for translation support
2020-08-11 14:14:38 +01:00
d80df3cdb7
Update configure script and Windows readme file for VS2017 tools update
2020-07-24 00:20:08 +02:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
b44c133c49
Make the --clean option on autobuild actually work again on Linux.
2020-07-15 09:47:07 -05:00
e3781c3347
Rudimentary VSCode support.
2020-06-13 20:25:01 +02:00
7c7e3ae8ba
Merge remote-tracking branch 'fs/master' into fs-eep-vs2017-d476
2020-06-03 19:28:05 +02:00
24a0b190ba
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-27 12:17:40 +02:00
300eb0378b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-05-21 11:29:11 +02:00
6daf35217e
Update message template master URL
2020-05-21 00:35:09 +02:00
cff453ff51
Merge remote-tracking branch 'eep/master' into fs-eep-vs2017
2020-05-20 13:49:20 +02:00
c1698dc041
SL-13000 - standard params for jellied male/female avs
2020-05-13 21:09:48 +01:00
a4aff377e6
Merge branch 'master' into fs-vs2017
2020-04-29 20:02:19 +02:00
f21941b369
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-04-23 19:33:13 +02:00
db30295c98
Remove FMOD Ex and first round sync with upcoming changes from upstream
2020-04-08 22:29:21 +02:00
22dd92e012
Merge Firestorm
2020-02-21 11:53:36 +01:00
0ce85ef3b8
Linux always builds (and always had been built) with OpenAL, make sure it is always enabled.
2020-02-15 10:22:19 +01:00
f6012f78f9
FIRE-29311: Fix building with OpenAL on Windows, based on a patch by Testicular Slingshot
2020-02-09 19:36:10 +01:00
9ef897a178
exclude all tags/branches to always just get a git hash rather than an amalgamation of tag/branch and hash (which though is valid too).
2020-02-01 14:44:52 +01:00
dc2a972024
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-01-08 17:45:46 +01:00
f238377c80
Bake git rev. hash into the viewer.
2019-12-29 23:27:02 +01:00
7f9bce5ada
Merge branch 'master' into fs-vs2017
2019-12-21 01:52:19 +01:00
a571c4ceba
Merge Firestorm LGPL
2019-12-15 15:03:40 +01:00
d12c9550e9
Let's just go with revcount since we're going to build from tip anyway where it matters (this should be ok for LGPL and release repo)
2019-12-14 17:02:34 +01:00
c1152886f7
Prepare for git:
...
- When configured from a git directory (crudely detected by testring for .git/ existance) use AUTOBUILD_BUILD_ID for the revision.
- Oterwise use the locale mercurial change number (as before).
2019-12-14 10:53:00 +01:00
b75b1eb789
Merge viewer-vs2017
2019-03-31 01:37:56 +01:00
2f3569d78b
Merge Firestorm LGPL
2019-03-21 17:13:44 +01:00
b95fcdf3b3
Some fixes for the build setup:
...
* Fix wrong lookup path for nghttp2.lib on Windows
* Fix missing details in output of configure_firestorm.sh script
* Fix circular link dependency in LLWindow, causing CMake CMP0038 warning;
viewer now builds with CMake 3.13.4 upwards (64bit CMake as well)
2019-03-08 00:03:30 +01:00
7ed3c52d63
Fix indention
2019-03-02 13:14:21 +01:00
ff72f76489
Linux uses a slightly different directory to save breakpad symbols.
2019-03-01 20:59:10 +01:00
6e70616cf2
Merge Firestorm LGPL
2019-03-01 18:58:47 +01:00
218e719d24
Merge viewer-eep
2018-12-13 21:14:20 +01:00
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
29130c5483
SL-10093: Client code to support experiences changing an environment. Handle generic messages with "commands" to be executed.
2018-11-20 10:59:38 -08:00
9735854226
Merge Firestorm LGPL
2018-11-16 18:10:32 +01:00
5532f87f80
Merge Firestorm LGPL
2018-11-16 00:09:19 +01:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
051811ed62
Fix copy&paste error in configure_firestorm.sh script
2018-10-04 02:13:23 +02:00
db8e20101f
Create convenience option for singlegrid in configure_firestorm.sh script
2018-10-04 02:04:42 +02:00
717038bbd9
Merge axon
2018-09-28 00:00:03 +02:00
05d6e376ac
Merge Firestorm LGPL
2018-09-27 22:35:07 +02:00
a84ee929a5
merge
2018-09-27 19:54:10 +01:00
0d04687377
Merge viewer-bugsplat
2018-09-27 00:21:50 +02:00
78866b33a9
Merge
2018-09-26 13:46:45 -07:00
d5fdcd67ab
Merge axon
2018-09-25 17:45:20 +02:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
4c25c8ef9f
Improve --testbuild command description
2018-09-12 18:13:28 +02:00
e4e4ad3c09
SL-966 - animated object size/pos constraints cont, including some settings for debugging. additional options to anim_tool.py for making test animations
2018-09-10 20:13:35 +01:00
b075b3a435
Adjust configure_firestorm.sh to pass VIEWER_SYMBOL_FILE into CMake plus additional fixes on the way:
...
* Reduce platform parameters to darwin, windows, linux (win64 & linux64 aren't used at all, win32 renamed to windows)
* Introduce new parameter --crashreporting to enable crash reporting (Do NOT! use -DRELEASE_CRASH_REPORTING:BOOL=ON anymore - it won't work with new way symbols are generated!)
* Using --build on Windows now won't gloriously fail anymore - Did some ever even tried this before???
* Sync MSBuild command line options with options specified in autobuild.xml
2018-08-31 16:58:30 +02:00
1f02cfc1de
Merge viewer-neko
2018-08-16 14:51:06 +02:00
470e4b5afc
Merge in anim_tool.py refactoring from server-side script.
2018-08-09 18:49:25 -04:00
b50d546d5f
MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
...
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
e054f434cf
Merge Firestorm LGPL
2018-02-12 18:50:42 +01:00
372d63747e
Remove Quicktime leftovers in configuration script
2018-01-31 16:52:46 +01:00
6ffbc1ed56
Remove references to GCC package override file
2018-01-31 16:31:41 +01:00
45e9b40be9
More OS X build fixes.
2018-01-27 08:40:18 -06:00
2bbfe64357
Remove reference to VS2013 64bit package override file
2018-01-25 10:54:05 +01:00
89e753a81d
Merge Firestorm LGPL
2018-01-17 21:20:40 +01:00
Ansariel