Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
909a4b5
Started work. Need to go get some prefabs from previous commit.
Vandor1 Nov 23, 2021
d49dc44
Adds credits scene, song and timeline
revosw Nov 23, 2021
9877420
Level 1 implemented with my stuff Mathias
Vandor1 Nov 23, 2021
06b3899
Continuing on previous commit
Vandor1 Nov 23, 2021
40a9362
Doesnt really work, but kinda
Vandor1 Nov 23, 2021
3c36cf3
Door added for first boss level. Opens on boss death. can be used oth…
Nov 24, 2021
8ad5121
Added doors for level 2 + added beer boss. Seems to not want to move …
Nov 24, 2021
faff6c2
?
Nov 24, 2021
fd6bc05
fix beer
Vandor1 Nov 25, 2021
ae41087
level 2 basically done from my end
Vandor1 Nov 25, 2021
72dd81f
resolve merge conflict
olav-valle Nov 25, 2021
3d2ee20
fuck the world
olav-valle Nov 25, 2021
81e4edd
Merge pull request #46 from revosw/feature/mergeDevIntoBossesAndLevels
olav-valle Nov 25, 2021
a27bdfc
Level 3 and 4 with dialogue, checkpoints and turtle sages
Vandor1 Nov 25, 2021
ec10b8c
Merge pull request #47 from revosw/feature/startFinalBoss
olav-valle Nov 25, 2021
68e64ed
fixes player respawn on death
olav-valle Nov 25, 2021
df90bc0
Merge pull request #49 from revosw/feature/PlayerRespawnFix
olav-valle Nov 25, 2021
3033534
scenes klar
Ferskken Nov 25, 2021
37feeda
Merge branch 'develop' into mauell-scenes-merge-hell
Ferskken Nov 25, 2021
9447b26
Working 234
Ferskken Nov 25, 2021
7173d6a
Alle level virka
Ferskken Nov 25, 2021
797af41
Skybox added to level1
Ferskken Nov 25, 2021
b7dab3c
Merge pull request #50 from revosw/mauell-scenes-merge-hell
olav-valle Nov 25, 2021
a25f5a4
adds player suicide action and interact binding for controls and keyb…
olav-valle Nov 25, 2021
827db5f
Remove unneeded A* components from level 1, 3, 4.
olav-valle Nov 25, 2021
752dddb
Adds camera confiner and more music
revosw Nov 25, 2021
a3ff521
Fixed some camera confine regions
revosw Nov 25, 2021
b0ea736
Adds level transition prefab
revosw Nov 25, 2021
8ec4a57
commit pre merge of dev
olav-valle Nov 25, 2021
8b199c5
resolve merge conflict
olav-valle Nov 25, 2021
a947165
Adds level transitions
revosw Nov 25, 2021
cd2f13a
Merge remote-tracking branch 'origin/develop' into develop
olav-valle Nov 25, 2021
ebcd7f3
The final commtis!!!
Vandor1 Nov 25, 2021
78a3975
fixes player input activation on next level load
olav-valle Nov 25, 2021
a8eb34f
a whole lot of nothing
olav-valle Nov 25, 2021
7fa68e3
Level Finetuning
Ferskken Nov 25, 2021
ed6f0e4
Updated mushroom sprites
Ferskken Nov 25, 2021
5cc1c68
Level 3 decor redo
Ferskken Nov 25, 2021
e950ece
adds banner and fade to black between levels
revosw Nov 25, 2021
accf3c3
fuck everything
olav-valle Nov 25, 2021
1104f8e
Merge pull request #51 from revosw/feature/levelswitch
revosw Nov 25, 2021
9d0fe2d
fixes player shootng.
olav-valle Nov 26, 2021
35f211e
adds pickup that activates player wall jump and wall grab abilities.
olav-valle Nov 26, 2021
843f724
Added open boss door trigger
revosw Nov 26, 2021
826796b
Merge branch 'develop' into merge-walljump-dev
Ferskken Nov 26, 2021
107eb45
Wall jump puckup addes to world
Ferskken Nov 26, 2021
9dfbceb
Changes moving platform prefabs
revosw Nov 26, 2021
91ac9cd
Merge branch 'develop' of https://github.com/revosw/RainbowLand into …
revosw Nov 26, 2021
85e5aab
Adds color swaying
revosw Nov 26, 2021
86c2996
Details fixed
Ferskken Nov 26, 2021
000cdb7
OutOFBounds Killbox prefab
Ferskken Nov 26, 2021
1db3672
moves cinemachine confiner a bit to the right in level 1
revosw Nov 26, 2021
2822181
Merge branch 'feature/transitionandreassimen' into MErgeTansitionaime…
Ferskken Nov 26, 2021
bf6663c
Out of bounds death
Ferskken Nov 26, 2021
33b4091
Fixed stone\gold platform bug
Ferskken Nov 26, 2021
fdedbd5
Changed rock in first cave
Ferskken Nov 26, 2021
e8c341a
Crate prefab with top colision
Ferskken Nov 26, 2021
2000743
Replaces all creates with jumpable
Ferskken Nov 26, 2021
f464701
Edited colision box on create prefab
Ferskken Nov 26, 2021
fe2e9c5
Moving to work at home
Vandor1 Nov 26, 2021
7bbebff
Sage Frogboi level 2
Ferskken Nov 26, 2021
6dfdd76
Done work on final boss, fixed his shooting.
Nov 26, 2021
9a3cdc8
Final boss draft completed, ready to be implemented and finished in l…
Nov 26, 2021
7c77379
Merge remote-tracking branch 'origin/lastMergeBranch' into dev-last-b…
Ferskken Nov 27, 2021
d2a9f04
fix shooting from player & money boss take dmg
Nov 28, 2021
f5decc5
Merge pull request #55 from revosw/fixshootingandmoney
Vandor1 Nov 28, 2021
d3f0d78
Fixed last boss?
Nov 28, 2021
0460c46
Merge pull request #57 from revosw/fixLastBoss
Vandor1 Nov 28, 2021
e405154
Last touiches
Nov 28, 2021
3f5642f
Merge pull request #58 from revosw/lastTouchesLevel4
Vandor1 Nov 28, 2021
9a09fd6
Merge branch 'develop' into feature/endcredits
revosw Nov 28, 2021
7b13507
Merge pull request #59 from revosw/feature/endcredits
revosw Nov 28, 2021
4d1dfd0
Fixes MoveKey error
revosw Nov 28, 2021
4152647
ACTUALLY fixes MoveKey error
revosw Nov 28, 2021
042189e
Comment out all debug logging
revosw Nov 28, 2021
41ff305
Color is changed on boss destroy
revosw Nov 28, 2021
5e00cd1
Merge pull request #61 from revosw/feature/movekeyerrorfix
revosw Nov 28, 2021
e29fbb4
Fixed color curves
revosw Nov 28, 2021
41f96b4
Merge pull request #62 from revosw/feature/movekeyerrorfix
revosw Nov 28, 2021
8402fc0
Defaults to gray on spawn, Global Volume is now DontDestroy
revosw Nov 28, 2021
4842e12
Merge pull request #63 from revosw/feature/movekeyerrorfix
revosw Nov 28, 2021
6b716cf
create branch for feature
olav-valle Nov 28, 2021
4e0d719
Merge branch 'develop' into feature/GameControlsOverlay
olav-valle Nov 28, 2021
e6a7435
Adds credits slides
revosw Nov 28, 2021
33ddbe1
Fixed all stuff
Nov 28, 2021
d01a4ea
Merge remote-tracking branch 'origin/lastBranchMathias' into feature/…
revosw Nov 28, 2021
296f2d5
Merge pull request #65 from revosw/feature/credits
revosw Nov 28, 2021
09d943f
Player shooting sfx
revosw Nov 28, 2021
544692f
Merge pull request #66 from revosw/feature/player-shoot-sfx
revosw Nov 28, 2021
4fffbc3
Adds level 2 music
revosw Nov 28, 2021
c1ac96f
Adds music to level 2
revosw Nov 28, 2021
e53d44d
adds controller overlay assets from https://assetstore.unity.com/pack…
olav-valle Nov 28, 2021
009e535
basic overlay trigger
olav-valle Nov 28, 2021
470ddf4
Adds level 3 music
revosw Nov 28, 2021
f188442
Adds boss music to level 4
revosw Nov 28, 2021
b7bf502
Finished end credits
revosw Nov 28, 2021
59106cc
Forgot to enable white transition image
revosw Nov 28, 2021
9d36806
starts implementing ControlSchemeDetector
olav-valle Nov 28, 2021
ead6498
adds triggered UI overlay prefab
olav-valle Nov 29, 2021
e5b1929
World Chandes
Ferskken Nov 29, 2021
66fe556
PlatformRespawnFix
Ferskken Nov 29, 2021
b190c1c
Final touches
Ferskken Nov 29, 2021
d98e689
Player position reseted
Ferskken Nov 29, 2021
7083750
Level 4 final touches
Ferskken Nov 29, 2021
ae38013
Adds music to level 1, fixes camera confiner in level 2
revosw Nov 29, 2021
68207e5
Level 3 puzzle deathbox
Ferskken Nov 29, 2021
2df7a1d
Merge branch 'develop' of https://github.com/revosw/RainbowLand into …
Ferskken Nov 29, 2021
e692966
Første platform fixed
Ferskken Nov 29, 2021
9e94efe
Puzzle Platform fix
Ferskken Nov 29, 2021
628b122
Spelling fixes in dialogs, adjusted music volume
revosw Nov 29, 2021
b60aff2
fixes ShootingPoint transform scale
olav-valle Nov 29, 2021
e0d619e
Merge branch 'develop' into feature/GameControlsOverlay
olav-valle Nov 29, 2021
46a24a9
Fixed typo in dialog, made one obstacle easier
revosw Nov 29, 2021
3a3c322
Fixes player sprite placement, and changes Polygon collider to Box co…
olav-valle Nov 29, 2021
75511b6
last commit of the day
olav-valle Nov 29, 2021
268d4bd
Adds overlay controls tutorials in level 1 and 2
olav-valle Nov 30, 2021
2ba99f9
Merge branch 'develop' into feature/GameControlsOverlay
olav-valle Nov 30, 2021
85c60ae
fixes level1TutorialOverlay prefab
olav-valle Nov 30, 2021
30222ab
Merge pull request #67 from revosw/feature/GameControlsOverlay
olav-valle Nov 30, 2021
78309d2
removes Debug.Log statements
olav-valle Nov 30, 2021
396e08a
Changes player jump force + other shit
revosw Nov 30, 2021
4207973
fix lvl 2
Nov 30, 2021
599e27e
Moved platform, jump power 22
revosw Nov 30, 2021
491fced
Reverted overrides on player
revosw Nov 30, 2021
a68e204
fixes various bugs
olav-valle Nov 30, 2021
bdfe162
fixes small bugs
olav-valle Nov 30, 2021
7f1f2ea
Added functionality for talking to frog using triangle.
Nov 30, 2021
db32dd1
Update README.md
Vandor1 Dec 2, 2021
e4e2053
changes shoot keybind from ctrl to F key, updates tutorial overlay to…
olav-valle Dec 4, 2021
8f792df
fixes player prefab discrepancies on level 1 & 2, and sceneExit on le…
olav-valle Dec 4, 2021
e65b13b
hotfix level 2 tutorial UI overlay triggering
olav-valle Dec 8, 2021
cb5ff1e
put player back where he should be...
olav-valle Dec 8, 2021
3ef69e2
Merge pull request #68 from revosw/hotfix/level2ShootOverlay
olav-valle Dec 8, 2021
3c7e7b3
Update README.md
revosw Jun 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.mp4 filter=lfs diff=lfs merge=lfs
*.png filter=lfs diff=lfs merge=lfs
*.wav filter=lfs diff=lfs merge=lfs -text
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

# Autogenerated Jetbrains Rider plugin
[Aa]ssets/Plugins/Editor/JetBrains*
[Aa]ssets/Samples*

# Visual Studio cache directory
.vs/
Expand Down
3 changes: 3 additions & 0 deletions Assets/0001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions Assets/0001.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/0002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions Assets/0002.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/0003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions Assets/0003.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/0004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading