aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam NAILI2018-02-01 23:29:04 +0100
committerAdam NAILI2018-02-01 23:29:04 +0100
commit79e23774da04497cb83f0cf233e1e9559769d37d (patch)
treee6ed6d5a0d063940d9faaa629d6c9d0151c7f74b
parente6cad7f280c3e4c5ef1ad16d69fc341320777834 (diff)
parentfdd6aef465c8c122754098c3a455f5cf005a7fe3 (diff)
downloadwallj-79e23774da04497cb83f0cf233e1e9559769d37d.tar.gz
Merge branch 'master' of https://github.com/pacien/upem-java-wallj
-rw-r--r--.gitignore1
-rw-r--r--src/docs/user.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index df8cb5f..661bf38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
1* 1*
2!*/ 2!*/
3/out/
3 4
4!.gitignore 5!.gitignore
5!.gitkeep 6!.gitkeep
diff --git a/src/docs/user.md b/src/docs/user.md
index cba47eb..1f947f9 100644
--- a/src/docs/user.md
+++ b/src/docs/user.md
@@ -38,7 +38,7 @@ The program can be started by running the following command:
38 38
39A custom world set contained within a directory can be loaded by supplying its path as command line argument as such: 39A custom world set contained within a directory can be loaded by supplying its path as command line argument as such:
40 40
41 java -jar wallj.jar /home/sforthright/bnl/op_cleanup/ 41 java -Dlevels=/home/sforthright/bnl/op_cleanup/ -jar wallj.jar
42 42
43World definition files stored within the given directories and named as `level$i.txt`, where `$i` is a padded integer, 43World definition files stored within the given directories and named as `level$i.txt`, where `$i` is a padded integer,
44are loaded in alphanumerical order. 44are loaded in alphanumerical order.