d640123781
Incorporate Tracy profiler as 3p
2021-03-21 14:29:03 +00: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
Beq