Commit Graph

28 Commits

Author SHA1 Message Date
Christer Warén
cdf51c32af
Merge pull request #11 from TheJamma/scenes
Added all the needed scenes and made Scene1 Play button functional
2020-02-20 14:43:34 +02:00
Jamma
fad9b0790c Added all the needed scenes and made Scene1 Play button functional 2020-02-20 14:37:44 +02:00
Christer Waren
eb68660864 Merge branch 'master' of https://github.com/waltterireunamaki/jump-game 2020-02-20 14:09:59 +02:00
Christer Waren
20795367fb Merge branch 'master' of https://github.com/TheJamma/jump-game 2020-02-20 14:09:04 +02:00
TheJamma
bd3088fa98
Merge pull request #3 from ToAallonranta/master
updating master
2020-02-20 11:16:05 +02:00
Christer Warén
20cb148b83
Merge pull request #5 from ToAallonranta/master
Upstream to Fork
2020-02-20 02:43:51 +02:00
Christer Warén
3eeef0b2a7
Merge pull request #10 from TheJamma/menu
Menu
2020-02-19 20:32:47 +02:00
Jami
f5ffffa5ff Template for main menu 2020-02-19 17:36:37 +02:00
TheJamma
eb88c1a4b2
Merge pull request #2 from ToAallonranta/master
upstream to fork
2020-02-19 12:54:53 +02:00
waltterireunamaki
f254b27890
Merge pull request #2 from ToAallonranta/master
Upstream To Fork
2020-02-19 12:46:28 +02:00
Christer Warén
f9cd159f56
Merge pull request #8 from TheJamma/v1
V1
2020-02-19 12:42:48 +02:00
Jamma
b6f7c47876 Added Player Controller 2020-02-19 12:30:56 +02:00
Christer Warén
16fd1ce6d3
Merge pull request #1 from ToAallonranta/master
Upstream to Fork
2020-02-19 12:17:05 +02:00
TheJamma
ae56f7123e
Merge pull request #1 from ToAallonranta/master
updating master
2020-02-10 14:14:23 +02:00
Christer Warén
e6f1f3e360 Merge pull request #3 from ToAallonranta/master
Base to Fork
2020-02-08 14:01:35 +02:00
Christer Warén
ff7b8c499c
Merge pull request #4 from cwchristerw/git-ignore
Git Ignore for Unity Project
2020-02-08 14:00:24 +02:00
Christer Waren
2c32ae9662 Adding .gitignore to Unity Project 2020-02-06 20:15:10 +02:00
Christer Waren
f896d0219c Deleting unnecessary files from repository 2020-02-06 20:11:36 +02:00
Christer Warén
8fed1e46e7
Merge pull request #2 from ToAallonranta/master
Master -> Fork
2020-01-29 22:02:49 +02:00
Christer Warén
ea564df613
Merge pull request #3 from cwchristerw/cwchristerw-readme
Update README.md
2020-01-29 21:44:30 +02:00
Christer Warén
e3490b3e7b
Update README.md 2020-01-29 21:42:50 +02:00
Tomi Aallonranta
9ab449af27
Merge pull request #2 from cwchristerw/Christer
Create LICENSE
2020-01-29 21:39:12 +02:00
Christer Warén
456fb25777
Create LICENSE 2020-01-29 21:26:56 +02:00
Tomi Aallonranta
fc0d923000
Merge pull request #1 from ToAallonranta/Tomi
initial project folder
2020-01-29 10:12:35 +02:00
ToAallonranta
837543ed9a initial project folder 2020-01-29 10:05:38 +02:00
Tomi Aallonranta
f367cb1d79
Update README.md 2020-01-29 09:56:09 +02:00
ToAallonranta
06eaef34ee updated readme 2020-01-29 09:51:19 +02:00
Tomi Aallonranta
e6d2f9b9ca
Initial commit 2020-01-29 09:44:35 +02:00