forked from justinfrankel/ninjam
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
merge recent commits from official repo #3
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sues -- from 5e58b1a9
…nges combo box -- from 5ba17cc0 + bb41dc2b
…pes was not reliable -- from a81052ca
…hould actually not matter -- from 084f722b
…acOS) -- from e8dfc7be
… out of range -- from 405a82ec
…g text -- from 70a77a60
…lling -- from e5fc6ac3
…ough search results -- from 1ee893dd
…d don't move leading whitespace -- from 4f9c43f8
…e middle of leading whitespace -- from 67ec7b5b
…en combining lines with backspace -- from 624056d5
(trying to address some of those nextDrawable failures after sleep, maybe) -- from 97a7b473
…e base SDK (thanks Theo Niessink) -- from 424c969f + 60c20d07
…m the parent or destroyed while having capture + Knobs: re-show mouse cursor if UI element is destroyed while being edited -- from cb3c090d
…l.h, swell-misc and swell-gdi both instantiate their copies -- from 8aa1ce87
…c810ea 0e94463f d840d32b ee3191fa 3c8a07fb 942b5951 4fce6fb1 d310c48e 21ade77c f41c5811 c2682afb 812dbf83 1b3eb301
… instances -- from 7f5b2774
… not remove duplicates in this mode -- from ad365b4b
(the duplicated calls to Resort() are intentional, the first removes case-sensitive duplicates and the second simply re-sorts) + IDEs: Lua editor uses case-insensitive sorting for function list menu -- from 24e3c5b9
…yph causing crash JSFX demo: @gfx v=-2147483648; gfx_blit(-1,1,0, 0,0,50,50,v,0,50,50,0,0); -- from 151c1427
When dealing with 32-bit timestamps from GetTickCount(), use DWORD and (x-y) > diff rather than x > y + diff, etc. -- from 3c54d6d3 9f61e10f 1d9982db
…rks -- from f2e756b9
… (x-y) > diff rather than x > y + diff, etc. -- from 3c54d6d3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.