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: greyblue9/pacman-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jorgerivera/pacman-python
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.
  • 20 commits
  • 41 files changed
  • 5 contributors

Commits on Nov 18, 2014

  1. desactivar verficacion de boton 0 del joystick

    @Nacho0207
    Nacho0207 committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    0f4c2f1 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2014

  1. Se comento linea de inicializar Joystick 

    Animacion clase pacman (index)
Se agrego clase human_ghost
Se agrego parametro controller
    @frankglez92
    frankglez92 committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    61ec873 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/jorgerivera/pacman-python

    @frankglez92
    frankglez92 committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    26965c2 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. agregar directorio para incluir firwmare del arduino

    @Nacho0207
    Nacho0207 committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    d2d88b5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/jorgerivera/pacman-python

    @Nacho0207
    Nacho0207 committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    c4fef3d View commit details
    Browse the repository at this point in the history

  3. Agregando el controlador del Joystick para su movimiento

    @Nacho0207
    Nacho0207 committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    0699b24 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2014

  1. Agregando funcionamiento de Nunchuck

    Chrystel
    Chrystel committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    63b0858 View commit details
    Browse the repository at this point in the history

  2. comentar lineas followNextPathWay(self) para eliminar movimiento auto… 

    …matico de clase human_ghost

agregar lineas de movimiento de pacman a human_ghost
    @frankglez92
    frankglez92 committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    40f897d View commit details
    Browse the repository at this point in the history

  3. forzar un human_ghost (el rojo) 

    usar la tecla 'd' para hacerlo mover a la derecha.
    @jorgerivera
    jorgerivera committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    02e0474 View commit details
    Browse the repository at this point in the history

  4. detectar puertos seriales

    @jorgerivera
    jorgerivera committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    438075e View commit details
    Browse the repository at this point in the history

  5. opciones para incluir un segundo pacman 

    hacer una lista de controladores para recibir los datos
    @jorgerivera
    jorgerivera committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    3d74455 View commit details
    Browse the repository at this point in the history

  6. make a list of all the human players

    @jorgerivera
    jorgerivera committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    68f67a0 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2014

  1. Funcion completa de Nunchuck para Pacman

    Chrystel
    Chrystel committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    7105189 View commit details
    Browse the repository at this point in the history

  2. Al archivo se le modificaron las direcciones para cuando se mueva el … 

    …Joystick

en forma diagonal no leael valor de los voltajes de los dos ejes al mismo
tiempo, si no que tenga una prioridad antes.
Tambien se le quita el delay y los Serial.println para hacer mas eficiente
el programa.
    @Nacho0207
    Nacho0207 committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    796ca24 View commit details
    Browse the repository at this point in the history

  3. Eliminamos el println para que a la hora de entregar los datos no de … 

    …saltos de linea
    Chrystel
    Chrystel committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    6760d07 View commit details
    Browse the repository at this point in the history

  4. Se le quita al Serial.print el ln del final para que no de salto de l… 

    …inea

entre los comandos.
    @Nacho0207
    Nacho0207 committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    793545d View commit details
    Browse the repository at this point in the history

  5. Actualizando el repositorio principal 

    Merge branch 'master' of https://github.com/jorgerivera/pacman-python
    @Nacho0207
    Nacho0207 committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    a316883 View commit details
    Browse the repository at this point in the history

  6. Agregar configuración LEDs 

    Muestra los respectivos LEDs al seleccionar un personaje así como los
patrones de acciones generadas por el juego.
    @KrlsLee
    KrlsLee committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    7af3723 View commit details
    Browse the repository at this point in the history

  7. control serial checkInputs 

    clase pacman2
archivos en sprite
    @frankglez92
    frankglez92 committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    ec245ba View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/jorgerivera/pacman-python

    @frankglez92
    frankglez92 committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    2af4e1f View commit details
    Browse the repository at this point in the history
Loading