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

28229 Commits (559934705fd766430ccdd4b4e41e26a277f63637)

Author SHA1 Message Date
Dave Parks 559934705f Backout OpenGL 2.1 compatibility attempt 2013-05-17 12:27:50 -05:00
Dave Parks e6c2a76529 NORSPEC-187 Directional ambient work in progress. 2013-05-17 12:19:08 -05:00
Dave Parks f18fd226c3 Fix for compilation error in shadows disabled and don't load transform feedback shaders unless transform feedback is enabled. 2013-05-16 17:13:16 -05:00
Dave Parks d9a241aaf5 NORSPEC-190 Fix for local lights not being gamma corrected on alpha objects. 2013-05-16 15:25:25 -05:00
Dave Parks 4afa355797 NORSPEC-185 Fix for regression caused by accidentally checking in debug code. 2013-05-16 14:36:22 -05:00
Dave Parks b3df764bd3 Attempt at making deferred rendering work on OpenGL 2.1 2013-05-15 17:35:28 -05:00
Dave Parks da6022e9b4 NORSPEC-175 Force "alpha mode" to blend in UI when transparency is above zero 2013-05-15 15:30:00 -05:00
Dave Parks 46eface63c NORSPEC-181 Fix for performance regression. 2013-05-14 16:20:54 -05:00
Dave Parks be712ba6b5 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-14 11:48:04 -05:00
Graham Madarasz c334a185f3 NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker 2013-05-14 05:59:48 -07:00
Dave Parks e1db8d4191 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-13 23:05:39 -05:00
Dave Parks dc38ef5d39 NORSPEC-177 Add glare to transparent surfaces. 2013-05-13 17:26:51 -05:00
Graham Madarasz d9e8ee7cfd NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter 2013-05-13 13:02:53 -07:00
Dave Parks 369dadf823 NORSPEC-173 Fix for mac build 2013-05-13 13:34:14 -05:00
Dave Parks 3702cb138f NORSPEC-171 Fix for full bright checkbox breaking transparent objects with materials set. 2013-05-13 12:15:05 -05:00
Dave Parks edd6349952 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-13 10:57:05 -05:00
Kitty Barnett 5ac9d9cb05 LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null 2013-05-12 16:10:31 +02:00
Kitty Barnett c2c9380fe1 Avoid code duplication in LLMaterialMgr 2013-05-12 13:02:54 +02:00
Kitty Barnett c486d9498b Refactor LLPanelFace to make it clearer that the material is a property of the face(s) and never the panel 2013-05-12 12:58:46 +02:00
Kitty Barnett 6fd7f146d4 Merged with viewer-dev-materials 2013-05-12 12:39:52 +02:00
Graham Madarasz e1c1428569 Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial 2013-05-11 20:38:23 -07:00
Graham Madarasz f356d7eb9f Fix many issues with selection misapplication and rendering not matching applied materials 2013-05-11 19:58:56 -07:00
Oz Linden ab4104d2d7 increment version to 3.5.3 2013-05-11 13:24:27 -04:00
Oz Linden 4165f2eac8 merge latest integration repo changes 2013-05-11 11:30:20 -04:00
Graham Madarasz a099815774 Merge vwr-dev-mat 2013-05-11 08:11:13 -07:00
callum_linden 9b632f060b NORSPEC-132 Fix for Rotation degree has range -9999.00..9999.00 2013-05-10 16:10:17 -07:00
Graham Madarasz f2455ccaaf Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7 2013-05-10 16:10:25 -07:00
Graham Madarasz e413f4b335 Fixup merge diffs 2013-05-10 15:13:07 -07:00
Dave Parks efe8d75fe3 NORSPEC-173 Shrink size of matrix palette for backwards compatibility. 2013-05-10 16:08:48 -05:00
Oz Linden d47a436815 merge changes for 3.5.2-beta5 2013-05-10 14:56:28 -04:00
Oz Linden 4dd245055f Added tag 3.5.2-beta5 for changeset 895628bb5e16 2013-05-10 14:44:52 -04:00
Graham Madarasz 6074f65991 Merge with vwr-dev-mat 2013-05-10 10:34:26 -07:00
Oz Linden 199086fada merge changes for MAINT-2647 2013-05-10 12:56:25 -04:00
Oz Linden f6519afee0 tag merge of MAINT-2647 2013-05-10 12:56:21 -04:00
Dave Parks d2f71df15f Remove some unreachable code 2013-05-10 11:24:19 -05:00
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
Kitty Barnett 269b8b7de5 NORSPEC-102 Rapid materials updates are not smooth to viewer which is editing the object 2013-05-10 10:50:50 +02:00
Graham Madarasz 5aa3f3c808 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 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 8ba1b1f797 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
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 0f3cbfafcb NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loaded successfully 2013-05-09 14:01:31 -07:00
Graham Madarasz ff919a884b NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loaded successfully 2013-05-09 14:01:31 -07:00
Dave Parks b9bb95f8ae MAINT-2647 Fix for some objects not rendering until first LoD switch/selection. 2013-05-09 15:40:02 -05: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 0ee0f952c2 Rollback NORSPEC-156 change which fails to compile due to implicit cast 2013-05-08 20:00:38 -07:00