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
e36745eb98
merge
2018-01-17 16:06:27 +00:00
fc9500e411
Merge Firestorm LGPL
2018-01-16 20:29:02 +01:00
20bffceffd
Merge Firestorm LGPL
2018-01-09 14:11:28 +01:00
5e1c9a92a8
Add support for FMOD Studio, originally by Drake Arconis (Alchemy Viewer), with FS-specific additions by Drakeo
2017-12-16 19:34:03 +01:00
32cbc9f98b
Merge viewer64
2017-11-05 12:46:02 +01:00
4c6ecac206
MAINT-7081: Make packages-formatter.py handle multi-line copyrights.
...
The nghttp2 autobuild package has copyright information that embeds a newline.
autobuild install --copyrights correctly produces that information onto two
lines. But that means packages-formatter.py must process any lines that do not
match its expected 'packagename: copyright' pattern as the continuation of the
preceding package's copyright information.
Since the processing for autobuild install --versions is so very similar, fold
both into the same outer loop.
Also report all duplicates for any package, instead of stopping at the first.
2017-09-27 15:25:29 -04:00
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
936ccff59f
SL-751 - updated lsl test scripts with bug fix, added a version that uses the new command llGetObjectAnimationNames()
2017-08-31 16:48:26 +01:00
db266722b4
Clean up Firestorm configuration script
2017-07-29 12:56:12 +02:00
22c8efc2ce
SL-731, SL-751 - added debug option DebugAnimatedObjects, updated LSL test script
2017-07-26 18:56:18 +01:00
30880e062a
SL-751, SL-691 - test lsl scripts update, better syncing between skeleton and drawable
2017-07-21 20:01:40 +01:00
dd7580c4f9
Merge Firestorm LGPL
2017-07-21 08:54:52 +02:00
bbe5681d05
SL-751 - added test script move_in_circle_using_llSetRegionPos.lsl
2017-07-20 20:51:06 +01:00
41f7f7a68e
SL-751 - lsl scripts for control of animated objects within a region
2017-07-14 22:18:53 +01:00
f55667397e
SL-722 - handle per-object animation requests, combine for control avatar animation state.
2017-07-06 01:25:10 +01:00
2af5332e46
Added cycle_object_animations.lsl. Also change to test.cpp to see if it affects a g++ internal compiler error.
2017-06-30 21:59:39 +01:00
4d29b95fb5
merge
2017-06-20 22:11:41 +01:00
a3066b7375
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-06-20 16:11:33 -04:00
5d84299cee
Merge Firestorm LGPL
2017-06-19 21:23:53 +02:00
58bfdbefc8
Detect missing AUTOBUILD_VARIABLES_FILE environment variable and early fail configure (or later it will fail more cryptic due to missing LL_BUILD variable).
2017-06-19 02:12:57 +02:00
446eaa8375
Merge with phoenix-firestorm-lgpl
2017-06-18 22:37:11 +02:00
74957676fc
SL-694 - message changes for ObjectAnimation, more logging to validate behavior
2017-06-05 20:22:59 +01:00
55612611c6
SL-694 - stub support for ObjectAnimation message type
2017-05-30 22:03:43 +01:00
c437e17160
Sync message template with master
2017-05-24 09:56:11 +02:00
c4d7f25bac
Merge with phoenix-firestorm-lgpl.
2017-05-23 14:09:46 +02:00
fe64db61d6
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-05-22 21:30:26 -04:00
a8d3d16809
Merge Firestorm LGPL
2017-05-22 22:45:47 +02:00
806fd24704
merge
2017-05-22 21:09:07 +01:00
dcac0dce59
Merge viewer-bear
2017-05-07 13:11:50 +02:00
03e7dc1a6f
Merge with fs-lgpl.
2017-04-04 16:25:22 +02:00
afef92cafc
Merge asset-http
2017-03-20 17:13:42 +01:00
880be86cf2
MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners.
2017-03-10 15:07:55 -08:00
f028290c9e
SL-409 - added size stats to metrics for textures
2017-03-07 08:06:03 -05:00
07d91c5d19
Merge asset-http
2017-03-06 22:48:05 +01:00
015463c731
merge
2017-03-06 14:42:48 -05:00
1771857e6c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-03-06 14:27:29 -05:00
f70abb4ad6
SL-409 - added tracking for bytes fetched to viewer assets metrics (does not currently work for textures)
2017-03-03 15:14:09 -05:00
fdfa832f4d
SL-409 - simple script to summarize viewer metrics logs of asset fetches
2017-03-01 18:10:24 -05:00
16aa95b0c6
Windows; Make autobuild build and clean work again.
2017-02-05 21:05:04 +01:00
dd69a22834
Merge viewer-bear
2017-01-27 09:42:51 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
971ea9f3d7
MAINT-7005 - added ability to set base priority and joint priority in anim_tool.py
2016-12-21 16:18:51 -05:00
295a4c63b4
merge changes for 5.0.0-release
2016-12-05 17:40:04 -05:00
3a8aa2d13d
add viewer channel and version to the beginning of the About box Licenses information
2016-12-02 10:59:06 -05:00
ca3b38fd27
Merge Firestorm LGPL
2016-11-30 20:33:20 +01:00
05c6c72b15
Add build switch to generate time-limited test builds. Use via --testbuild <days>
2016-11-30 15:41:15 +01:00
bc32feea42
Merge Firestorm LGPL
2016-10-15 14:09:17 +02:00
dfd3d3f2dc
Remove HAVE_QUICKTIME_3P cmake option, Quicktime on Windows is finally dead.
2016-10-14 15:15:01 +02:00
cf4e57f565
SL-455 - tweaks to skel_tool.py
2016-09-20 08:08:55 -04:00
8df3092c8b
SL-455 - tweaks to skel_tool.py
2016-09-20 08:08:55 -04:00
0c7abda3c8
Merge bento-box
2016-09-14 23:25:42 +02:00
a11538e034
SL-455 - skel_tool.py check for avatar_lad.xml slider symmetries
2016-09-12 16:50:32 -04:00
b5bbb9f5d5
SL-109 - in skel_tool.py, added check for bone drivers that don't do anything.
2016-09-12 10:48:35 -04:00
5521066237
SL-109 - added another diagnostic option for skel_tool.py. --slider_info dumps the info about bone-affecting sliders to stdout
2016-09-02 08:15:54 -04:00
4acba68785
Merge bento-box
2016-08-11 00:16:36 +02:00
9d8986337a
SL-242 - fix for slider param groups, added default args for skel_tool.py
2016-07-08 15:36:50 -04:00
575c28239d
Merge bento-box
2016-07-06 09:24:11 +02:00
b2a67c00b0
SL-353 - anim_tool.py has more reasonable default location for skeleton and lad files
2016-06-21 17:23:35 -04:00
88b928e1dd
Merge bento-box
2016-06-16 00:53:56 +02:00
27bb57126c
SL-353 - additional anim_tool.py option, --num_pos, to enable creation of large test files
2016-06-14 10:54:30 -04:00
b5f4eab65b
SL-117, SL-315 - resetSkeleton() tweaks, additional validation of skeleton file
2016-05-26 12:52:09 -04:00
7a7973c6a2
SL-315 - arche_tool.py updates, resetSkeleton() now preserves mPelvis state, forces all params to be updated.
2016-05-25 16:40:08 -04:00
806969c11c
SL-315 - added arche_tool.py, a basic script for comparing 'Dump XML' output files
2016-05-25 09:40:45 -04:00
f5065ec5b3
Merge bento-box
2016-05-21 19:59:03 +02:00
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
a46fdc10c7
SL-315 - option to skip hud joints in anim_tool.py
2016-05-19 13:11:45 -04:00
f6e502b6ef
Merge bento-box
2016-05-18 20:34:55 +02:00
bb2c147c26
SL-315 - fix for max/linux build failure, additional lad validation in skel_tool.py
2016-05-18 09:06:46 -04:00
184a5fd82b
SL-315 - resetSkeleton() work, dae_tool.py can add random joint positions to models
2016-05-09 10:25:30 -04:00
62b508ed7e
Merge bento-box
2016-05-09 13:15:50 +02:00
ec471497f5
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
2016-04-29 11:25:17 -04:00
3da9762eee
SL-374, SL-375 - dae_tool.py for dae manipulation, initially to make joint offset test content
2016-04-28 13:44:36 -04:00
f3fb80c947
SL-344 - fixed a problem in avatar_lad with some params in wrong group, added diagnostics to make this easier to detect.
2016-04-27 17:19:09 -04:00
607625a1b5
Merge viewer-quickgraphics
2016-04-23 12:26:49 +02:00
5404f6382e
Merge bento-box
2016-04-23 12:01:35 +02:00
dd0d9319d9
make the About... / Licenses tab more readable by adding blank lines
2016-04-20 17:51:30 -04:00
472215b46c
Merge bento-box
2016-04-14 14:29:20 +02:00
5adc782341
SL-353 - improved handling of skeleton and lad options in anim_tool.py
2016-04-13 16:53:17 -04:00
9012a8a087
SL-338 - added --set_version to anim_tool.py, for creating files to test upload of unsupported file versions.
2016-04-12 11:09:54 -04:00
67eb559dc7
SL-344 - additional sliders, additional avatar_lad validation in skel_tool.py
2016-04-11 21:19:22 -04:00
c27194d97e
Merge Firestorm LGPL
2016-03-31 18:46:28 +02:00
8144c54661
Merge bento-box
2016-03-31 18:46:06 +02:00
a818913ab3
Add support for AVX2 optimizations (available for Windows only so far)
2016-03-29 15:57:02 +02:00
5574e3bbaa
SL-353, SL-344 - basic avatar_lad validation in skel_tool.py script.
2016-03-25 10:28:30 -04:00
bf9626c0a9
SL-353 - bento: utilities for skeleton and anim file manipulation.
2016-03-24 13:32:05 -04:00
5c73246c10
Only use indra/newview/VIEWER_VERSION.txt
2016-02-24 22:50:08 +01:00
ce470a6427
Just for consistency since everything else is in caps...
2016-01-28 19:14:23 +01:00
8f22fbee51
Add --quicktime switch to build with media_plugin_quicktime and enable it for ReleaseFS (Windows only).
2016-01-26 16:38:35 +01:00
38837a0162
Revert accidental commit.
2016-01-18 12:32:35 +01:00
6988580777
OpenJPEG 1.4 is default for now.
2016-01-17 13:13:05 +01:00
de285ab9b2
Merge Firestorm LGPL tip
2016-01-13 12:34:40 +01:00
4ffd74e025
Remove leapmotion, it's outdated and unsupported.
2016-01-06 13:59:08 +01:00
ffbabb46e4
Merge viewer-bear
2015-11-06 19:35:20 +01:00
d048afe845
MAINT-5743 Fixed Remove gpu_table and references to it from viewer packaging
2015-11-02 20:31:15 +02:00
Nicky Dasmijn