Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OpenTechEngine/CEGUI
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: DemeRename
Choose a base ref
...
head repository: OpenTechEngine/CEGUI
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 18 files changed
  • 5 contributors

Commits on Nov 30, 2014

  1. Added semantic key handling to InputAggretator that fires event on ke… 

    …ydown, commented Window.cpp line where semantic event was handled even if it did nothing, documented the InputAggregator injectKeyDown as returning always true
    @hhyyrylainen
    hhyyrylainen committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    ba11d02 View commit details
    Browse the repository at this point in the history

  2. Ogre sample now doesn't capture the mouse on Windows or Linux making … 

    …debugging with release possible
    @hhyyrylainen
    hhyyrylainen committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    b678929 View commit details
    Browse the repository at this point in the history

  3. Added checks to OgreRenderer to erase nullptrs from hardware buffer p… 

    …ool, GeometryBuffer should now only return its buffer to the pool if it has one
    @hhyyrylainen
    hhyyrylainen committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    0c26cf5 View commit details
    Browse the repository at this point in the history

  4. Merged the two semantic event if constructs into a new function

    @hhyyrylainen
    hhyyrylainen committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    af662eb View commit details
    Browse the repository at this point in the history

  5. Merged in Boost113/cegui-fork/DemeRename (pull request #134) 

    Renamed ScrollablePaneDeme to ScrollablePaneDemo
    @mpreisler
    mpreisler committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    36baebb View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2014

  1. Removed the commented line, added note about possiblity of always set… 

    …ting mouse actions as handled
    @hhyyrylainen
    hhyyrylainen committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    5bc0994 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2014

  1. Removed the raw input function, added a flag to control when keys are… 

    … handled
    @hhyyrylainen
    hhyyrylainen committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    3085fd5 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2014

  1. Made all references to the KeyUp function be on key up, added a funct… 

    …ion for handling a scan code
    @hhyyrylainen
    hhyyrylainen committed Dec 4, 2014
    Configuration menu
    Copy the full SHA
    c59a371 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2014

  1. Removed the commend about mouse actions

    @hhyyrylainen
    hhyyrylainen committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    7642f28 View commit details
    Browse the repository at this point in the history

  2. Merged in Boost113/cegui-fork (pull request #133) 

    Fixing OgreRenderer crash and making InputAggregator only return true when input was used
    @timotei
    timotei committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    fb6e26f View commit details
    Browse the repository at this point in the history

  3. Add missing event handled increments

    @timotei
    timotei committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    61f232a View commit details
    Browse the repository at this point in the history

  4. Exclude GLES2StateChangeWrapper.cpp from non-GLES builds

    @timotei
    timotei committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    346b7fd View commit details
    Browse the repository at this point in the history

  5. Fix DevIL find package call 

    Add the headers path so it matches the expected called macros.
This is also in line with how every such call is done.
    @timotei
    timotei committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    fc491f9 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2015

  1. MOD: Fix encoding of the file (to UTF-8 without BOM)

    @Ident
    Ident committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    7715c57 View commit details
    Browse the repository at this point in the history

  2. REM: Removing the unused LayoutCell class. Thanks to "Luben" for the … 

    …hint.
    @Ident
    Ident committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    fcbdd89 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2015

  1. Removed unnecessary include

    @hhyyrylainen
    hhyyrylainen committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    e964285 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2015

  1. Added an experimental function to allow multiple Ogre windows

    @hhyyrylainen
    hhyyrylainen committed Feb 3, 2015
    Configuration menu
    Copy the full SHA
    215ff39 View commit details
    Browse the repository at this point in the history

  2. Fixed compiling samples with newer Ogre 2.0, Compositor won't be trie… 

    …d to initialize
    @hhyyrylainen
    hhyyrylainen committed Feb 3, 2015
    Configuration menu
    Copy the full SHA
    6f00952 View commit details
    Browse the repository at this point in the history
Loading