mfpi/jamjump — pull request #2 by mfpi (2014-10-23 12:16:54+00:00)
Title: Squashed commit of the following:

commit 1b45a812d3ea82b2eccb80e2ffc3de1aa219ce89
Merge: 737018a d6d94c6
Author: Marco Fruhwirth
Date: Thu Oct 23 14:00:18 2014 +0200

Merge branch 'devbranch' into review

commit d6d94c659bb0345a32db30798d3577c67ba3d598
Author: Marco Fruhwirth
Date: Wed Oct 22 06:54:59 2014 +0200

moved block event (win/death) to world.js

commit d87ce2575a6b97a27b258a950b7212daf1087bc7
Author: Marco Fruhwirth
Date: Tue Oct 21 20:01:51 2014 +0200

load test level

commit dfb84f4b5000c544dc4aeca11640e303e1bfb656
Author: mf
Date: Tue Oct 14 09:41:47 2014 +0200

Menu state + begin tiledmap

commit e8cc787bdddfcd80c2b305bc6239f80798cb1b8c
Author: mf
Date: Mon Oct 13 18:32:23 2014 +0200

Menu state (to select level)

commit 85838952349bfe9ac30fa51f520d54e16260188c
Author: mf
Date: Wed Oct 8 10:37:31 2014 +0200

added techn. details

commit ec65859a9085da263293d9ce3e5dc729d91b0d15
Author: mf
Date: Tue Oct 7 20:40:10 2014 +0200

more screens

commit 275afff767e98f26433ed56f91336f16554831bb
Author: mf
Date: Tue Oct 7 20:37:36 2014 +0200

Add credits to titlescreen, gameplay description

commit a93b3d787e43a2def2bb8b90013c4ec323eb0f1a
Author: mf
Date: Tue Oct 7 20:33:18 2014 +0200

Add screenshots

commit a8e6710038f4745cd6204d940c0f863372c5e445
Author: mf
Date: Tue Oct 7 20:32:53 2014 +0200

Downscale backgrounds. Added level

commit d41a6285465317202da092f04e50288d6c6d3c84
Merge: f2c8187 3f3deae
Author: Marco Fruhwirth
Date: Tue Oct 7 09:59:43 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit f2c81870142d19fbb92237a43e4f705928ee4180
Author: Marco Fruhwirth
Date: Tue Oct 7 09:59:26 2014 +0200

Credits

commit 3f3deaec15dfdb1baeeca7dd43af97329df7577f
Author: mf
Date: Mon Sep 29 22:54:20 2014 +0200

remove log output

commit 64c5102dc540e13dbaba7c96f7c0615d32d5a11f
Merge: 0c74977 709bed7
Author: mf
Date: Mon Sep 29 22:53:05 2014 +0200

m

commit 0c749776e3b11a6dc384315129699fc6c64a4e7f
Author: mf
Date: Mon Sep 29 22:51:03 2014 +0200

Add title screen, configurable controls

commit 709bed73360d267ac3758551375e59d57316a81b
Author: Marco Fruhwirth
Date: Sun Sep 28 18:05:35 2014 +0200

music

commit d3af50f2ab293b46cac2617401750a6540643526
Merge: 6399daa ea818f0
Author: Marco Fruhwirth
Date: Sun Sep 28 18:04:58 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 6399daa95150424dd67d0dcc20e580d7580548fa
Merge: 64cc306 2e819a8
Author: Marco Fruhwirth
Date: Sun Sep 28 18:00:52 2014 +0200

merged

commit 64cc306bf3363696a128678c71ad65b8e0ba079c
Author: Marco Fruhwirth
Date: Sun Sep 28 17:56:31 2014 +0200

fixed bug

commit ea818f0bed84907d3a76b42002f8089c1632ea7c
Author: mf
Date: Sun Sep 28 16:03:48 2014 +0200

Enter continue

commit 2e819a8200e21219c1b8526e5b10e7aaec0cb17d
Author: mf
Date: Sun Sep 28 15:59:58 2014 +0200

final

commit 65c03a75456f72a0a1b568c14cd4aa5a14767989
Author: mf
Date: Sun Sep 28 15:53:03 2014 +0200

status msg

commit 3c8d14dc5d296cec4a5868d45cb629310685c55a
Merge: 68395b2 401b1b5
Author: mf
Date: Sun Sep 28 15:50:21 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 68395b26bfa32b8e28d08e780d8a95f99a44843a
Author: mf
Date: Sun Sep 28 15:50:12 2014 +0200

2 controller

commit 401b1b5d7a26fb70eb86250f672113a82d999fbc
Author: Daniel
Date: Sun Sep 28 15:45:17 2014 +0200

Sound effects added

commit c7cfc6cb6005dd37c44eb7962bb1ea793317e8b3
Author: Daniel
Date: Sun Sep 28 15:43:53 2014 +0200

Last sounds

commit 21e997381970c55d2e9dd8dc68a4072a5ae7ee4e
Author: Daniel
Date: Sun Sep 28 15:42:04 2014 +0200

Music files

Awesome sound and music for our game

commit 811a44c093796fa7d377e75ff011938f337c183b
Author: mf
Date: Sun Sep 28 15:44:35 2014 +0200

2 player win

commit fa79ef075b67a6d3bee6c08ef8e3060eb7ed25dd
Merge: 793f346 36423c7
Author: mf
Date: Sun Sep 28 15:23:24 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 36423c70f12c32f3303777f26288b7cb4a19d7b4
Merge: 72bbb19 3d32104
Author: Marco Fruhwirth
Date: Sun Sep 28 17:21:30 2014 +0200

merged

commit 72bbb1944ce1525de025c8e96336f22cf24f8ae7
Author: Marco Fruhwirth
Date: Sun Sep 28 17:13:09 2014 +0200

level3

commit ef953208f561840100c3360531f469ac9546d6fb
Author: Marco Fruhwirth
Date: Sun Sep 28 15:37:40 2014 +0200

controller update

commit 793f346270150ec0b7a3587a3db61ba0a3c814ad
Author: mf
Date: Sun Sep 28 15:23:20 2014 +0200

Status state

commit 3d321048e69b19a178a26dee29c7a74481010b3b
Author: mf
Date: Sun Sep 28 15:12:19 2014 +0200

Winstone

commit db2c1e0a0b0293144023fec56a050c8ee2b24a77
Merge: 158beb5 4ad7822
Author: Marco Fruhwirth
Date: Sun Sep 28 15:06:38 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 158beb5e20671d9a048b9f14940103920c0dc930
Author: Marco Fruhwirth
Date: Sun Sep 28 15:06:32 2014 +0200

fixed perma

commit f40b7951d968d1c72fcf908dd469351849af898f
Author: Marco Fruhwirth
Date: Sun Sep 28 15:01:55 2014 +0200

fixed controller and inftyjump fix

commit 5225a331c452ddac1c96c98124787ae4be23d891
Author: mf
Date: Sun Sep 28 15:00:30 2014 +0200

Background graphics

commit f89350286f1aed6074217208d4e93dd4af0a9127
Merge: d82d9da 8e28576
Author: Marco Fruhwirth
Date: Sun Sep 28 14:53:49 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit d82d9dafb0531f3015609bda386667ff552c6b68
Author: Marco Fruhwirth
Date: Sun Sep 28 14:53:44 2014 +0200

jumpmechanics and blockremoving

commit b10c38779b269e026ec087790cad299d1c5addc4
Merge: 7b93c47 ef95320
Author: mf
Date: Sun Sep 28 13:41:55 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 7b93c47990e2da64e9a95188e12653fad1a70b03
Author: mf
Date: Sun Sep 28 13:41:39 2014 +0200

duplicate kb controller

commit 4ad78221b8fa0c9a38fd6eb2757fb6f5d5d28c03
Merge: ee14481 f40b795
Author: mf
Date: Sun Sep 28 13:05:51 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit ee144811a0a695c729a1f73c5ea6594b6a76384d
Author: mf
Date: Sun Sep 28 13:05:41 2014 +0200

level size fix

commit 8e28576b4e4418ea543bb56aed1bfadd961630e6
Author: mf
Date: Sun Sep 28 12:53:06 2014 +0200

Deathblocks, fixed anim

commit c9c641d05fe60fdf06c5eb02a0c889b6a9fbcc9f
Author: mf
Date: Sun Sep 28 12:25:05 2014 +0200

Using new spritesheet

commit 013797b99e92f3184e9892f021e5e2413dabd3bb
Author: mf
Date: Sun Sep 28 11:10:16 2014 +0200

added stoneblocks to levelparser, level1

commit 9cca9c0bc851d361bde028d65e2306d8ab42de4f
Author: mf
Date: Sun Sep 28 11:05:48 2014 +0200

whitespace

commit 6b0c45dd7c12a35268b836fd332798e2f69d0a91
Author: mf
Date: Sun Sep 28 11:02:57 2014 +0200

Add blocktypes, (perma-trait), stoneblocks

commit d855facda926102069044c0d52f839a2b6a19ce5
Merge: 41e1bdc 3335724
Author: Daniel
Date: Sun Sep 28 00:10:18 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 41e1bdc225c9de04802498c9b687c05fc404f588
Author: Daniel
Date: Sun Sep 28 00:10:07 2014 +0200

advanced animations

hope, bugs got fixed

commit 3335724302e9c882d814343c275b4a76ee0a0d40
Merge: 4696df4 d3914dc
Author: mf
Date: Sat Sep 27 23:03:11 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 4696df4f14854db842c13c0a48aa231ffc66aeba
Author: mf
Date: Sat Sep 27 23:02:57 2014 +0200

Txt-based Level loader

commit d3914dc19b354ba501eb54f74e992a351c286689
Author: Daniel
Date: Sat Sep 27 22:46:42 2014 +0200

Stone block

Unremovable block graphic created

commit f40b12dc2f16e00ce70cd7972d79e2f3c053e3e4
Merge: cbb410d 2fa37d2
Author: mf
Date: Sat Sep 27 22:42:39 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit cbb410de917be2fe4c2d29014e6f6fc20ee6aab3
Author: mf
Date: Sat Sep 27 22:28:56 2014 +0200

some new grfx

commit 2fa37d20c5d5428458364b40f6444d71c4337250
Author: Daniel
Date: Sat Sep 27 22:14:02 2014 +0200

block overlapping

added function which checks if block is already placed

commit 33885baf4ec910bd71718d9de1c76ccf8cce6228
Merge: be2008b b88ba5b
Author: mf
Date: Sat Sep 27 21:39:15 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit be2008ba470757c49a01d25a6fce5bf5e41cea1a
Author: mf
Date: Sat Sep 27 21:39:11 2014 +0200

remove scaffold pic

commit b88ba5b183c00666e89a75b2fa3857e959904b6f
Author: Daniel
Date: Sat Sep 27 21:28:28 2014 +0200

Run and jump

animation and that

commit 1df21677b0580e69ad8f83a0c464e5ad0b3c4a47
Merge: 50a846f 3ada260
Author: mf
Date: Sat Sep 27 20:59:05 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 50a846fc57ee0c94b4af09e02d873554c10d2988
Author: mf
Date: Sat Sep 27 20:58:41 2014 +0200

new jump mechanics: added doublejump. (needs a ground of blocks now)

commit 3ada260073b71af1b817e37cba9a6e28fe350715
Author: Daniel
Date: Sat Sep 27 20:57:41 2014 +0200

mr fly

animation for mr fly or so

commit 93dbb394db86c18137b6beee9095fbf6686bbdad
Author: Daniel
Date: Sat Sep 27 20:19:28 2014 +0200

Graphics

Block and player figure

commit ab986b95df3203a5183f9283cfe92e1d3bd9f0e1
Author: mf
Date: Sat Sep 27 19:33:34 2014 +0200

fix factory code

commit 4da315a7a99c7f419528ec9dc3d72ef64d19ea1c
Author: mf
Date: Sat Sep 27 19:15:07 2014 +0200

refactor state update and player controller

commit 83572c04efaf7a56b16a4728e9440f2b4d4b715f
Author: mf
Date: Sat Sep 27 18:29:30 2014 +0200

improve block-setting behaviour

commit 83781061812b5aefd3b3f07c38217c29fd765818
Author: mf
Date: Sat Sep 27 18:15:09 2014 +0200

change player stae

commit 9b4ae1108307f28b03db842f46851296f526c336
Author: mf
Date: Sat Sep 27 17:51:34 2014 +0200

Add text-rendering

commit dc4f05980289e9163301f4f459b9b7dd92127393
Author: mf
Date: Sat Sep 27 17:06:28 2014 +0200

Configurable game setup

commit 93c16544b4f8e193a09e4803f2e76e0cfc5ead65
Merge: 992ff1f 29da534
Author: mf
Date: Sat Sep 27 16:12:44 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 29da534f502b66ec12188def122fa9eb70741475
Author: Marco Fruhwirth
Date: Sat Sep 27 18:05:11 2014 +0200

remove blocks

commit 992ff1fbcc9b930a7d316d8b594f166482c8b9cb
Author: mf
Date: Sat Sep 27 16:12:42 2014 +0200

setup

commit d7eb80ca4f1aa988ccdcbd1323dbffd76141589f
Author: mf
Date: Sat Sep 27 14:21:08 2014 +0200

Player init fix

commit ccdb37f4b4dd6eef71bda7bb028f7ae66a48da6e
Merge: fda99ed c3a1795
Author: mf
Date: Sat Sep 27 14:19:42 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit c3a17952f54d0b03c6fa07ccbc7e87aa42ba857f
Author: Marco Fruhwirth
Date: Sat Sep 27 16:16:24 2014 +0200

fixed controller input and added second player

commit 09e0acac16fb6bf6d2b9fc0d6b3f210db70f5215
Merge: 414fa8c c41e8f9
Author: Marco Fruhwirth
Date: Sat Sep 27 16:06:10 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 414fa8cbdec17bfffd207cd672118a78112ce867
Author: Marco Fruhwirth
Date: Sat Sep 27 16:06:05 2014 +0200

fixed bounding box

commit fda99ed499253a157aaf0c3d08b3357861c01110
Author: mf
Date: Sat Sep 27 14:19:38 2014 +0200

Fix game/state ref. bug

commit c41e8f99788841a791a22fa788ea9307431849be
Author: mf
Date: Sat Sep 27 14:04:31 2014 +0200

Refactor player controlls

commit 53eb60682f275befdad004780951d678b1404417
Author: mf
Date: Sat Sep 27 13:58:58 2014 +0200

add missing file

commit 35ebbd92345fd8ba583089a40093e09399d9c0de
Merge: 3260e5b 0ac916f
Author: mf
Date: Sat Sep 27 13:51:06 2014 +0200

merge

commit 0ac916f47e7072826d4e65795dfaa6bae4c4c203
Author: Marco Fruhwirth
Date: Sat Sep 27 15:33:39 2014 +0200

world base

commit bc50f63a6b289e8f366e627640cd3e55638207ea
Author: Marco Fruhwirth
Date: Sat Sep 27 15:01:28 2014 +0200

fixed tilesize

commit d5e403c7f60a4e9ebd59394faffebf7c4ec12404
Merge: 8b83c1a 3926209
Author: Marco Fruhwirth
Date: Sat Sep 27 14:20:57 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 8b83c1a7c673c6151eafc47793afa76fe96c7902
Author: Marco Fruhwirth
Date: Sat Sep 27 14:20:51 2014 +0200

fixed tile size

commit 31610cb7b25527a97651067c008e36e343f903f8
Merge: bb5afab a50d71f
Author: Marco Fruhwirth
Date: Sat Sep 27 13:52:49 2014 +0200

merged

commit 3260e5b533519e06d2026122c4b08fdde11edcb7
Author: mf
Date: Sat Sep 27 13:48:37 2014 +0200

refactor controller code

commit bb5afab8a534f0bd06c443c75230b15de1fcb5ad
Author: Marco Fruhwirth
Date: Sat Sep 27 13:47:36 2014 +0200

fixed paren

commit 69e2609ae1affe32a5f72a43e668197ef2bd68f9
Author: Marco Fruhwirth
Date: Sat Sep 27 13:32:00 2014 +0200

changed phaser version

commit 3926209552beb659fe5068411deda450b3110e99
Merge: 71e09ba 31610cb
Author: mf
Date: Sat Sep 27 12:19:06 2014 +0200

Merge branch 'master' of https://github.com/mfit/jamjump

commit 71e09ba906be25eac76d2aa6a7eeedb253dec507
Author: mf
Date: Sat Sep 27 12:18:54 2014 +0200

Add model code

commit a50d71f4453ee3febc09e91b63650c469637b191
Author: mf
Date: Sat Sep 27 11:40:34 2014 +0200

cleanup

commit 2921f7f8460ec4f0ecdcab22a6b316ac41794b72
Author: mf
Date: Sat Sep 27 11:39:54 2014 +0200

cleanup

commit fe4a266e9a219e13088b560528aa198634f28bb6
Author: mf
Date: Sat Sep 27 11:35:01 2014 +0200

dep, bower

commit aad726fce55ca1c265b9286e1d62f86d27c65088
Author: mf
Date: Sat Sep 27 11:33:35 2014 +0200

Phaser version

commit e1b8c62f79af35eb301400f2134623502b9d2b9e
Author: mf
Date: Fri Sep 26 22:48:57 2014 +0200

transparent spritesheet

commit 601ec14c4e286b67c2ea05dd30bfa7761b9c8e07
Author: mf
Date: Fri Sep 26 21:52:10 2014 +0200

Add endless blocks

commit be8eea943724f37a2d8aa0afc059d0e186317b59
Author: mf
Date: Fri Sep 26 21:38:37 2014 +0200

basic setup with physics

commit 2d236b9b5883333401708779903980cf1845561f
Author: mf
Date: Fri Sep 26 21:02:32 2014 +0200

Some sprite creation

commit db358df7962bc08895ea340ca0f028439fe3bafe
Author: mf
Date: Fri Sep 26 19:38:34 2014 +0200

Yeoman phaser init

commit 603898ad083a2ade38d6a51422a9114fc10a0201
Author: Matthias Frey
Date: Fri Sep 26 19:37:13 2014 +0200

Initial commit