• Hanspeter Portner's avatar
    Squashed 'nuklear/' changes from ecf39956..2d8b6dca · b5170fdb
    Hanspeter Portner authored
    2d8b6dca Fix invalid y_offset bug in nk_group_begin.
    15516bdc omk: don't clear draw_list.
    ac7b9760 omk: fix lexer code to work with utf8.
    9275be6f add support for syntax highlighting
    9d91b7c3 Moved Changelog into documentation
    2d31b3af Merge pull request #600 from cartman300/patch-1
    c9189a25 Finished documenation conversion
    ac0901e8 Update Readme.md
    53185557 Add C# binding to the list
    8027ebe0 Second last doc conversion commit
    8709a881 Added input documentation translation
    9a314f0e Finised context documentation translation
    365c9827 Removed last remaining old doc file
    8ae9160b Updated Readme
    882e935c Added documentation html file as link
    dd5f3520 Started documentation transition to markdeep
    9cb143e1 Merge pull request #599 from nsawa/fix_nk_colorf_hsva_f
    83e2c109 Fix nk_colorf_hsva_f alpha calculation
    2891c6af Update demos to new color picker API
    604a7dfa Merge branch 'master' of https://github.com/vurtun/gui
    bd30c124 Fixed #544 color picker (breaking change)
    b47463d2 Merge pull request #598 from mgerhardy/fixed-implicit-fallthrough
    acaab2f4 Fixed implicit fallthrough warning
    df96bac3 Merge pull request #590 from mgerhardy/travis
    3f3091fc Merge pull request #596 from billsix/addReferenceToPyNuklear
    363e9eef Merge pull request #595 from billsix/fixContextualOverviewText
    0e808bcb Merge pull request #594 from fbbdev/better_gitignore
    8c2fb99f add reference to pyNuklear
    1b64d124 show full label in overview popup by expanding horizontal space
    57d1a41b Ignore binary files on linux
    5bbe3373 Removed docu typo
    a9e87c61 Fixed Readme layout
    f08b6203 Split license into dual license MIT/public domain
    b17ec490 TRAVIS: include demo windows and activate warnings
    6bddc5c5 Update demos configurables and removed warnings
    07e422ec Fixed warnings found by gcc and clang
    1a77fc87 Merge branch 'mgerhardy-issue585'
    023c2da4 Fixed define intendation
    683185e7 Merge branch 'issue585' of https://github.com/mgerhardy/nuklear into mgerhardy-issue585
    5b9d6a9e Merge pull request #591 from mgerhardy/issue584
    7bbad088 Merge pull request #589 from mgerhardy/issue588
    61143c34 Fixed issue #585
    107c920f Fixed second part of issue #584
    be55f26a Fixed parts of issue #584
    43277a4f Fixed issue #588
    87d3e9f3 Added documentation for group
    f83c8648 Fixed #583 small warning in GCC
    b6e0e34c Fixed #582 nk_edit_buffer behavior
    b2b08061 Fixed #581 progressbar drawing and behavior
    267383a3 Merge pull request #574 from NuklearBomb/patch-2
    1c07ceaa nk_layout_peek() bugfix
    a9e5e729 Added extended submenus to overview.c
    f7833d03 Fixed #569 and added additional formated tooltip
    2fda8535 Fixed #567 fread size calculation
    f5aeacdc Merge branch 'master' of https://github.com/vurtun/gui
    16c6f2ae Fixed #560 nk_font_atlas_add
    7e32431a Merge pull request #549 from GreenByteSoftware/master
    0c4d93e1 Fixed #563 nk_font_atlas_cleanup behavior
    9e2cce1e Removed not needed } from comment
    5fbcdd0f Fixed #560 loading multiple fonts
    05413607 Fixed warnings and UB in demo code
    1d8aae2b Merge branch 'Predelnik-userdata-fix'
    3636cb1c Fixed #511 and changed formatting
    a012e7b4 Merge branch 'master' of https://github.com/vurtun/nuklear
    988b4088 Fix NK_INCLUDE_COMMAND_USERDATA usage with images.
    56b2612a Fixed #558 NK_WINDOW_NO_INPUT hidding windows bug
    37a00a5f Fixed #555 closing minimized windows and drawing bug
    6a13addb Fixed #413 font merging
    f436c1a1 Merge pull request #550 from kstarzyk/add_osx_build_sfml_demo
    89b32fb9 Merge pull request #553 from NuklearBomb/patch-1
    e76ba09e Use NK_DTOA in function nk_do_property
    c7d9d095 Ident
    dde25790 Fix ident
    bcd0234f Add OSX build for SFML demo
    9a075409 Fix D3D9 rendering in certain scenarios
    36a396fb Merge pull request #546 from nsawa/fix_gcc_warning_unused_variable
    2f269f4d Fix: gcc warning unused variable.
    c24e3d60 Merge branch 'master' of https://github.com/vurtun/gui
    7eb08b8b Fixed #545 with window pos/size modifier
    REVERT: ecf39956 Fix invalid y_offset bug in nk_group_begin.
    REVERT: 524c27e0 omk: don't clear draw_list.
    REVERT: 0c787048 omk: fix lexer code to work with utf8.
    REVERT: 5e70ec4b add support for syntax highlighting
    git-subtree-dir: nuklear
    git-subtree-split: 2d8b6dca629443e7bb6752b1f4920742891af5b3
.travis.yml 408 Bytes