Commit Graph

42 Commits

Author SHA1 Message Date
ef73de9d2d Merge branch 'master' of https://gitlab.com/phroy/frankie-on-platform 2019-04-26 10:08:40 +02:00
7c436c171b terrain colision bugfix 2019-04-26 10:07:34 +02:00
e591987281 Update README.md 2019-04-21 07:46:18 +00:00
b6829557ba Update README.md 2019-04-21 07:45:49 +00:00
9be9d0ddb3 Merge branch 'master' of https://gitlab.com/phroy/frankie-on-platform 2019-04-19 02:16:42 +02:00
c91a87bc54 Merge branch 'revert-04a24f0d' into 'master'
Revert "Delete Ascenseur_saut.hx"

See merge request phroy/frankie-on-platform!9
2019-04-19 00:09:05 +00:00
d816645d1c Revert "Delete Ascenseur_saut.hx"
This reverts commit 04a24f0d2d
2019-04-19 00:08:57 +00:00
4bd5fdd207 Merge branch 'revert-17c3d9cd' into 'master'
Revert "Delete Decor.hx"

See merge request phroy/frankie-on-platform!8
2019-04-19 00:08:49 +00:00
269d0dcd42 Revert "Delete Decor.hx"
This reverts commit 17c3d9cdb9
2019-04-19 00:08:41 +00:00
d0899619f4 Merge branch 'revert-7a04e9db' into 'master'
Revert "Delete Deplacement.hx"

See merge request phroy/frankie-on-platform!7
2019-04-19 00:08:32 +00:00
86354025c9 Revert "Delete Deplacement.hx"
This reverts commit 7a04e9db72
2019-04-19 00:08:23 +00:00
96040ec74c Merge branch 'revert-249c948f' into 'master'
Revert "Delete NodeTree.hx"

See merge request phroy/frankie-on-platform!6
2019-04-19 00:07:28 +00:00
574baa8a47 Merge branch 'revert-9d9f815b' into 'master'
Revert "Delete Plateforme_mvt.hx"

See merge request phroy/frankie-on-platform!4
2019-04-19 00:05:47 +00:00
cd6e252c48 Merge branch 'revert-e093c089' into 'master'
Revert "Delete Generale.hx"

See merge request phroy/frankie-on-platform!3
2019-04-19 00:04:13 +00:00
1782f5c73c Revert "Delete Generale.hx"
This reverts commit e093c089a7
2019-04-19 00:03:56 +00:00
cab892c3b7 Revert "Delete NodeTree.hx"
This reverts commit 249c948ff0
2019-04-19 00:01:41 +00:00
70d13a9350 Revert "Delete Plateforme_mvt.hx"
This reverts commit 9d9f815bef
2019-04-18 23:59:47 +00:00
8cdcd7eac1 Add sound and jump bugfix 2019-04-19 01:47:51 +02:00
9d9f815bef Delete Plateforme_mvt.hx 2019-04-18 23:26:30 +00:00
249c948ff0 Delete NodeTree.hx 2019-04-18 23:26:22 +00:00
e093c089a7 Delete Generale.hx 2019-04-18 23:26:06 +00:00
7a04e9db72 Delete Deplacement.hx 2019-04-18 23:26:00 +00:00
17c3d9cdb9 Delete Decor.hx 2019-04-18 23:25:54 +00:00
04a24f0d2d Delete Ascenseur_saut.hx 2019-04-18 23:25:42 +00:00
c4f2764839 Platform bugfix 2019-04-17 01:04:52 +02:00
5258a0900c Intro cam test with sphere 2019-04-16 00:33:05 +02:00
2489c4beee Merge branch 'master' of https://gitlab.com/phroy/frankie-on-platform 2019-04-12 17:15:00 +02:00
1063fa658e springbox2 jump fixed 2019-04-12 17:14:09 +02:00
4e2f8f1fff Update README.md 2019-04-06 18:06:20 +00:00
34a5a73bfa Update README.md 2019-04-06 18:06:09 +00:00
b575917898 Update README.md 2019-04-06 14:22:09 +00:00
6af39b40e2 english instructions 2019-04-05 21:38:16 +02:00
bd741ff7ec add last file 2019-04-05 04:40:44 +02:00
87c1a73b8a Delete README.txt 2019-04-03 21:06:12 +00:00
5ca18b6812 Add README.md 2019-04-03 21:05:52 +00:00
b9eb7aee09 Merge branch 'master' of https://gitlab.com/phroy/frankie-on-platform 2019-04-03 13:50:43 +02:00
425ee06263 Readme change 2019-04-03 13:43:34 +02:00
31b7649ee2 Deleted README.md 2019-04-03 11:42:16 +00:00
6a9c30bce5 Add LICENSE 2019-04-03 11:40:48 +00:00
adb5d6d9e3 Update README.md 2019-04-03 11:17:55 +00:00
7d73714fbb Initial add 2019-04-03 13:05:43 +02:00
c759fce4e2 Initial commit 2019-04-03 09:03:15 +00:00