Ignored revisions: 12346 Ignoring 2332 ancestors included in old builds. included in: 220134 changeset: 14682:0ebf060ac6c3 tag: tip parent: 14678:33fc9ed99d29 parent: 14681:1e7bc2d6751a user: Dave Parks date: Tue Feb 01 15:35:56 2011 -0600 summary: merge included in: 220134 changeset: 14681:1e7bc2d6751a parent: 14665:b575bde7d5e8 parent: 14680:134ffcddbb30 user: Dave Parks date: Tue Feb 01 02:06:53 2011 -0600 summary: merge included in: 220134 changeset: 14680:134ffcddbb30 user: Dave Parks date: Tue Feb 01 02:06:36 2011 -0600 summary: SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects. included in: 220134 changeset: 14679:387e20bdced8 parent: 14611:38ed1abd9cd9 user: Dave Parks date: Wed Jan 26 17:06:35 2011 -0600 summary: SH-469 Stop using framebuffer objects for hi-res snapshots. codeticket: 220115 included in: 220134 changeset: 14678:33fc9ed99d29 parent: 14677:e94c02901c75 parent: 14665:b575bde7d5e8 user: Oz Linden date: Tue Feb 01 07:22:32 2011 -0500 summary: merge changes back from beta branch