Skip to content

Commit bd0a116

Browse files
flipcoderflipcoder
committed
Merge branch 'develop'
2 parents f8967ee + 278a3a3 commit bd0a116

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2283
-437
lines changed

‎.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Makefile
2-
microarmy.make
32
src/Qor
43
obj
54
bin/microarmy
6-
test.make
5+
test.make
6+
microarmy_test.make
7+
bin/profiles/ps3.json
8+
bin/*.dll
9+
*.idb
10+
*.pdb
11+
*.ilk
12+
*.exe
13+
*.suo
14+
microarmy.VC.VC.opendb
15+
microarmy.VC.db

‎.gitmodules

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

22
[submodule "lib/Qor"]
33
path = lib/Qor
4-
url = https://github.com/flipcoder/qor.git
4+
url = https://gitlab.com/flipcoder/qor.git
5+
branch = master
6+

‎README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Micro Army
44

5-
A cross between Contra and Super Meat Boy
5+
A twin-stick platformer, inspired by Contra and Super Meat Boy
66

77
Originally developed for 1-Game-A-Month Game Jam (1GAM) during June 2016
88

@@ -18,17 +18,18 @@ No binary releases yet! Check back soon!
1818

1919
### Build Instructions
2020

21-
[Windows Build Instructions](https://gist.github.com/flipcoder/087cdef35acd1fa3da8e18894b3b305b)
21+
[Windows build instructions (from QorBook)](https://github.com/flipcoder/qor/blob/master/QorBook.md)
2222

2323
[Script for ArchLinux, Antergos, Manjaro, etc.](https://gist.github.com/flipcoder/041e534a1aa482ff1fd5cece57052f92)
2424

25-
### Manual Installation
25+
### Manual Installation (advanced)
2626

2727
- Initialize the submodules and checkout the master branches:
2828

2929
```
3030
git submodule update --init --recursive
3131
git submodule foreach --recursive git checkout master
32+
git submodule foreach --recursive git pull origin master
3233
```
3334

3435
- Get the libraries:
@@ -40,10 +41,12 @@ Vorbis, Boost, Jsoncpp, Pthread, Bullet, Sdl2, Raknet, Glew, Assimp, Freeimage,
4041
- Build with [premake4](http://industriousone.com/premake/download):
4142

4243
```
43-
premake4 gmake
44+
premake5 gmake
4445
make microarmy config=release -j`nproc`
4546
```
4647

48+
If the make command stalls your system, use -j1 or a number lower than your cpu core count.
49+
4750
- Run microarmy_dist from the bin folder
4851

4952
## Credits

‎bin/data/PressStart2P-Regular.ttf

68.1 KB
Binary file not shown.

‎bin/data/audio/bonus.ogg

459 KB
Binary file not shown.

‎bin/data/audio/boss.ogg

1010 KB
Binary file not shown.

‎bin/data/audio/shoot3.wav

66.9 KB
Binary file not shown.

‎bin/data/audio/shoot4.wav

42.2 KB
Binary file not shown.

‎bin/data/audio/shoot5.wav

24.2 KB
Binary file not shown.

‎bin/data/audio/shoot6.wav

188 KB
Binary file not shown.

‎bin/data/audio/starpop.wav

40.6 KB
Binary file not shown.

‎bin/data/gfx/blocksman.png renamed to ‎bin/data/gfx/blockman.png

File renamed without changes.

‎bin/data/gfx/cracked.png

566 Bytes
Loading

‎bin/data/gfx/flag.png

235 Bytes
Loading

‎bin/data/gfx/flag_nrm.png

221 Bytes
Loading

‎bin/data/gfx/guy.png

616 Bytes
Loading

‎bin/data/gfx/guy_NRM.png

-6.54 KB
Loading

‎bin/data/maps/1.tmx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</properties>
1616
</tile>
1717
</tileset>
18-
<tileset firstgid="64" name="items" tilewidth="16" tileheight="16" tilecount="24" columns="24">
19-
<image source="../tilesets/items.png" trans="ff00ff" width="384" height="16"/>
18+
<tileset firstgid="64" name="items" tilewidth="16" tileheight="16" tilecount="48" columns="24">
19+
<image source="../tilesets/items.png" trans="ff00ff" width="384" height="32"/>
2020
</tileset>
2121
<layer name="parallax" width="250" height="90">
2222
<properties>
@@ -334,7 +334,7 @@
334334
0,0,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
335335
0,0,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
336336
0,0,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,43,0,0,39,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
337-
0,0,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,0,73,1610612782,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
337+
0,0,2684354610,0,0,0,0,0,0,0,92,0,0,0,0,87,73,1610612782,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
338338
0,0,2684354610,0,67,0,68,0,0,0,50,0,0,46,47,47,47,47,47,48,49,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
339339
0,0,2684354610,0,0,0,0,0,0,43,2684354610,0,0,0,0,0,40,2684354607,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
340340
0,46,47,47,47,48,49,0,43,43,2684354610,0,0,0,0,0,40,2684354607,0,0,0,0,0,0,0,0,0,0,0,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,0,0,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,0,0,39,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -359,7 +359,7 @@
359359
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,38,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,63,61,58,0,0,0,0,62,63,3221225534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
360360
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,63,1610612798,60,0,0,0,0,62,63,3221225534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
361361
0,0,42,42,0,0,0,0,0,0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,3221225534,0,0,0,0,0,0,62,63,3221225534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
362-
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,38,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,3221225534,0,0,0,0,0,69,62,63,3221225534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
362+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,38,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,3221225534,0,0,0,0,0,69,62,63,3221225534,0,0,0,0,0,0,0,0,0,0,0,0,81,0,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
363363
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,63,63,63,0,0,62,63,63,63,3221225534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
364364
0,0,41,41,0,0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,63,63,63,0,0,62,63,63,63,3221225534,0,0,57,58,0,0,0,0,0,0,0,0,57,58,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
365365
0,0,0,0,0,0,0,42,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,0,0,0,25,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354610,2684354610,2684354610,0,0,0,38,0,0,0,0,0,0,0,0,0,0,7,8,62,63,63,63,63,63,63,63,63,0,0,62,63,63,63,3221225534,0,0,62,2684354621,0,0,0,0,0,0,0,0,62,2684354621,0,62,63,2684354621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

‎bin/data/maps/maps.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
House
2+
Backyard

‎bin/data/things/blockman.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"type" : "sprite",
3+
"size" : [ 8, 16 ],
4+
"tile-size" : [ 8, 16 ],
5+
"origin" : [ 0.5, 0.8 ],
6+
"mask" : [ 0.1, 0.0, 0.8, 0.9 ],
7+
"animation" : {
8+
"speed" : 10.0,
9+
"frames" : {
10+
"unhit":{
11+
"left": [ 0, 1 ],
12+
"right": [ "hflip", 0, 1 ]
13+
},
14+
"hit":{
15+
"left": [ 1 ],
16+
"right": [ "hflip", 1 ]
17+
}
18+
}
19+
},
20+
"hp": 20,
21+
"speed": 10.0,
22+
"damage" : 10
23+
}
24+

‎bin/data/things/duck.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
}
1919
},
2020
"hp": 20,
21-
"speed": 10.0
21+
"speed": 10.0,
22+
"damage": 10
2223
}
2324

‎bin/data/things/frog.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"type" : "sprite",
3+
"size" : [ 32, 32 ],
4+
"tile-size" : [ 32, 32 ],
5+
"origin" : [ 0.5, 0.8 ],
6+
"mask" : [ 0.1, 0.0, 0.8, 0.9 ],
7+
"animation" : {
8+
"speed" : 10.0,
9+
"frames" : {
10+
"unhit":{
11+
"left": [ 0, 1 ],
12+
"right": [ "hflip", 0, 1 ]
13+
},
14+
"hit":{
15+
"left": [ 1 ],
16+
"right": [ "hflip", 1 ]
17+
}
18+
}
19+
},
20+
"hp": 10,
21+
"speed": 10.0,
22+
"damage": 10
23+
}

‎bin/data/things/guy-prone.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"type" : "sprite",
3+
"size" : [ 16, 8 ],
4+
"tile-size" : [ 16, 8 ],
5+
"origin" : [ 0.5, 0.8 ],
6+
"vision-origin" : [ 0.5, 0.2 ],
7+
"mask" : [ 0.25, 0.0, 0.75, 0.8 ],
8+
"animation" : {
9+
"speed" : 10.0,
10+
"frames" : {
11+
"right": [ 0 ],
12+
"left": [ "hflip", 0 ]
13+
}
14+
}
15+
}
16+

‎bin/data/things/guy.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"size" : [ 8, 16 ],
44
"tile-size" : [ 8, 16 ],
55
"origin" : [ 0.5, 0.8 ],
6+
"vision-origin" : [ 0.5, 0.2 ],
67
"mask" : [ 0.25, 0.0, 0.75, 0.8 ],
78
"animation" : {
89
"speed" : 10.0,

‎bin/data/things/mouse.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
}
1919
},
2020
"hp": 16,
21-
"speed": 50.0
21+
"speed": 50.0,
22+
"damage": 10
2223
}

‎bin/data/things/robot.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
}
1919
},
2020
"hp": 16,
21-
"speed": 50.0
21+
"speed": 50.0,
22+
"damage": 10
2223
}
2324

‎bin/data/things/snail.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
}
1919
},
2020
"hp": 8,
21-
"speed": 10.0
22-
}
23-
21+
"speed": 10.0,
22+
"damage": 10
23+
}

‎bin/data/things/wizard.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
}
1919
},
2020
"hp": 16,
21-
"speed": 2.0
21+
"speed": 2.0,
22+
"damage" : 10
2223
}
2324

‎bin/data/tilesets/items.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@
6060
},
6161
"17,0": {
6262
"name": "duck"
63+
},
64+
"19,0": {
65+
"name": "frog"
66+
},
67+
"23,0": {
68+
"name": "blockman"
69+
},
70+
"4,1": {
71+
"name": "checkpoint"
6372
}
64-
6573
}

‎bin/data/tilesets/items.png

667 Bytes
Loading

‎bin/data/tilesets/items_NRM.png

4.33 KB
Loading

‎bin/data/tilesets/tileset-organized.png

9.64 KB
Loading

‎bin/data/tilesets/tileset-organized_NRM.png

7.56 KB
Loading

‎bin/default-ps3.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "Player",
3+
"sensitivity": 0.5,
4+
"input": {
5+
"binds": {
6+
"gamepad analog 2": "up",
7+
"gamepad analog 0": "left",
8+
"gamepad analog 1": "right",
9+
"gamepad analog 3": "down",
10+
"8": "NoEnemyDamage",
11+
"9": "NoFatalObjects",
12+
"0": "God",
13+
"gamepad 1": [
14+
"shoot",
15+
"back"
16+
],
17+
"gamepad 0": [
18+
"jump",
19+
"select"
20+
],
21+
"gamepad analog 8": "aimup",
22+
"gamepad analog 9": "aimdown",
23+
"gamepad analog 6": "aimleft",
24+
"gamepad analog 7": "aimright"
25+
}
26+
}
27+
}

‎bin/profiles/default.json

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,27 @@
33
"sensitivity": 0.5,
44
"input": {
55
"binds": {
6-
"up": "up",
7-
"left": "left",
8-
"right": "right",
9-
"down": "down",
6+
"w": "up",
7+
"a": "left",
8+
"d": "right",
9+
"s": "down",
10+
"8": "NoEnemyDamage",
11+
"9": "NoFatalObjects",
12+
"0": "God",
13+
"PageUp": "NextLevel",
14+
"PageDown": "PreviousLevel",
1015
"z": [
1116
"shoot",
1217
"back"
1318
],
1419
"x": [
1520
"jump",
1621
"select"
17-
]
22+
],
23+
"i": "aimup",
24+
"k": "aimdown",
25+
"j": "aimleft",
26+
"l": "aimright"
1827
}
1928
}
2029
}

‎bin/settings.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
2-
"audio" : {
3-
"music-volume" : 100,
4-
"sound-volume" : 100,
5-
"volume" : 100
6-
},
7-
"video" : {
8-
"resolution" : "1920x1080",
9-
"vsync" : false,
10-
"windowed" : true
11-
}
2+
"audio" :
3+
{
4+
"music-volume" : 100,
5+
"sound-volume" : 100,
6+
"volume" : 100
7+
},
8+
"video" :
9+
{
10+
"resolution" : "1920x1080",
11+
"vsync" : false,
12+
"windowed" : true
13+
}
1214
}

‎lib/Qor

Submodule Qor updated from a7a96d5 to af016a2

‎microarmy.sln

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "microarmy", "microarmy.vcxproj", "{D852DA48-44BD-8EBF-8DFB-3F65F9A46C14}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|Win32 = Debug|Win32
9+
Release|Win32 = Release|Win32
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12+
{D852DA48-44BD-8EBF-8DFB-3F65F9A46C14}.Debug|Win32.ActiveCfg = Debug|Win32
13+
{D852DA48-44BD-8EBF-8DFB-3F65F9A46C14}.Debug|Win32.Build.0 = Debug|Win32
14+
{D852DA48-44BD-8EBF-8DFB-3F65F9A46C14}.Release|Win32.ActiveCfg = Release|Win32
15+
{D852DA48-44BD-8EBF-8DFB-3F65F9A46C14}.Release|Win32.Build.0 = Release|Win32
16+
EndGlobalSection
17+
GlobalSection(SolutionProperties) = preSolution
18+
HideSolutionNode = FALSE
19+
EndGlobalSection
20+
EndGlobal

0 commit comments

Comments
 (0)