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

28389 Commits (b15cdc828ea188f278b3ffec4e6442cb4688901d)

Author SHA1 Message Date
Graham Madarasz b15cdc828e Fix busted WIP check-in 2013-06-07 13:10:36 -07:00
Graham Madarasz c60eac25e5 Merge MAINT-2740 crash fix 2013-06-07 12:50:02 -07:00
Graham Madarasz 3a4d72f8d9 Merge vwr-dev-mat 2013-06-07 10:50:01 -07:00
Graham Madarasz 3541b4c613 NORSPEC-233 WIP clean up regressions in enable/tentative logic from rework 2013-06-07 10:41:08 -07:00
Graham Madarasz 646b8c0c15 NORSPEC-233 WIP make gcc like it and do some clean-up 2013-06-07 09:10:33 -07:00
Graham Madarasz 7e4e59470f NORSPEC-233 WIP for individual material param edits across hetero object selections 2013-06-07 08:58:15 -07:00
Dave Parks 9bcae4a4e6 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-05 17:35:19 -05:00
Graham Madarasz c38204f5e0 Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat 2013-06-05 14:26:27 -07:00
Graham Madarasz d40acfb05a NORSPEC-237 nix resetting the keyboard focus to cripple the repeats per meter control 2013-06-05 14:18:29 -07:00
Dave Parks 9c7c1efe00 NORSPEC-232 Fix for broken alpha masking with basic shaders disabled. 2013-06-05 15:54:49 -05:00
Graham Madarasz badbce6f97 Merge 2013-06-05 11:51:04 -07:00
Dave Parks 2c46363bfd Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-05 12:38:27 -05:00
Dave Parks e454c3d48c NORSPEC-238, NORSPEC-225 Fix for specular map alpha channel being improperly used and glossiness bludgeoning environment intensity. 
Reviewed/written by Graham.
 2013-06-05 12:31:55 -05:00
Graham Madarasz ef8a7914bd NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or damped by glossiness 2013-06-05 10:08:10 -07:00
Graham Madarasz 8d4864750e NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or damped by glossiness 2013-06-05 10:08:10 -07:00
Graham Madarasz d50aeed8de NORSPEC-238 spec map env mask term in alpha chan ignored 2013-06-05 10:04:51 -07:00
Graham Madarasz 2996f34e86 NORSPEC-238 spec map env mask term in alpha chan ignored 2013-06-05 10:04:51 -07:00
Dave Parks da294b79c0 NORSPEC-236 Fix for rigged attachments with materials not rendering under water when advanced lighting is enabled. 2013-06-05 11:10:32 -05:00
Graham Madarasz bc6070bd19 MAINT-2740 more comment grooming and NULL string guard 2013-06-05 07:38:54 -07:00
Graham Madarasz 1fcf54094a BUG-2707 fix comment typos, remove unnecessary winmm_shim changes, and revert 2672 fix included only for local integ test 2013-06-05 07:24:31 -07:00
Graham Madarasz db85ed33e0 MErge 2013-06-05 06:15:03 -07:00
Graham Madarasz 50689a13ba BOOG2707 uncomment cleared suspects 2013-06-05 06:14:27 -07:00
Graham Madarasz a45860fd66 MAINT-2740 put debug output back with guard of debugger presence per Nat review suggestion 2013-06-04 17:12:46 -07:00
Graham Madarasz 0ce3d2e1cc MAINT-2740 convert to std::string based API for OutputDebug wrapper cleanliness after sage counsel (slight refrain) 2013-06-04 14:17:34 -07:00
Oz Linden edf0a0c7f5 fix modified virtual function names in platform-specific modules 2013-06-04 16:26:11 -04:00
Graham Madarasz 0638f847c7 MAINT-2740 fix XUI callsites in debug mode 2013-06-04 13:24:35 -07:00
Graham Madarasz 2750e86beb MAINT-2740 and MAINT-2672 rework after code review for 2740 fix and include 2672 fix needed for doing local integ tests 2013-06-04 12:57:03 -07:00
Oz Linden 2f87c07a0f merge changes for build number fix 2013-06-04 14:39:08 -04:00
Oz Linden a3a933e212 fix local build numbers when compiling a merge before committing (two parents) 2013-06-04 12:33:51 -04:00
Graham Madarasz 97a2171ea8 MAINT-2740 make use of OsOutputDebugString _DEBUG only to avoid interactions between Win 32-bit SEH and boost coroutine fiber stack handling 2013-06-04 09:05:23 -07:00
Dave Parks 3c2920297e Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-04 10:56:49 -05:00
Graham Madarasz ea24612561 BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds 2013-06-04 07:51:27 -07:00
Dave Parks 82bd96a61c NORSPEC-229 Fix for linux build. 2013-06-03 22:42:26 -05:00
Graham Madarasz 79e92babf5 BUG-2707 and not break use of venerable ifdefs 2013-06-03 18:35:54 -07:00
Graham Madarasz 62d3a010d4 BUG-2707 disable sites calling OsOutputDebugString directly to identify which is tossing our errant exception 2013-06-03 18:11:08 -07:00
Dave Parks f303645156 NORSPEC-195 Fix for incorrect alpha blending with deferred rendering enabled. 2013-06-03 17:10:37 -05:00
Oz Linden 9acabccdde merge changes for 3.6.0-materials-beta1 2013-06-03 18:06:45 -04:00
Oz Linden 7fa8c2313b Added tag 3.6.0-materials-beta1 for changeset fb1630153bac 2013-06-03 18:02:39 -04:00
Oz Linden dd2ede9991 Fix and organize code for managing marker files that detect last_exec_event and last_exec_duration 2013-06-03 17:49:51 -04:00
Graham Madarasz d7e76ed642 BUG-2707 more logging crash hunting 2013-06-03 14:23:51 -07:00
Dave Parks bc57b8050c MATBUG-136 Fix for glow being too bright on rigged attachments. 2013-06-03 15:45:59 -05:00
Dave Parks ab88aa5b34 MATBUG-151 Fix for black textures on Intel HD when glow is present. 2013-06-03 15:17:29 -05:00
Graham Madarasz 19e4db167d NORSPEC-227 fix settings XML merge derp 2013-06-03 13:15:56 -07:00
Graham Madarasz e32242ba52 NORSPEC-227 fix settings XML merge derp 2013-06-03 13:15:56 -07:00
Dave Parks b19d8fad3c Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-03 12:51:11 -05:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
Graham Madarasz 1f9137ed5f BUG-2707 fix unref'd var 2013-06-02 19:52:59 -07:00
Graham Madarasz a1888e72fa BUG-2707 eliminate debug message and memory dump from FrameWatcher, which appears to be going off on login for some 2013-06-02 17:08:01 -07:00
Graham Madarasz 842a6c6e46 BUG-2707 disable more login/update-sequence specific logging 2013-06-02 14:41:57 -07:00
Graham Madarasz cf3d2a06a1 BUG-2707 turn off more LL_DEBUGS to narrow down Kat's crashing cuplrit 2013-06-01 19:36:38 -07:00