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.

8406e2a9

Commit 8406e2a9 authored 9 years ago by Matyáš Latner

Downloads
- Plain Diff

Merge branch 'feature-robbery' into 'devel'

Feature robbery



See merge request !86

parents 9ac5a7bf 9d3791c6

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

android/assets/text/game/robbery/robbery_cs.properties 20 additions, 20 deletions

android/assets/text/game/robbery/robbery_cs.properties
android/assets/text/game/robbery/robbery_de.properties 20 additions, 20 deletions

android/assets/text/game/robbery/robbery_de.properties
android/assets/text/game/robbery/robbery_sk.properties 20 additions, 20 deletions

android/assets/text/game/robbery/robbery_sk.properties
core/src/cz/nic/tablexia/TablexiaSettings.java 0 additions, 1 deletion

core/src/cz/nic/tablexia/TablexiaSettings.java
core/src/cz/nic/tablexia/game/games/robbery/RobberyGame.java 1 addition, 1 deletion

core/src/cz/nic/tablexia/game/games/robbery/RobberyGame.java
core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java 7 additions, 2 deletions

core/src/cz/nic/tablexia/game/games/robbery/RuleScreen.java
core/src/cz/nic/tablexia/game/games/robbery/rules/medium/CA_1_CCRule.java 3 additions, 2 deletions

...tablexia/game/games/robbery/rules/medium/CA_1_CCRule.java

with 71 additions and 66 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