myArcade/mario, branch origin/develop Unnamed repository; edit this file 'description' to name the repository. http://git.linux-forks.de/myArcade/atom?h=origin%2Fdevelop 2015-11-07T09:27:05+00:00 Some refactoring for the on_player_collision 2015-11-07T09:27:05+00:00 Fernando Carmona Varo ferkiwi@gmail.com 2015-11-07T09:27:05+00:00 urn:sha1:aeaca5d7494efe55767c997181a5c071c4800c43 Improved portal detection, using the already existing collision detection logic instead of abms 2015-11-07T08:57:35+00:00 Fernando Carmona Varo ferkiwi@gmail.com 2015-11-07T08:57:35+00:00 urn:sha1:234cac868e1baf2089ef255d0751a7e288725db5 Merge branch 'master' of https://github.com/DonBatman/myarcade 2015-10-27T23:03:28+00:00 Fernando Carmona Varo ferkiwi@gmail.com 2015-10-27T23:03:28+00:00 urn:sha1:4c03a0e5880e44e920007ead8212025858a1fb21 Conflicts: mario/gamestate.lua mario/hud.lua mario/init.lua Integrated Mario gamestate logic, some fixes and tweaks 2015-10-27T22:26:43+00:00 Fernando Carmona Varo ferkiwi@gmail.com 2015-10-27T22:26:30+00:00 urn:sha1:3eb0d44c20383a1c3d0fe4552b169b223010a46e added mario2.mts 2015-10-27T21:47:18+00:00 DonBatman serfdon@gmail.com 2015-10-27T21:47:18+00:00 urn:sha1:55ba62165293b6bf8f3f78e2e5fc3bb5152400f4 Stared work on gamestate and hud for mario 2015-10-27T19:35:55+00:00 DonBatman serfdon@gmail.com 2015-10-27T19:35:55+00:00 urn:sha1:32148072652c69844bbaa3e19d6071d48980a7d8 added the schem I forgot last time 2015-10-27T02:59:28+00:00 DonBatman serfdon@gmail.com 2015-10-27T02:59:28+00:00 urn:sha1:3837307e5b81743dc6421193ab00f9c15e64aa83 Merge branch 'master' of https://github.com/DonBatman/myarcade 2015-10-27T00:02:12+00:00 Fernando Carmona Varo ferkiwi@gmail.com 2015-10-27T00:02:12+00:00 urn:sha1:97cebf050265bf2ebbffd7770d57b3ed0b911bf8 Conflicts: mario/init.lua mario/turtle.lua Added turtle movement 2015-10-26T23:58:36+00:00 Fernando Carmona Varo ferkiwi@gmail.com 2015-10-26T23:58:36+00:00 urn:sha1:087713746ba1b8cac4ce5142fa136d3bde56cca6 added sound files to mario 2015-10-26T23:33:48+00:00 DonBatman serfdon@gmail.com 2015-10-26T23:33:48+00:00 urn:sha1:ff0c1eef4b5e4e06b02b164509590c18e7b450b9 fixed portal issue updated schematic started on turtles and gamestate