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: microbuilder/LPC810_CodeBase
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: devmapal/LPC810_Pong
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.
  • 15 commits
  • 17 files changed
  • 4 contributors

Commits on Aug 10, 2013

  1. Updated .project file and added .gitignore

    @devmapal
    devmapal committed Aug 10, 2013
    Configuration menu
    Copy the full SHA
    5e2f520 View commit details
    Browse the repository at this point in the history

  2. Added simple rendering functions as a starting point

    @devmapal
    devmapal committed Aug 10, 2013
    Configuration menu
    Copy the full SHA
    e4d4ea6 View commit details
    Browse the repository at this point in the history

  3. Fixed some problems with the renderer

    @devmapal
    devmapal committed Aug 10, 2013
    Configuration menu
    Copy the full SHA
    ee56e8d View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2013

  1. Prepared access to UART Driver API

    @devmapal
    devmapal committed Aug 11, 2013
    Configuration menu
    Copy the full SHA
    703ff4a View commit details
    Browse the repository at this point in the history

  2. Added simple receive function without interrupt

    @devmapal
    devmapal committed Aug 11, 2013
    Configuration menu
    Copy the full SHA
    f4b1237 View commit details
    Browse the repository at this point in the history

  3. Code cleanup, removed unnecessary, uncommented uart api calls

    @devmapal
    devmapal committed Aug 11, 2013
    Configuration menu
    Copy the full SHA
    f366cc5 View commit details
    Browse the repository at this point in the history

  4. Added necassary unocode characters and their printing

    @devmapal
    devmapal committed Aug 11, 2013
    Configuration menu
    Copy the full SHA
    88db4cd View commit details
    Browse the repository at this point in the history

  5. Implemented basic pong ball class + rendering

    @devmapal
    devmapal committed Aug 11, 2013
    Configuration menu
    Copy the full SHA
    9662b31 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2013

  1. Implemented score rendering

    @devmapal
    devmapal committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    e6ed2ab View commit details
    Browse the repository at this point in the history

  2. Added Player bats and WIP collision detection.

    @CGaul
    CGaul committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    e11d530 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/devmapal/LPC810_Pong.git 

    Conflicts:
	src/main.c
	src/renderer.c
	src/renderer.h
    @CGaul
    CGaul committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    f11f55b View commit details
    Browse the repository at this point in the history

  4. Implemented point counter and ball respawn

    Constantin Gaul authored and Constantin Gaul committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    360c815 View commit details
    Browse the repository at this point in the history

  5. Collision detection now at testing stage.

    @CGaul
    CGaul committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    197f086 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/devmapal/LPC810_Pong.git 

    Conflicts:
	src/main.c
	src/renderer.h
    @CGaul
    CGaul committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    7d78a3b View commit details
    Browse the repository at this point in the history

  7. Finally :)

    Constantin Gaul authored and Constantin Gaul committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    189eb23 View commit details
    Browse the repository at this point in the history
Loading