Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tablexia
- Activity
- Members
- Wiki
- Releases
- Model registry

Snippets Groups Projects

Admin message

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

5eed67e0

Commit 5eed67e0 authored 9 years ago by Matyáš Latner

Downloads
- Plain Diff

Merge branch 'feature-shootingrange' into devel

parents 55f6066b 47a74907

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/src/cz/nic/tablexia/game/GameDefinition.java 15 additions, 19 deletions

core/src/cz/nic/tablexia/game/GameDefinition.java
core/src/cz/nic/tablexia/game/games/shooting_range/Properties.java 20 additions, 5 deletions

...cz/nic/tablexia/game/games/shooting_range/Properties.java
core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeGame.java 10 additions, 10 deletions

...tablexia/game/games/shooting_range/ShootingRangeGame.java
core/src/cz/nic/tablexia/game/games/shooting_range/model/GameState.java 0 additions, 14 deletions

...c/tablexia/game/games/shooting_range/model/GameState.java
core/src/cz/nic/tablexia/game/games/shooting_range/tools/ShootingRangeResultResolver.java 27 additions, 0 deletions

...mes/shooting_range/tools/ShootingRangeResultResolver.java

with 72 additions and 48 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment