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

28121 Commits (da343188ff07bcfc86b3d72a93f327be4f2607e2)

Author SHA1 Message Date
Oz Linden da343188ff fix merge error in 3.5.2 merge 2013-05-10 11:52:08 -04:00
Oz Linden 4d22c32aa9 merge changes for 3.5.2-beta4 2013-05-10 10:56:40 -04:00
Oz Linden 73e6711268 merge changes for latest project changes 2013-05-10 09:51:08 -04:00
Graham Madarasz 425f012814 NORSPEC-164 fix TE copy ctor and operator= to include material pointer in addition to ID 2013-05-09 15:41:07 -07:00
Graham Madarasz 76c2a85661 NORSPEC-168 separate UI handlers for spec and normal textures to avoid cross-talk and fix handling of bumpy/shiny menu items 2013-05-09 15:04:07 -07:00
Oz Linden 33d9adfa9a Added tag 3.5.2-beta4 for changeset a314f1c94374 2013-05-09 18:02:31 -04:00
Graham Madarasz ff919a884b NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loaded successfully 2013-05-09 14:01:31 -07:00
Richard Linden d8f00dd1d1 MAINT-2665 FIX Crashes not being reported in some cases 
made marker file lock use append, not truncate
 2013-05-09 10:54:32 -07:00
Oz Linden 186b604578 remove duplications and other errors introduced during the merge 2013-05-09 10:22:10 -04:00
Graham Madarasz ae0f362f22 Rollback NORSPEC-156 change which fails to compile due to implicit cast 2013-05-08 20:00:38 -07:00
Graham Madarasz 5aaab576ba NORSPEC-156 back to the fix that actually works 2013-05-08 12:53:47 -07:00
Oz Linden 1b984d8f40 merge changes for 3.5.1-release 2013-05-08 14:46:00 -04:00
Dave Parks 21ba1e9c1e Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-07 18:14:29 -05:00
Oz Linden 0e93223aeb Added tag 3.5.2-beta3 for changeset b6a4ac8f1916 2013-05-07 19:03:04 -04:00
Graham Madarasz 0ee77e86de NORSPEC-147 make repeats per meter disabled when in planar mode and make UI reps consistent across layers 2013-05-07 15:21:49 -07:00
Graham Madarasz 8f5fc2d4c1 NORSPEC-156 move gamma correction to vert shader 2013-05-08 12:14:08 -07:00
Graham Madarasz 5c6d52f260 NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with non-deferred fullbright look 2013-05-08 12:01:38 -07:00
Dave Parks b5ecd38657 Fix for bad light map generation/sampling. 2013-05-07 17:11:47 -05:00
Graham Madarasz 080981ae8b NORSPEC-119 another attempt at individual faces edits without side-effects 2013-05-07 12:43:15 -07:00
Graham Madarasz 29246e8a1f NORSPEC-165 tweak panel_tools_texture layout to uncrop the planar align checkbox 2013-05-07 12:27:03 -07:00
Oz Linden 545e033d1e merge changes for DRTVWR-299 2013-05-07 15:11:55 -04:00
Oz Linden 0f3d291ef6 tag merge of DRTVWR-299 2013-05-07 15:11:29 -04:00
callum_linden b121ee4c9d NORSPEC-51 Fix (additional) Added missing image 2013-05-07 11:38:59 -07:00
Oz Linden f382233fbb merge changes for DRTVWR-315 2013-05-07 13:38:39 -04:00
Oz Linden e921e51c18 tag merge of DRTVWR-315 2013-05-07 13:38:36 -04:00
Oz Linden f864a0b562 tag merge of DRTVWR-316 2013-05-07 13:38:07 -04:00
callum_linden 1e7b133e75 Merge with lindenlab/viewer-development-materials 2013-05-06 19:45:23 -07:00
callum_linden 9707f09fd8 MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown() 2013-05-06 15:01:13 -07:00
Dave Parks 9609fa7259 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-06 16:57:13 -05:00
Graham Madarasz 85a123a3e3 NORSPEC-118 fix regression of 118 from extra conditions added for 151 2013-05-06 13:45:49 -07:00
Dave Parks 18e3985120 NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value. 2013-05-06 15:44:44 -05:00
Graham Madarasz cd50679da2 NORSPEC-94 fix this without setting in getState causing round-trip wierdness with spec color picker 2013-05-06 10:19:55 -07:00
Dave Parks df6bb7ace2 MATBUG-78 Fix for alpha lighting falloff not matching for sunlight when shadows are enabled. 2013-05-06 11:11:49 -05:00
Graham Madarasz d42a0e4e80 NORSPEC-126 Make objects with normal maps applied obey legacy shiny settings 2013-05-06 08:56:32 -07:00
Graham Madarasz e0f2a242a7 Remove unnecessary assert as ternary protects against null ptr deref 2013-05-04 18:13:26 -07:00
Graham Madarasz (Graham) 930dfc4f17 NORSPEC-160 fix trashing of spec map from sunshine integration snafu 2013-05-03 15:59:43 -07:00
Kelly Washington 50cee8d660 MAINT-2655: "Block button in permissions dialog prompt does not block object" 
* Fix mute button.
 2013-05-03 21:58:19 +00:00
Kelly Washington 06f9f7b2d9 merge 2013-05-03 21:48:17 +00:00
Kelly Washington 8d0d645cd6 MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions 
* Switch mute to use task id.
reviewed with Simon
 2013-05-03 12:53:37 -07:00
Graham Madarasz (Graham) 04fceb5f00 NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well 2013-05-03 09:16:15 -07:00
callum_linden 90d3045c7f Merge with head 2013-05-03 08:59:35 -07:00
Kelly Washington 45a44225f5 MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions 
* Change text of dialog
* Add callback for mute button
reviewed with Richard and Widely.
 2013-05-03 00:58:55 +00:00
Dave Parks f1975f0fe9 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-02 17:09:32 -05:00
Graham Madarasz dd06eb4021 NORSPEC-157 make texture repeats/offsets controls display in media mode 2013-05-02 13:05:25 -07:00
Dave Parks 6bb9c2720e NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into alpha mask pool. 2013-05-02 12:35:48 -05:00
Graham Madarasz 1a880b47ab NORSPEC-119 redux : fix getState to find the material ID of individually selected faces correctly 2013-05-01 19:03:09 -07:00
Graham Madarasz de582bfe86 NORSPEC-99 add break statement to fix legacy bump vert program from being stomped with inappropriate material prog sans skinning 2013-05-02 10:20:55 -07:00
Dave Parks 90c2be46bf NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes. 2013-05-01 20:01:37 -05:00
Dave Parks 73404da266 Fix for sky being too bright with advanced lighting enabled 2013-05-01 16:48:27 -05:00
Dave Parks 5534078e9d Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-01 16:43:08 -05:00