Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement vsync for x11 and add vsync example | Pierre Krieger | 2015-01-23 | 4 | -2/+96 |
| | |||||
* | 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 |
| | | |||||
| * | Fixed deprecation warnings | Patrick Horlebein | 2014-12-29 | 1 | -2/+2 |
| | | |||||
| * | Started adding support for selection OpenGL versions on OS X. Needs issue ↵ | Patrick Horlebein | 2014-12-29 | 1 | -4/+23 |
| | | | | | | | | #176 to be fixed. | ||||
* | | Merge pull request #207 from tomaka/update-rustc | tomaka | 2015-01-17 | 1 | -0/+1 |
|\ \ | | | | | | | Update for rustc/cargo | ||||
| * | | Update for rustc/cargo | Pierre Krieger | 2015-01-17 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #206 from tomaka/non-mutable-set-cursor | tomaka | 2015-01-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Change &mut self to &self in set_cursor | ||||
| * | | Change &mut self to &self in set_cursor | Bryan Bell | 2015-01-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #204 from tomaka/fix-osx-attempt | tomaka | 2015-01-15 | 1 | -4/+4 |
|\ \ | | | | | | | More OS/X fixes | ||||
| * | | More OS/X fixes | Pierre Krieger | 2015-01-15 | 1 | -4/+4 |
|/ / | |||||
* | | Merge pull request #203 from tomaka/osx-fix-attempt | tomaka | 2015-01-15 | 1 | -2/+2 |
|\ \ | | | | | | | More OS/X fixes | ||||
| * | | More OS/X fixes | Pierre Krieger | 2015-01-15 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #202 from tomaka/osx-fix-attempt | tomaka | 2015-01-15 | 3 | -25/+25 |
|\ \ | | | | | | | Blind attempt to fix the OS/X build | ||||
| * | | Blind attempt to fix the OS/X build | Pierre Krieger | 2015-01-15 | 3 | -25/+25 |
|/ / | |||||
* | | Merge pull request #200 from ozkriff/master | tomaka | 2015-01-15 | 1 | -0/+1 |
|\ \ | | | | | | | android: Fixed depth buffer | ||||
| * | | android: Fixed depth buffer | Andrey Lesnikov | 2015-01-15 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #197 from ozkriff/master | tomaka | 2015-01-13 | 10 | -90/+91 |
|\ \ | | | | | | | x11, android, win: [ui]size -> [ui]32 | ||||
| * | | x11, android, win32: [ui]size, [u]int -> [ui]32 | Andrey Lesnikov | 2015-01-13 | 10 | -90/+91 |
| | | | |||||
* | | | Merge pull request #196 from ozkriff/master | tomaka | 2015-01-13 | 1 | -1/+1 |
|\| | | | | | | | | Fixed android: Added 'MouseCursor' import | ||||
| * | | Fixed android: Added 'MouseCursor' import | Andrey Lesnikov | 2015-01-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #192 from bjwbell/mouse-cursors | tomaka | 2015-01-13 | 8 | -4/+179 |
|\ \ | | | | | | | Add mouse cursor support | ||||
| * | | Code review comments | Bryan Bell | 2015-01-13 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | - Revert version back to 0.0.4 - Add comment that set_cursor has no effect on Android | ||||
| * | | Fix OS X & Win32 builds | Bryan Bell | 2015-01-12 | 2 | -2/+2 |
| | | | |||||
| * | | Refine X11 cursor selections | Bryan Bell | 2015-01-12 | 1 | -19/+22 |
| | | | | | | | | | | | | | | | | | | | | | For MouseCursor::Cell, NotAllowed, NoDrop, Grab, Grabbing, ... set the appropriate X11 cursor. Also alphabetize the cursors listed in the MouseCursor enum. |