aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #223 from Ms2ger/CStringtomaka2015-01-231-1/+2
|\ | | | | Fix a use-after-free in Android get_proc_address.
| * Fix a use-after-free in Android get_proc_address.Ms2ger2015-01-231-1/+2
|/
* Merge pull request #219 from bjwbell/remove-deadcode-warningtomaka2015-01-231-0/+1
|\ | | | | Remove deadcode warning in BuilderAttribs
| * Remove deadcode warning in BuilderAttribsBryan Bell2015-01-231-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-warningstomaka2015-01-232-0/+2
|\ \ | |/ |/| Disable compiler unstable warnings
| * Disable compiler unstable warningsBryan Bell2015-01-222-0/+2
|/ | | | | To cleanup the compiler output when building, disable warnings about using unstable crates/features.
* Merge pull request #217 from glennw/context-fallbacktomaka2015-01-222-2/+26
|\ | | | | Some GPU/driver combinations have glxCreateContextAttribsARB present, bu...
| * Fix log prefixGlenn Watson2015-01-231-1/+1
| |
| * Some GPU/driver combinations have glxCreateContextAttribsARB present, but it ↵Glenn Watson2015-01-222-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/osxBrendan Zabarauskas2015-01-222-20/+22
|\ \ | |/ |/| Fix OS X build.
| * Fix OS X build.Josh Matthews2015-01-212-20/+22
|/
* Merge pull request #215 from akiss77/pr-u8-c_char-upstreamtomaka2015-01-202-2/+2
|\ | | | | `c_char` isn't always `i8`
| * `c_char` isn't always `i8`Akos Kiss2015-01-202-2/+2
|/
* Merge pull request #214 from bjz/osx-windowBrendan Zabarauskas2015-01-201-62/+109
|\ | | | | Move osx delegate stuff into separate type
| * Move osx delegate stuff into separate typeBrendan Zabarauskas2015-01-201-58/+108
| |
| * if letifyBrendan Zabarauskas2015-01-191-8/+5
| |
* | Merge pull request #213 from tomaka/permanent-iteratorstomaka2015-01-194-11/+33
|\ \ | |/ |/| Iterators returned by wait_events and poll_events are now persistent
| * Iterators returned by wait_events and poll_events are now persistentPierre Krieger2015-01-194-11/+33
| |
* | Merge pull request #211 from glennw/upstream-fixestomaka2015-01-196-3/+49
|\ \ | |/ |/| Upstream of various fixes and features (details below)
| * Fix android APIGlenn Watson2015-01-191-1/+1
| |
| * Add missing get_api stubs.Glenn Watson2015-01-196-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-winapitomaka2015-01-181-2/+2
|\ | | | | Fix for changes in winapi
| * Fix for changes in winapiPierre Krieger2015-01-181-2/+2
|/
* Merge pull request #209 from bjz/osx-windowtomaka2015-01-182-35/+29
|\ | | | | Remove unnecessary inner method in OSX window constructor
| * Clean up pattern matchesBrendan Zabarauskas2015-01-181-16/+14
| |
| * Remove unnecessary inner methodBrendan Zabarauskas2015-01-181-16/+12
| |
| * Squash some warningsBrendan Zabarauskas2015-01-181-3/+3
|/
* Merge pull request #208 from kazimuth/osxcontexttomaka2015-01-181-4/+10
|\ | | | | Fix #177 merge conflicts
| * Remove AsciiExt import, s/uint/u32/, delete some files I accidentallyJames Gilles2015-01-176-2223/+5
| | | | | | | | committed (whoops)
| * Merge PixelPirate's changes and fix merge conflictsJames Gilles2015-01-176-4/+2228
|/|
| * Removed NSOpenGLPFAOpenGLProfiles enum in favor of the one defined in the ↵Patrick Horlebein2014-12-301-15/+4
| | | | | | | | AppKit bindings
| * Fixed missing std::ascii::AsciiExt importPatrick Horlebein2014-12-301-0/+1
| |
| * Minor match clause cleanupPatrick Horlebein2014-12-291-3/+1
| |
| * Fixed deprecation warningsPatrick Horlebein2014-12-291-2/+2
| |
| * Started adding support for selection OpenGL versions on OS X. Needs issue ↵Patrick Horlebein2014-12-291-4/+23
| | | | | | | | #176 to be fixed.
* | Merge pull request #207 from tomaka/update-rustctomaka2015-01-171-0/+1
|\ \ | | | | | | Update for rustc/cargo
| * | Update for rustc/cargoPierre Krieger2015-01-171-0/+1
| | |
* | | Merge pull request #206 from tomaka/non-mutable-set-cursortomaka2015-01-171-1/+1
|\ \ \ | |/ / |/| | Change &mut self to &self in set_cursor
| * | Change &mut self to &self in set_cursorBryan Bell2015-01-171-1/+1
|/ /
* | Merge pull request #204 from tomaka/fix-osx-attempttomaka2015-01-151-4/+4
|\ \ | | | | | | More OS/X fixes
| * | More OS/X fixesPierre Krieger2015-01-151-4/+4
|/ /
* | Merge pull request #203 from tomaka/osx-fix-attempttomaka2015-01-151-2/+2
|\ \ | | | | | | More OS/X fixes
| * | More OS/X fixesPierre Krieger2015-01-151-2/+2
|/ /
* | Merge pull request #202 from tomaka/osx-fix-attempttomaka2015-01-153-25/+25
|\ \ | | | | | | Blind attempt to fix the OS/X build
| * | Blind attempt to fix the OS/X buildPierre Krieger2015-01-153-25/+25
|/ /
* | Merge pull request #200 from ozkriff/mastertomaka2015-01-151-0/+1
|\ \ | | | | | | android: Fixed depth buffer
| * | android: Fixed depth bufferAndrey Lesnikov2015-01-151-0/+1
|/ /
* | Merge pull request #197 from ozkriff/mastertomaka2015-01-1310-90/+91
|\ \ | | | | | | x11, android, win: [ui]size -> [ui]32
| * | x11, android, win32: [ui]size, [u]int -> [ui]32Andrey Lesnikov2015-01-1310-90/+91
| | |
* | | Merge pull request #196 from ozkriff/mastertomaka2015-01-131-1/+1
|\| | | | | | | | Fixed android: Added 'MouseCursor' import
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 03:59:19 +0000