 Cat Flynn
|
8a8c24ce1f
|
Merge branch 'temp' into feature/freeze-level-design
|
2021-05-15 14:42:37 +01:00 |
|
Cat Flynn
|
e589e73da3
|
remove duplicate freeze intro
|
2021-05-15 14:40:19 +01:00 |
|
Cat Flynn
|
d4cda1655a
|
more freeze level env design
|
2021-05-15 14:39:55 +01:00 |
|
Cat Flynn
|
fd9dafde2a
|
acropolis time
|
2021-05-15 14:39:54 +01:00 |
|
Cat Flynn
|
7648f949a3
|
wip freeze level design
|
2021-05-15 14:39:53 +01:00 |
|
Cat Flynn
|
03ae8b781b
|
mostly freeze puzzle design
|
2021-05-15 14:39:53 +01:00 |
|
Cat Flynn
|
0d2291ed8b
|
a touch more env
|
2021-05-15 14:39:52 +01:00 |
|
Cat Flynn
|
0fcf9b4427
|
wip freeze levels environment design
|
2021-05-15 14:39:52 +01:00 |
|
Cat Flynn
|
25e5b9da27
|
wip
|
2021-05-15 14:39:49 +01:00 |
|
Cat Flynn
|
6fec5d1b92
|
build lighting and some env design
|
2021-05-15 14:39:23 +01:00 |
|
Cat Flynn
|
132103140e
|
fix falling floor
|
2021-05-15 14:39:22 +01:00 |
 cyndrdev
|
25fbf3ec1a
|
minor fixes
|
2021-05-14 19:22:37 +01:00 |
|
Cat Flynn
|
2bd79265e4
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-14 19:13:40 +01:00 |
|
cyndrdev
|
db11e437b4
|
Merge branch 'main' into feature/blink-rework
|
2021-05-14 19:10:27 +01:00 |
|
cyndrdev
|
8cc9313238
|
reworked entrance
|
2021-05-13 17:18:56 +01:00 |
|
cyndrdev
|
c281d7e371
|
collision fixes, lighting improvements
|
2021-05-13 13:35:55 +01:00 |
|
Cat Flynn
|
65c74ff0b7
|
a touch more env
|
2021-05-13 13:07:54 +01:00 |
|
Cat Flynn
|
f299abb0db
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-13 12:40:04 +01:00 |
|
Cat Flynn
|
f84863de39
|
wip freeze levels environment design
|
2021-05-13 10:43:32 +01:00 |
|
cyndrdev
|
7f369fcf2d
|
removed death renderers
|
2021-05-12 20:56:00 +01:00 |
|
cyndrdev
|
220ae7b8d2
|
fixed all triggers
|
2021-05-12 20:10:58 +01:00 |
|
cyndrdev
|
23b7c07c03
|
mergey boi
|
2021-05-12 19:08:41 +01:00 |
|
Cat Flynn
|
247723cbda
|
reposition player and add collider to entrance
|
2021-05-12 18:45:56 +01:00 |
|
cyndrdev
|
53d74ff0bc
|
Merge branch 'main' into feature/blink-rework
|
2021-05-12 18:36:11 +01:00 |
|
cyndrdev
|
882b83cb70
|
main integration
|
2021-05-12 18:32:31 +01:00 |
|
cyndrdev
|
68b8f0be19
|
blink rework
|
2021-05-12 18:26:46 +01:00 |
|
cyndrdev
|
d7f4686316
|
blink gauntlet design
|
2021-05-12 16:56:54 +01:00 |
|
Cat Flynn
|
eaf61295c1
|
wip
|
2021-05-12 15:25:01 +01:00 |
|
Cat Flynn
|
e05c2133be
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-12 14:29:03 +01:00 |
|
Cat Flynn
|
88135bac17
|
Merge branch 'main' into fix/arrow-trap-scale
|
2021-05-12 13:46:27 +01:00 |
|
Cat Flynn
|
8a04d1d3a9
|
Merge branch 'feature/arrow-wall-graphics' into 'main'
add arrow tips to wall
See merge request kernel-panic/revival!80
|
2021-05-12 00:57:50 +00:00 |
|
Cat Flynn
|
a5941e52e0
|
fuck namespaces hee hoo
|
2021-05-11 22:38:28 +01:00 |
|
Cat Flynn
|
fbcc7f6a92
|
Merge branch 'main' into feature/arrow-wall-graphics
|
2021-05-11 18:16:55 +01:00 |
|
Cat Flynn
|
f93548787b
|
Merge branch 'main' into feature/teleport
|
2021-05-11 18:15:31 +01:00 |
|
cyndrdev
|
31e96f7261
|
basic rework
|
2021-05-11 17:55:23 +01:00 |
|
Cat Flynn
|
3caf16655f
|
add more sensible arrow mesh
|
2021-05-11 17:55:01 +01:00 |
|
Cat Flynn
|
e811f48d42
|
Merge branch 'feature/arrow-wall-graphics' into fix/arrow-trap-scale
|
2021-05-11 16:35:41 +01:00 |
|
Cat Flynn
|
cbe71cdcea
|
add jetpack
|
2021-05-11 01:48:24 +01:00 |
|
Cat Flynn
|
44ca53b755
|
add teleporter
|
2021-05-10 23:29:49 +01:00 |
|
Cat Flynn
|
aaff82b0d1
|
Merge branch 'main' into feature/teleport
|
2021-05-10 22:50:57 +01:00 |
|
Cat Flynn
|
763bd202c4
|
Merge branch 'feature/blink-rework' into 'main'
sorted environment node into prefabs
See merge request kernel-panic/revival!82
|
2021-05-10 19:25:52 +00:00 |
|
Cat Flynn
|
184d2ef899
|
Merge branch 'fix/noise-textures' into 'main'
delete unused noise textures lole
See merge request kernel-panic/revival!81
|
2021-05-10 19:25:17 +00:00 |
|
Cat Flynn
|
41ed852d04
|
build lighting and some env design
|
2021-05-10 18:14:00 +01:00 |
|
Cat Flynn
|
1637f9b038
|
Merge branch '119-final-level' into 'main'
Resolve "level design: all together now"
Closes #119
See merge request kernel-panic/revival!79
|
2021-05-10 16:29:03 +00:00 |
|
Cat Flynn
|
be1c8ff740
|
Merge branch 'main' into feature/freeze-level-design
|
2021-05-10 17:22:38 +01:00 |
|
cyndrdev
|
4ac0da2c08
|
sorted environment node into prefabs
|
2021-05-10 17:16:56 +01:00 |
|
Cat Flynn
|
a8c004aec3
|
delete unused noise textures lole
|
2021-05-10 17:05:51 +01:00 |
|
Cat Flynn
|
f5630b4140
|
fix falling floor
|
2021-05-10 16:58:47 +01:00 |
|
Cat Flynn
|
3302a9adb0
|
Merge branch 'main' into feature/level-design
|
2021-05-10 15:12:45 +01:00 |
|
Cat Flynn
|
5b2886db5e
|
add arrow tips to wall
|
2021-05-10 15:07:54 +01:00 |