Commit Graph

162 Commits

Author SHA1 Message Date
JonatanRek
9a3492860c Spike ikon 2020-02-01 19:01:36 +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
JonatanRek
6b47bbf48d Boar FIX 2020-02-01 18:53:04 +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
JonatanRek
e288be0039 Weapons Ikons 2020-02-01 18:18:15 +01:00
Kotrba Filip
5f189178bc push 50 2020-02-01 18:17:29 +01:00
JonatanRek
428caf87d0 Random Spawn Manager 2020-02-01 17:51:30 +01:00
JonatanRek
b3e77ab1c3 Create mollo.blend 2020-02-01 16:40:44 +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
JonatanRek
360f765beb Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 16:30:17 +01:00
JonatanRek
e9eade40f3 new ground textures 2020-02-01 16:30:02 +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
JonatanRek
98699a746e Icons 2020-02-01 14:15:30 +01:00
JonatanRek
668de7f334 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 13:36:07 +01:00
JonatanRek
847b291d8d Day Night cyrcle script 2020-02-01 13:30:49 +01:00
Kotrba Filip
3171553707 Commit 3 2020-02-01 12:14:43 +01:00
JonatanRek
be883b09c2 Updates 2020-02-01 12:12:42 +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
JonatanRek
4280d236e1 AmmoBox 2020-02-01 12:02:20 +01:00
JonatanRek
8122f18c7f House Update 2020-02-01 11:45:28 +01:00
JonatanRek
c640df6f05 Cabbin Update 2020-02-01 11:00:48 +01:00
JonatanRek
8bc041f6e7 Zombie 2020-02-01 10:43:47 +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
JonatanRek
cac222ca76 Zombie possition FIx 2020-02-01 10:28:04 +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
JonatanRek
088693006c Zombie FIX Fix FIx Fixu 2020-02-01 10:25:38 +01:00
Kotrba Filip
d86d353d10 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:24:04 +01:00
JonatanRek
280becdfa8 Zombie FiX 2020-02-01 10:22:26 +01:00
JonatanRek
e3c2746e2e Arms 2020-02-01 10:21:26 +01:00
JonatanRek
16d8bb65c1 Zombie ARM FIX 2020-02-01 10:20:23 +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
JonatanRek
f5d0db31a5 Zombie fix 2020-02-01 10:17:48 +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
JonatanRek
b31cfd1c3b Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 10:16:03 +01:00
JonatanRek
88b632d098 Zombie + Boat 2020-02-01 10:15:39 +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
JonatanRek
bd33eefd5f Table FIX 2020-02-01 09:07:08 +01:00
JonatanRek
e1c92ac82d Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 09:06:53 +01:00
JonatanRek
bcd599153b Table FIx 2020-02-01 09:04:16 +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
JonatanRek
3975f94f7b Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 09:01:19 +01:00
JonatanRek
275ce4da2a Shotgun Fix 2020-02-01 09:00:35 +01:00
Kotrba Filip
ddbb14e03d Items 2020-02-01 08:53:25 +01:00
JonatanRek
cdb1d46de7 Colors + Models 2020-02-01 08:53:09 +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
JonatanRek
fa97a679dc Radio + Table 2020-02-01 08:18:26 +01:00
JonatanRek
d017fbab37 Animations 2020-02-01 07:52:00 +01:00
JonatanRek
9f4f36c001 Door Animation 2020-02-01 07:20:52 +01:00
JonatanRek
7316eb6477 Normal Fix 2020-02-01 07:06:10 +01:00
JonatanRek
7348ac5f42 Ammo Normal Fix 2020-02-01 07:03:34 +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
JonatanRek
cf6ab5db68 Ammo 2020-02-01 07:00:53 +01:00
Kotrba Filip
2e223f90ca Ne baricade window 2020-02-01 06:59:03 +01:00
JonatanRek
4aaff2e1b4 Grass 2020-02-01 06:30:31 +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
JonatanRek
418c2928d3 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-02-01 06:21:05 +01:00
JonatanRek
6f0bc3cd2a New Thinks 2020-02-01 06:19:54 +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
JonatanRek
7523789e12 Cabbin Roof Fix 2020-02-01 00:39:55 +01:00
JonatanRek
b4949c8aff Another Models 2020-01-31 23:29:44 +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
JonatanRek
80885e9028 Wooden Plank 2020-01-31 22:26:24 +01:00
JonatanRek
102f0a66c2 Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame 2020-01-31 22:26:03 +01:00
JonatanRek
47c821cab8 Camp Fire 2020-01-31 22:14:00 +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
JonatanRek
f911916efb Models 2020-01-31 21:46:44 +01:00
JonatanRek
95023f0c4b Spikes 2020-01-31 21:36:30 +01:00
JonatanRek
2d473d1bba More models 2020-01-31 21:27:06 +01:00
Kotrba Filip
e9881bbf80 Commit next 1 2020-01-31 19:33:54 +01:00
JonatanRek
14b5192e2a cABIN fIXED 2020-01-31 19:31:48 +01:00
JonatanRek
3f7df2eb79 cABIN #3 2020-01-31 19:18:23 +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
JonatanRek
57d73dbde4 Bether Cabbin 2020-01-31 19:03:34 +01:00