Skip to content
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
wants to merge 131 commits into
base: master
Choose a base branch
from
Open

Matias #4

wants to merge 131 commits into from

Conversation

masotrix
Copy link

@masotrix masotrix commented Aug 9, 2016

Secondary shot of saw and punch now aim to for the head, but have a bug related to refiring. Must be solved.

juakotorres and others added 30 commits April 20, 2016 16:50
…se cansa y debe esperar un rato para volver a correr.
…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.
Javier Zambra and others added 26 commits June 6, 2016 15:26
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
Se cierra la issue RS35 Modo alternativo: Pistol 1.
…olo se dañaba el "label" del jugador y no la vida interna del jugador
@AXDOOMER
Copy link

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?

@masotrix
Copy link
Author

masotrix commented Aug 11, 2016

Ahora sí, puño y motosierra

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants