Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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. | |||||
| * | | Add mouse cursor support | Bryan Bell | 2015-01-12 | 9 | -3/+174 | |
| | | | | | | | | | | | | | | | | | | | | | Add a new api, window.set_cursor, for setting the cursor. The enum MouseCursor lists the possible cursors. Only X11 is implemented. On OSX, Android, & Win32 the window.set_cursor function either does nothing or calls the "unimplemented!" macro. | |||||
* | | | Merge pull request #195 from tomaka/appveyor-badge | tomaka | 2015-01-13 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | Add appveyor build status in README | |||||
| * | | | Add appveyor build status in README | Pierre Krieger | 2015-01-13 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Merge pull request #193 from bjwbell/int-and-uint-to-u-and-isize | tomaka | 2015-01-13 | 4 | -35/+35 | |
|\ \ \ | |/ / |/| | | Change uint/int to usize/isize | |||||
| * | | Change uint/int to usize/isize | Bryan Bell | 2015-01-12 | 4 | -35/+35 | |
|/ / | | | | | | | | | From https://github.com/rust-lang/rfcs/pull/544 the types uint/int were renamed to usize/isize. | |||||
* | | Merge pull request #191 from sbward/osx-1.0-alpha | tomaka | 2015-01-12 | 3 | -16/+26 | |
|\ \ | | | | | | | OSX compatibility for Rust 1.0 alpha | |||||
| * | | Revert arch_64 feature flag for rust-cocoa | Sam Ward | 2015-01-11 | 1 | -1/+0 | |
| | | | ||||||
| * | | OSX compatibility for Rust 1.0 alpha | Sam Ward | 2015-01-10 | 3 | -16/+27 | |
| | | | ||||||
* | | | Bump version number | Pierre Krieger | 2015-01-10 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #190 from tomaka/update-rustc | tomaka | 2015-01-10 | 8 | -14/+11 | |
|\ \ | | | | | | | Update for rust alpha 1.0 | |||||
| * | | Update for rust alpha 1.0 | Pierre Krieger | 2015-01-10 | 8 | -14/+11 | |
|/ / | ||||||
* | | Merge pull request #189 from ozkriff/master | tomaka | 2015-01-08 | 1 | -5/+3 | |
|\ \ | | | | | | | android: Updated for Rust ea6f65c5f 2015-01-06 | |||||
| * | | android: Updated for Rust ea6f65c5f 2015-01-06 | Andrey Lesnikov | 2015-01-08 | 1 | -5/+3 | |
|/ / | ||||||
* | | Merge pull request #187 from tomaka/update-rustc | tomaka | 2015-01-08 | 10 | -58/+52 | |
|\ \ | | | | | | | Update for Rustc | |||||
| * \ | Merge remote-tracking branch 'cybergeek94/master' into update-rustc | Pierre Krieger | 2015-01-08 | 3 | -27/+34 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/support/mod.rs src/lib.rs tests/headless.rs | |||||
| | * | | Update to latest Rust nightly | Austin Bonander | 2015-01-08 | 5 | -37/+41 | |
| |/ / |/| | |