-
Notifications
You must be signed in to change notification settings - Fork 10
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
Matias #4
Open
masotrix
wants to merge
131
commits into
jendave:master
Choose a base branch
from
njara:Matias
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Matias #4
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
…to move the player in the game.
…se cansa y debe esperar un rato para volver a correr.
…ego (o también llamado skill).
…game se les pasa a los players a través de updateStatus. El skill lo tiene DoomStatus. En updatestatus(DoomStatus DS) se setea el skill para ue el jugador lo sepa.
…r dependen del nivel de dificultad del juego.
Task (BJPR) para etiquetar partes importantes y tareas que debemos hacer.
antes de transformarse en zombie.
…ugador. Indica el porcentaje.
después de un tiempo.
…de cansancio del jugador.
Conflicts: src/main/config/doom.jar src/main/java/net/sourceforge/mochadoom/doom/DoomMain.java
eclipse para ver si puedo hacer el push (intelliJ se quedaba pegado en "Pushing...")
# Conflicts: # src/main/java/net/sourceforge/mochadoom/doom/DoomMain.java
# Conflicts: # run # src/main/config/doom.jar # src/main/config/mochadoom-1.6.1-SNAPSHOT.jar # src/main/java/net/sourceforge/mochadoom/data/info.java # src/main/java/net/sourceforge/mochadoom/gamelogic/Actions.java
…hinegun modo alternativo
…la vida llega a cero
…vo daña al jugador 30% al ser usada
…a cambiarle el color a rojo.
Se cierra la issue RS35 Modo alternativo: Pistol 1.
…olo se dañaba el "label" del jugador y no la vida interna del jugador
I don't understand what's going on with all of these commits. Are you guys trying to create another game based on the Doom engine? |
Ahora sí, puño y motosierra |
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.
Secondary shot of saw and punch now aim to for the head, but have a bug related to refiring. Must be solved.