1
Fork 0
Commit graph

45 commits

Author SHA1 Message Date
Lorenzo Balugani
c8dfc2c6c0 Merge branch 'master' of https://github.com/Steffo99/LD44 2019-04-28 16:12:49 +02:00
Lorenzo Balugani
67817addb9 Add flask server for online functionalities 2019-04-28 16:12:39 +02:00
fe80dc2a0f Update gamecontroller prefab 2019-04-28 15:37:37 +02:00
8250f7446d Add fonts and message bar 2019-04-28 15:29:17 +02:00
33347480f6 Add life bar 2019-04-28 14:41:28 +02:00
ce348545df Update things 2019-04-28 14:11:21 +02:00
Francesca Peres
013c9da7ae Create pg.png 2019-04-28 01:38:10 +02:00
f6b6e99b38 FInal stuff 2019-04-28 01:34:30 +02:00
08830afea9 Update... something? 2019-04-28 00:30:04 +02:00
c422045fcf Git merge something 2019-04-28 00:29:23 +02:00
3e0fe60e7a Fix more stuff 2019-04-28 00:28:13 +02:00
94ff3d73d6 Fix merge stuff? 2019-04-28 00:20:01 +02:00
05231d03ef Meta? 2019-04-28 00:12:48 +02:00
Francesca Peres
c9174b9088 Merge branch 'master' of https://github.com/Steffo99/LD44 2019-04-28 00:05:11 +02:00
Francesca Peres
65fe17853d qualche simpatico muro 2019-04-28 00:00:09 +02:00
e9d1f2edb5 Quite a lot of stuff 2019-04-27 22:19:35 +02:00
a23d6a3134 Commit stuff? 2019-04-27 20:13:28 +02:00
Lorenzo Balugani
147f063d3f Add monster awareness
Now monsters should be aware of the player if he's in 3 tiles from them
2019-04-27 19:54:06 +02:00
Lorenzo Balugani
2dc6c440e1 Merge branch 'master' of https://github.com/Steffo99/LD44 2019-04-27 19:20:32 +02:00
Lorenzo Balugani
45ca06e33f Fixed player movement script
It works
2019-04-27 19:19:46 +02:00
a76ef94777 Fix map generation 2019-04-27 19:19:37 +02:00
ca23b945df cose 2019-04-27 19:04:27 +02:00
Francesca Peres
d05a76d3ca Create PurpleWall.png 2019-04-27 18:38:48 +02:00
6c875795a8 Do stuff 2019-04-27 17:57:01 +02:00
Francesca Peres
bc79745be6 Revert "Merge branch 'master' of https://github.com/Steffo99/LD44"
This reverts commit 2f580a9e97, reversing
changes made to ce69c966e1.
2019-04-27 17:29:37 +02:00
8af505138f comment stuff 2019-04-27 17:28:38 +02:00
09dd536edf temp fix 2019-04-27 17:24:26 +02:00
681e8bb0f1 Merge branch 'master' of https://github.com/Steffo99/LD44 2019-04-27 17:22:05 +02:00
d45ba1290e Update Steffo scene 2019-04-27 17:22:02 +02:00
Francesca Peres
2f580a9e97 Merge branch 'master' of https://github.com/Steffo99/LD44 2019-04-27 17:20:43 +02:00
0abae3b3b7 Use vector2int instead of a new class 2019-04-27 17:20:25 +02:00
Francesca Peres
ce69c966e1 Create PurpleTileset2.png 2019-04-27 17:20:10 +02:00
Lorenzo Balugani
c53e5acdd2 Merge branch 'master' of https://github.com/Steffo99/LD44 2019-04-27 17:18:59 +02:00
Lorenzo Balugani
32c2382e06 Add a massive mess
Bunch of unfinished code
2019-04-27 17:18:44 +02:00
0b74946998 Update map generation 2019-04-27 17:18:09 +02:00
d4a876097d Map does stuff now? 2019-04-27 16:48:37 +02:00
39b5006295 commit 2019-04-27 16:15:38 +02:00
66296dd31a walkable is not a method 2019-04-27 14:52:24 +02:00
Lorenzo Balugani
f3044b96be Merge remote-tracking branch 'refs/remotes/origin/master' 2019-04-27 14:45:01 +02:00
Lorenzo Balugani
c4a244439e Player class
Add basic player movement
2019-04-27 14:40:09 +02:00
d20edc3663 Update a lot of stuff 2019-04-27 14:21:33 +02:00
f9a20216f5 Merge branch 'master' of https://github.com/Steffo99/LD44 2019-04-27 13:38:32 +02:00
fbd17b8ae5 Create WIP map script 2019-04-27 13:38:29 +02:00
Francesca Peres
1f2d2aecd0 Create PurpleTileset.png 2019-04-27 13:37:32 +02:00
b97dc71ee5 First commit 2019-04-27 02:08:58 +02:00