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

1709 Commits (962be69e7170a9f7e8a99b9da4eae22ea6cdb038)

Author SHA1 Message Date
Ansariel ddfb4a5d1b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-08 14:30:18 +02:00
Ansariel 609cf90e3c Fix surprising render results 2021-05-27 18:12:03 +02:00
Ansariel 8a44c58dee Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-04-02 22:53:28 +02:00
Ansariel 04b074f3b5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-02 17:30:58 +02:00
Andrey Kleshchev d357bf7ae5 SL-14990 Turn on shader init logging after crash 2021-04-01 19:44:56 +03:00
Ansariel 2bbf8c4fc6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-25 18:54:17 +01:00
Ansariel 5326c9cdb0 FIRE-30833: Add Cascadia Code font both as option for the UI as for the script editor 2021-03-20 13:45:54 +01:00
Dave Houlton 303feae305 Merge branch 'master' v6.4.17 into DRTVWR-525 2021-03-10 09:34:16 -07:00
Ansariel e6c34f01d2 Revert revert of Simplified Cache viewer release - continue with simplified cache 
This reverts commit 40ad606ae0, reversing
changes made to 906cfe699d.
 2021-03-10 15:13:12 +01:00
Ansariel 40ad606ae0 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer (Revert of Simplified Cache viewer release) 2021-03-10 15:10:41 +01:00
Nicky 493200bca5 Undo Linux updates. 2021-03-09 10:40:01 +01:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Nicky d7e046067f Merge phoenix-firestorm/master into linux-updates 2021-03-04 22:34:04 +01:00
Ansariel 3804ec1d03 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-04 08:35:13 +01:00
Ansariel c36098c881 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 21:20:43 +01:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Dave Houlton 363bc9d9d0 Merge branch 'master' v 6.4.15 into DRTVWR-525 2021-03-02 14:25:36 -07:00
Ansariel eb93395009 Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-02-15 21:02:07 +01:00
Ansariel 4f834d8224 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 21:01:07 +01:00
Nicky 4e3cd245e6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates 2021-02-15 17:46:45 +01:00
Ansariel fc9ce05abd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 10:19:01 +01:00
Kitty Barnett c8286c2403 Merge branch 'rlva/development' 2021-02-13 13:56:46 +01:00
Nicky 24b2f60d1a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates 2021-02-06 00:18:07 +01:00
Dave Houlton dab0948544 DRTVWR-525, improve dev's quality-of-life 2021-02-04 10:54:00 -07:00
Callum Prentice d26567915c Merge with Master after Viewer release 2021-02-03 09:31:32 -08:00
Ansariel 2057fa9716 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 18:10:48 +01:00
Ansariel e150a40ff8 Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-02-02 15:16:17 +01:00
Ansariel 24e4b6867a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-02 15:00:04 +01:00
Dave Houlton 033d16747c DRTVWR-525 fix build error resulting from 6.4.13 merge 2021-02-01 16:25:56 -07:00
Dave Houlton f07b332ef0 Merge branch 'master' into DV525-merge-6.4.13 2021-02-01 15:59:08 -07:00
Ansariel 52b3bb404c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 12:38:03 +01:00
Kitty Barnett 0e02c0d197 Merge branch 'rlva/feature/effect-sphere' into rlva/develpment 2021-01-10 23:37:10 +01:00
Ansariel 93f1998a47 Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-01-08 23:06:41 +01:00
Kitty Barnett 712030c8fc Merge branch 'viewer/build' into rlva/development 2021-01-07 17:18:10 +01:00
Ptolemy a5aac89809 SL-14035: Don't use sRGB textures when not specified 2021-01-06 18:17:56 -08:00
Kitty Barnett 35564009af Merge branch 'rlva/feature/effect-sphere' into rlva/development 2021-01-06 16:28:42 +01:00
Kitty Barnett 22a5734051 A clever bunny noticed that other commands use dist[min|max] rather than [min|max]dist 2021-01-06 04:36:56 +01:00
Kitty Barnett db89a4646c Minor refactoring + add @setsphere_origin to switch between avatar and camera anchoring 2021-01-06 02:24:39 +01:00
Kitty Barnett 626f806fc4 Add a mode parameter to @setsphere and add a blur effect 2021-01-05 23:27:00 +01:00
Kitty Barnett 8e165bc66e Merge branch 'vision-spheres-hg' into rlva/feature/vision-sphere 2021-01-03 16:43:26 +01:00
Beq 4d9ef8e06b BUG-228586 and related. Colour space fixes to address specularity issues 
This is effectively just completing the reversion of the gamma changes made by LL then partially backed out. (from Rye)
 2020-12-28 11:58:55 +00:00
Ansariel caf7f6c1d2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:53:39 +01:00
Ansariel a0be0371d7 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 01:12:13 +01:00
Ansariel af2abe17cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 00:51:42 +01:00
Dave Houlton 21e2f3e974 Merge branch 'master' 6.4.12 into DRTVWR-510 2020-11-11 15:43:06 -07:00
Callum Prentice 9b1d9150c2 Merge branch 'master' into DRTVWR-519 2020-11-11 13:22:35 -08:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
 2020-11-11 22:14:24 +02:00
Brad Payne (Vir Linden) 9d5c64dddc SL-14264 - ViewerStats added logging of most gGLManager fields 2020-11-10 13:11:08 +00:00
Ansariel af61974386 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-05 09:14:11 +01:00
Nicky Dasmijn 78671526d7 Merge remote-tracking branch 'fs/master' into linux-updates 2020-10-26 21:52:11 +01:00