Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
9fb1de708a
29
src/configuration/config.json
Normal file
29
src/configuration/config.json
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
"arena": [
|
||||
"arena1.png",
|
||||
"arena2.png",
|
||||
"random"
|
||||
],
|
||||
"nb_players": [
|
||||
"1",
|
||||
"2"
|
||||
],
|
||||
"character1": [
|
||||
"character1.png",
|
||||
"character2.png",
|
||||
"random"
|
||||
],
|
||||
"character2": [
|
||||
"character1.png",
|
||||
"character1_swapcolor.png",
|
||||
"character2.png",
|
||||
"character2_swapcolor.png",
|
||||
"random"
|
||||
],
|
||||
"resolution": [
|
||||
"1280 x 1024",
|
||||
"1680 x 1050",
|
||||
"1920 x 1080",
|
||||
"800 x 600"
|
||||
]
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user