Commit Graph
96 Commits
Author SHA1 Message Date
Kotrba Filip b66ae414e3 Ammo, wave gui, weapon staty, pilulky 2020-02-02 13:11:38 +01:00
Kotrba Filip efd1736239 merge radio 2020-02-02 12:33:14 +01:00
Kotrba Filip 4380766b88 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-02 12:33:00 +01:00
Kotrba Filip b3ab51725a Edit colors on weapon and amo 2020-02-02 12:32:53 +01:00
Kotrba Filip 1ea514c7d7 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-02 12:23:49 +01:00
Kotrba Filip 97541dfa05 Add new weapon 2020-02-02 12:23:38 +01:00
Kotrba Filip 25fd284880 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-02 12:01:38 +01:00
Kotrba Filip 71725afb88 Add lantern on molo and delete zombie in day 2020-02-02 11:59:56 +01:00
Kotrba Filip a77718b134 add some materials 2020-02-02 11:18:22 +01:00
Kotrba Filip 7c4bf94b09 add pills to heal self 2020-02-02 10:47:16 +01:00
Kotrba Filip 90c9a49afb Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-02 10:19:34 +01:00
Kotrba Filip 2195404a3a Painkillers load 2020-02-02 10:18:28 +01:00
Kotrba Filip 362039a910 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-02 10:15:14 +01:00
Kotrba Filip d0ba3c340f add sounds to enemy dead and edit player for shot gun sounds 2020-02-02 10:14:37 +01:00
Kotrba Filip 7257b45303 Add quit on escapeand get down move speed 2020-02-02 09:00:36 +01:00
Kotrba Filip db4e632716 Create nev scene 2020-02-02 08:46:45 +01:00
Kotrba Filip 63f230f45b Remove new object in spawnScript 2020-02-02 08:36:26 +01:00
Kotrba Filip 042800be1f Repair scene 2020-02-02 08:35:15 +01:00
Kotrba Filip 3e48e0aea5 Repair spikes add health bar and change vizualization of info about amout of wood and ammo 2020-02-02 04:12:43 +01:00
Kotrba Filip ae9a9b51a0 Merge torch 2020-02-02 00:18:46 +01:00
Kotrba Filip 8e03c98ed7 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-02 00:18:33 +01:00
Kotrba Filip 7ad7b2707c Get post procesing add habber nav mesh collider and set emmision on zombie eye 2020-02-02 00:18:24 +01:00
Kotrba Filip 51eb68d34e connect sounds 2020-02-01 23:28:48 +01:00
Kotrba Filip fc81945421 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 23:28:34 +01:00
Kotrba Filip 67effcab6d Remake baricade spice and tree 2020-02-01 23:28:26 +01:00
Kotrba Filip 2d7527ba28 Merge sounds 2 2020-02-01 22:55:25 +01:00
Kotrba Filip 600de9a98b Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 22:55:05 +01:00
Kotrba Filip de5d4e34a8 commit 500 2020-02-01 22:54:57 +01:00
Kotrba Filip 42041e9a5f merge 2 2020-02-01 20:59:11 +01:00
Kotrba Filip 11d39705ae merg 2020-02-01 20:59:03 +01:00
Kotrba Filip d62ce6a45d commit next 2020-02-01 20:58:47 +01:00
Kotrba Filip f48dbc9992 commit 500 2020-02-01 20:58:33 +01:00
Kotrba Filip edaec6c91f Baricade edit 2020-02-01 20:53:49 +01:00
Kotrba Filip 41a534cd5f Merge 2000 2020-02-01 19:54:27 +01:00
Kotrba Filip 2d2554c22f Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 19:54:05 +01:00
Kotrba Filip d72f10e5fe Add day night sounds 2020-02-01 19:53:59 +01:00
Kotrba Filip 685b01d8a2 Merge 100 1 2020-02-01 19:50:45 +01:00
Kotrba Filip 3b083b2b7b Merge 100 2020-02-01 19:50:31 +01:00
Kotrba Filip 61ee2f2794 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 19:50:09 +01:00
Kotrba Filip 5be6cb1476 Blocks 2020-02-01 19:49:53 +01:00
Kotrba Filip a26ab08546 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 18:53:36 +01:00
Kotrba Filip 1e7c1284fc Add amo and change baricade health 2020-02-01 18:53:28 +01:00
Kotrba Filip 3dce0a34af Merge 2020-02-01 18:19:22 +01:00
Kotrba Filip b7a73a3bba Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 18:19:02 +01:00
Kotrba Filip 5f189178bc push 50 2020-02-01 18:17:29 +01:00
Kotrba Filip 2eb33f9e19 Merge textures 2020-02-01 16:29:41 +01:00
Kotrba Filip 2e4d589340 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 16:29:27 +01:00
Kotrba Filip cf1edefe06 Create spawn script 2020-02-01 16:29:20 +01:00
Kotrba Filip c0ecc18f73 Repair enemy 2020-02-01 16:20:10 +01:00
Kotrba Filip 4e561971f1 Merge 2020-02-01 14:27:10 +01:00
Kotrba Filip fedd61fa31 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 14:26:52 +01:00
Kotrba Filip a053afbeb6 next push 2020-02-01 14:26:43 +01:00
Kotrba Filip 3171553707 Commit 3 2020-02-01 12:14:43 +01:00
Kotrba Filip 444c6922eb Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 12:12:03 +01:00
Kotrba Filip 582ee1c805 Next commit 3 2020-02-01 12:11:56 +01:00
Kotrba Filip df0c9115fa Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:42:17 +01:00
Kotrba Filip 793fa28563 Zombie implement 1 2020-02-01 10:39:29 +01:00
Kotrba Filip a72ced4f78 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:27:39 +01:00
Kotrba Filip 59287b6e5a Enemy edit 2020-02-01 10:27:32 +01:00
Kotrba Filip d86d353d10 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:24:04 +01:00
Kotrba Filip 3594a0ab9d Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:19:54 +01:00
Kotrba Filip 2e8f48b790 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:18:54 +01:00
Kotrba Filip 89557b52c2 Zombie merge 2020-02-01 10:18:46 +01:00
Kotrba Filip 5b65a7c080 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:17:02 +01:00
Kotrba Filip 81fca84f42 merge boat 2020-02-01 10:16:55 +01:00
Kotrba Filip 39b3f8277d Zombie drop body parts 2020-02-01 10:12:47 +01:00
Kotrba Filip e72b3e2092 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 09:08:48 +01:00
Kotrba Filip 4de853189f Save map 2020-02-01 09:08:39 +01:00
Kotrba Filip fe3e06e31f Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 09:04:13 +01:00
Kotrba Filip e90d743b1b add items to map 2020-02-01 09:04:09 +01:00
Kotrba Filip ddbb14e03d Items 2020-02-01 08:53:25 +01:00
Kotrba Filip 8e08381478 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 08:52:56 +01:00
Kotrba Filip a787aa09a3 Zombie 1 2020-02-01 08:52:46 +01:00
Kotrba Filip 1a92990f45 merge ammo 2020-02-01 06:59:39 +01:00
Kotrba Filip fd12e64158 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 06:59:24 +01:00
Kotrba Filip 2e223f90ca Ne baricade window 2020-02-01 06:59:03 +01:00
Kotrba Filip 141da259c5 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 06:29:35 +01:00
Kotrba Filip 61c5b8d9be Tree 2020-02-01 06:29:23 +01:00
Kotrba Filip 53c4133a30 Shoot is function 2020-02-01 06:04:53 +01:00
Kotrba Filip df79f22a91 Merge with ladder 2020-02-01 00:53:21 +01:00
Kotrba Filip e2a1de68a1 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 00:53:10 +01:00
Kotrba Filip e03eafaf7b next commit 5 2020-02-01 00:53:03 +01:00
Kotrba Filip 727fab43b2 merge 2 2020-01-31 22:32:43 +01:00
Kotrba Filip dd582f3d6c Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-01-31 22:32:20 +01:00
Kotrba Filip ecb85cc68f Building 2020-01-31 22:32:05 +01:00
Kotrba Filip 55c87eaf4c Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-01-31 21:47:51 +01:00
Kotrba Filip d37dadfff5 merge 1 2020-01-31 21:47:42 +01:00
Kotrba Filip 3e5b75524d Next edit 2020-01-31 21:47:30 +01:00
Kotrba Filip e9881bbf80 Commit next 1 2020-01-31 19:33:54 +01:00
Kotrba Filip 0cdefd7a0f Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-01-31 19:18:21 +01:00
Kotrba Filip f24c0545d1 make player and first terain 2020-01-31 19:18:14 +01:00
Kotrba Filip 130c216fdf Add gitkeep in empty folder 2020-01-31 16:50:26 +01:00
Kotrba Filip 3e53e83a95 Create folders 2020-01-31 16:48:18 +01:00
Kotrba Filip 3da22bc33c Create scene 2020-01-31 16:41:52 +01:00
Kotrba Filip 882db2fbb9 repair addon 2020-01-31 16:39:23 +01:00
Kotrba Filip 3178667885 first data 2020-01-31 16:35:44 +01:00