Jan Groß
|
c64220a353
|
Revert "Merge branch 'leveldesign_r'"
This reverts commit 998a52fe3c.
|
2018-09-08 17:50:49 +02:00 |
|
Jan Groß
|
998a52fe3c
|
Merge branch 'leveldesign_r'
# Conflicts:
# Assets/Blender/longplateau_horizontal.blend.meta
# Assets/Blender/rock_wall_edge.blend.meta
# Assets/Blender/rock_wall_ridge.blend.meta
# Assets/Blender/rock_wall_stepped.blend.meta
# Assets/Blender/rocks01.blend.meta
# Assets/Blender/spikertap1.blend.meta
# Assets/Blender/tree_platform.blend.meta
# Assets/Blender/tree_tops.blend.meta
# Assets/Blender/trees_with_trunks.blend.meta
# Assets/Blender/waves.blend.meta
# Assets/Materials/Sprites.meta
# Assets/Scenes/Level_Cave.unity
|
2018-09-08 17:44:36 +02:00 |
|
Jan Groß
|
b778c14158
|
Polishing 1
General polishing commit
|
2018-09-08 16:45:03 +02:00 |
|
Jan Groß
|
1a13847d77
|
Adding fog zones
|
2018-09-02 20:56:15 +02:00 |
|
Jan Groß
|
da62c3af08
|
Implemented charge cancelling
Stop charging with mouse 2 and still stick to things
|
2018-09-02 18:25:11 +02:00 |
|
Jan Groß
|
a33228238f
|
[FIX] Lurch respawn
Fixed issues with respawning the lurch when sticking to ground
|
2018-09-02 17:57:38 +02:00 |
|
Richard Ott
|
30e355d7f1
|
Level design and convinience scripts
|
2018-09-02 15:55:52 +02:00 |
|
Richard Ott
|
48244b8f8d
|
Bugfix: added sticky ground behaviour
|
2018-09-01 23:25:47 +02:00 |
|
Richard Ott
|
da213d5e41
|
added upwards force modifier
|
2018-09-01 21:36:14 +02:00 |
|
Jan Groß
|
66074815c3
|
Merge pull request #5 from JanGross/movement_and_zones
Merge Platform movement and elimination zones into master
|
2018-09-01 20:51:32 +02:00 |
|
Jan Groß
|
f511f2bbbf
|
Platform movement and elimination zones
Adds scripts for moving any object up/down, left/right or forwards/backwars and eliminating the player.
|
2018-09-01 20:49:43 +02:00 |
|
Richard Ott
|
00fa478ca7
|
Smal fixes + cloud/smoke texture
|
2018-09-01 19:27:39 +02:00 |
|
Jan Groß
|
c073f272f6
|
Merge pull request #4 from JanGross/light_lurch
Merge LightLurch with master
|
2018-09-01 18:59:10 +02:00 |
|
Richard Ott
|
e274f7a368
|
Implemented cutscenes and mating
|
2018-09-01 18:54:44 +02:00 |
|
Jan Groß
|
9da1f82f20
|
LightLurch ability
Makes the lurch glow.
Can increase and decrease light as well as emission if the special "LightUp" ability is used.
|
2018-09-01 17:30:37 +02:00 |
|