Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #239 from glennw/fix-close-crash | tomaka | 2015-01-29 | 1 | -17/+25 |
|\ | | | | | Fix crash on close in some X11 drivers | ||||
| * | On some X11 driver implementations, calling XCloseDisplay from a different ↵ | Glenn Watson | 2015-01-30 | 1 | -17/+25 |
|/ | | | | | | | thread causes memory corruption, resulting in a crash. Change window proxy to be a weak reference so that the XCloseDisplay is always called from the main window. | ||||
* | Merge pull request #238 from andrewrk/master | tomaka | 2015-01-29 | 4 | -4/+4 |
|\ | | | | | fix for rust nightly | ||||
| * | fix for rust nightly | Andrew Kelley | 2015-01-28 | 4 | -4/+4 |
|/ | |||||
* | Merge pull request #231 from bjz/osx-window | tomaka | 2015-01-26 | 5 | -21/+31 |
|\ | | | | | Implement some more Cocoa stuff | ||||
| * | Rename osx->cocoa | Brendan Zabarauskas | 2015-01-26 | 5 | -2/+2 |
| | | |||||
| * | Implement some more osx stuff | Brendan Zabarauskas | 2015-01-26 | 1 | -19/+29 |
| | | |||||
* | | Merge pull request #230 from retep998/update-winapi | tomaka | 2015-01-26 | 5 | -55/+72 |
|\ \ | | | | | | | Upgrade to latest winapi | ||||
| * | | Upgrade to latest winapi | Peter Atashian | 2015-01-25 | 5 | -55/+72 |
|/ / | | | | | | | Signed-off-by: Peter Atashian <retep998@gmail.com> | ||||
* | | Merge pull request #229 from bjz/osxup | Brendan Zabarauskas | 2015-01-26 | 1 | -8/+8 |
|\| | | | | | {true, false}->{YES, NO} | ||||
| * | {true, false}->{YES, NO} | Brendan Zabarauskas | 2015-01-26 | 1 | -8/+8 |
|/ | |||||
* | Merge pull request #220 from tomaka/x11-vsync | tomaka | 2015-01-25 | 4 | -2/+96 |
|\ | | | | | Implement vsync for x11 and add vsync example | ||||
| * | Implement vsync for x11 and add vsync example | Pierre Krieger | 2015-01-23 | 4 | -2/+96 |
| | | |||||
* | | Merge pull request #221 from tomaka/fix-rc | tomaka | 2015-01-25 | 1 | -0/+5 |
|\ \ | | | | | | | Fix race condition with XOpenIM | ||||
| * | | Fix race condition with XOpenIM | Pierre Krieger | 2015-01-23 | 1 | -0/+5 |
| |/ | |||||
* | | Merge pull request #224 from andrewrk/fix-error-trait | tomaka | 2015-01-24 | 3 | -11/+22 |
|\ \ | | | | | | | fix for latest rustc | ||||
| * | | fix for latest rustc | Andrew Kelley | 2015-01-23 | 3 | -11/+22 |
|/ / | |||||
* | | Merge pull request #223 from Ms2ger/CString | tomaka | 2015-01-23 | 1 | -1/+2 |
|\ \ | | | | | | | Fix a use-after-free in Android get_proc_address. | ||||
| * | | Fix a use-after-free in Android get_proc_address. | Ms2ger | 2015-01-23 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #219 from bjwbell/remove-deadcode-warning | tomaka | 2015-01-23 | 1 | -0/+1 |
|\ \ | | | | | | | Remove deadcode warning in BuilderAttribs | ||||
| * | | Remove deadcode warning in BuilderAttribs | Bryan Bell | 2015-01-23 | 1 | -0/+1 |
| |/ | | | | | | | | | | | In src/lib.rs remove the deadcode warning about the 'headless' builder attribute. Headless is /actually/ set to false or true depending on if HeadlessRendererBuilder is used. | ||||
* | | Merge pull request #218 from bjwbell/disable-unstable-warnings | tomaka | 2015-01-23 | 2 | -0/+2 |
|\ \ | |/ |/| | Disable compiler unstable warnings | ||||
| * | Disable compiler unstable warnings | Bryan Bell | 2015-01-22 | 2 | -0/+2 |
|/ | | | | | To cleanup the compiler output when building, disable warnings about using unstable crates/features. | ||||
* | Merge pull request #217 from glennw/context-fallback | tomaka | 2015-01-22 | 2 | -2/+26 |
|\ | | | | | Some GPU/driver combinations have glxCreateContextAttribsARB present, bu... | ||||
| * | Fix log prefix | Glenn Watson | 2015-01-23 | 1 | -1/+1 |
| | | |||||
| * | Some GPU/driver combinations have glxCreateContextAttribsARB present, but it ↵ | Glenn Watson | 2015-01-22 | 2 | -2/+26 |
| | | | | | | | | fails with an X error. In this case, catch the X error and fall back to the old method of creating a context. | ||||
* | | Merge pull request #216 from jdm/osx | Brendan Zabarauskas | 2015-01-22 | 2 | -20/+22 |
|\ \ | |/ |/| | Fix OS X build. | ||||
| * | Fix OS X build. | Josh Matthews | 2015-01-21 | 2 | -20/+22 |
|/ | |||||
* | Merge pull request #215 from akiss77/pr-u8-c_char-upstream | tomaka | 2015-01-20 | 2 | -2/+2 |
|\ | | | | | `c_char` isn't always `i8` | ||||
| * | `c_char` isn't always `i8` | Akos Kiss | 2015-01-20 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #214 from bjz/osx-window | Brendan Zabarauskas | 2015-01-20 | 1 | -62/+109 |
|\ | | | | | Move osx delegate stuff into separate type | ||||
| * | Move osx delegate stuff into separate type | Brendan Zabarauskas | 2015-01-20 | 1 | -58/+108 |
| | | |||||
| * | if letify | Brendan Zabarauskas | 2015-01-19 | 1 | -8/+5 |
| | | |||||
* | | Merge pull request #213 from tomaka/permanent-iterators | tomaka | 2015-01-19 | 4 | -11/+33 |
|\ \ | |/ |/| | Iterators returned by wait_events and poll_events are now persistent | ||||
| * | Iterators returned by wait_events and poll_events are now persistent | Pierre Krieger | 2015-01-19 | 4 | -11/+33 |
| | | |||||
* | | Merge pull request #211 from glennw/upstream-fixes | tomaka | 2015-01-19 | 6 | -3/+49 |
|\ \ | |/ |/| | Upstream of various fixes and features (details below) | ||||
| * | Fix android API | Glenn Watson | 2015-01-19 | 1 | -1/+1 |
| | | |||||
| * | Add missing get_api stubs. | Glenn Watson | 2015-01-19 | 6 | -3/+49 |
|/ | | | | | | | Add hidpi_factor() support for retina displays. Fix Resize and MouseMoved events to handle retina displays. Fix inverted y position for MouseMoved events on mac. Fix initial painting on retina display. | ||||
* | Merge pull request #210 from tomaka/fix-winapi | tomaka | 2015-01-18 | 1 | -2/+2 |
|\ | | | | | Fix for changes in winapi | ||||
| * | Fix for changes in winapi | Pierre Krieger | 2015-01-18 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #209 from bjz/osx-window | tomaka | 2015-01-18 | 2 | -35/+29 |
|\ | | | | | Remove unnecessary inner method in OSX window constructor | ||||
| * | Clean up pattern matches | Brendan Zabarauskas | 2015-01-18 | 1 | -16/+14 |
| | | |||||
| * | Remove unnecessary inner method | Brendan Zabarauskas | 2015-01-18 | 1 | -16/+12 |
| | | |||||
| * | Squash some warnings | Brendan Zabarauskas | 2015-01-18 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #208 from kazimuth/osxcontext | tomaka | 2015-01-18 | 1 | -4/+10 |
|\ | | | | | Fix #177 merge conflicts | ||||
| * | Remove AsciiExt import, s/uint/u32/, delete some files I accidentally | James Gilles | 2015-01-17 | 6 | -2223/+5 |
| | | | | | | | | committed (whoops) | ||||
| * | Merge PixelPirate's changes and fix merge conflicts | James Gilles | 2015-01-17 | 6 | -4/+2228 |
|/| | |||||
| * | Removed NSOpenGLPFAOpenGLProfiles enum in favor of the one defined in the ↵ | Patrick Horlebein | 2014-12-30 | 1 | -15/+4 |
| | | | | | | | | AppKit bindings | ||||
| * | Fixed missing std::ascii::AsciiExt import | Patrick Horlebein | 2014-12-30 | 1 | -0/+1 |
| | | |||||
| * | Minor match clause cleanup | Patrick Horlebein | 2014-12-29 | 1 | -3/+1 |
| | |