Commit graph

Select branches

Hide pull requests

gh-pages

master

Mono Color

• 842947e254 Add credits, remove scrollbar gh-pages Aaron Mueller 2014-12-08 19:36:35 +0100
• ad08ec79e1 Add credits to the title screen master Aaron Mueller 2014-12-08 19:34:46 +0100
• 57ce2eddf2 Remove scrollbars Aaron Mueller 2014-12-08 19:28:06 +0100
• 9000b196ac Update notes rubenmueller 2014-12-07 22:55:48 +0100
• 979aabcad4 Fix Ruben Müller 2014-12-07 22:50:23 +0100
• 68a28ca6dc add video Jonas1989 2014-12-07 21:17:58 +0100
• 2ea1bc5c74 add gitignore Ruben Müller 2014-12-07 20:59:39 +0100
• 1de7efa943 Fix Ruben Müller 2014-12-07 20:58:53 +0100
• 760c1838ed Add game Ruben Müller 2014-12-07 20:57:49 +0100
• fd6fbf3f76 add release Ruben Müller 2014-12-07 20:56:28 +0100
• 4ecfaad8e5 Create gh-pages branch via GitHub Ruben Müller 2014-12-07 20:53:29 +0100
• 4a0278e90c Fixed some bugs, made gameplay better Ruben Müller 2014-12-07 20:48:54 +0100
• 661af48fd7 Cube rotate asset Ruben Müller 2014-12-07 20:24:58 +0100
• 1a5b1b36f4 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 19:41:29 +0100
• 95735090d5 Fix item cost Ruben Müller 2014-12-07 19:41:22 +0100
• bc95c89e23 change end Jonas1989 2014-12-07 19:41:04 +0100
• 723d130791 change titlescreen Jonas1989 2014-12-07 19:15:34 +0100
• 279ba72323 bug fixed Aaron Mueller 2014-12-07 19:14:40 +0100
• c8aedab80a Add title screen and cut scene Aaron Mueller 2014-12-07 19:11:11 +0100
• 393af0b9b5 cut scene ... working ??? Aaron Mueller 2014-12-07 18:59:59 +0100
• 50322fedf5 Merge remote-tracking branch 'origin/master' Jonas1989 2014-12-07 18:56:39 +0100
• d90eb96f89 change intros Jonas1989 2014-12-07 18:56:28 +0100
• b2813308a8 Update notes Ruben Müller 2014-12-07 18:56:16 +0100
• 68838fa3c9 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 18:54:11 +0100
• c98464bec0 Info button Ruben Müller 2014-12-07 18:53:30 +0100
• ddceb2fd45 End game Aaron Mueller 2014-12-07 18:50:10 +0100
• a20bfd6dab add titlescreen Jonas1989 2014-12-07 18:45:22 +0100
• d5ecbd0ccb Fix Ruben Müller 2014-12-07 18:43:26 +0100
• 3a506cc908 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 18:41:43 +0100
• 4a2ee93577 Speech Ruben Müller 2014-12-07 18:41:33 +0100
• a3543762d9 fix Aaron Mueller 2014-12-07 18:39:37 +0100
• 0bcc7acd20 energy and game end check Aaron Mueller 2014-12-07 18:37:04 +0100
• 48ee574185 add intro, endcreens and layer-details Jonas1989 2014-12-07 18:32:53 +0100
• 2a31ac0fa1 Update nots Ruben Müller 2014-12-07 18:17:56 +0100
• eb8fa64602 Fixed lava bug Ruben Müller 2014-12-07 18:17:33 +0100
• 3d1a6d9fe7 Crosshair Ruben Müller 2014-12-07 18:15:07 +0100
• 64b78fb9eb Cursor gone Ruben Müller 2014-12-07 18:14:12 +0100
• 183e27d220 Cursor! Ruben Müller 2014-12-07 18:12:47 +0100
• 9388487309 Update notes Ruben Müller 2014-12-07 18:09:08 +0100
• 519a5f4b21 Awesome buildinfo Ruben Müller 2014-12-07 18:08:30 +0100
• 0427129db5 Add all bubbles Ruben Müller 2014-12-07 18:03:46 +0100
• 243645658c Merge remote-tracking branch 'origin/master' Jonas1989 2014-12-07 18:01:03 +0100
• 941257a063 add intro and end screens Jonas1989 2014-12-07 18:00:55 +0100
• 7cb6e07602 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 17:57:41 +0100
• a6e905d57a Yay release Ruben Müller 2014-12-07 17:57:33 +0100
• db62c5d9a2 Merge remote-tracking branch 'origin/master' Jonas1989 2014-12-07 17:57:24 +0100
• 64766f0d88 add intro and end screens Jonas1989 2014-12-07 17:57:17 +0100
• 280b293fb7 small fixes after merge Aaron Mueller 2014-12-07 17:56:52 +0100
• 89bc084f43 solarpanel Aaron Mueller 2014-12-07 17:52:10 +0100
• 8c66cb2901 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 17:41:26 +0100
• de01da9f81 Ntoes and HUD Ruben Müller 2014-12-07 17:41:21 +0100
• 9a6ef0c994 Speechbubble says more Ruben Müller 2014-12-07 17:31:30 +0100
• 49c18fbb6b add intro Jonas1989 2014-12-07 17:27:32 +0100
• 9dcef3b43e Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 17:22:06 +0100
• f02df022d3 Add infobox Ruben Müller 2014-12-07 17:21:58 +0100
• 227f20d1be hud polishing Aaron Mueller 2014-12-07 17:21:24 +0100
• dc46a06ee0 GFX Ruben Müller 2014-12-07 17:10:22 +0100
• cecb52a963 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 17:09:14 +0100
• 78c245d3e1 HUD update Ruben Müller 2014-12-07 17:08:31 +0100
• 8e3d344255 Update asssets Ruben Müller 2014-12-07 17:08:09 +0100
• 270014db3d detail entities Aaron Mueller 2014-12-07 17:04:40 +0100
• b510790ef8 can't click on dead tiles Aaron Mueller 2014-12-07 16:27:44 +0100
• 656547aacd GFX polishing Aaron Mueller 2014-12-07 16:27:35 +0100
• b7f5bff2f1 More space for the main base Ruben Müller 2014-12-07 16:17:10 +0100
• ca2ec250d6 New notes Ruben Müller 2014-12-07 16:16:55 +0100
• 19941d4ac8 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 15:53:47 +0100
• 6f482e8d2c Speechbubble work Ruben Müller 2014-12-07 15:52:54 +0100
• 30f72a3135 Pimp the GFX and make dead tiles Aaron Mueller 2014-12-07 15:47:42 +0100
• 82e5a55d24 add actions Jonas1989 2014-12-07 15:37:13 +0100
• 4d1313fccc add layers-details Jonas1989 2014-12-07 15:33:48 +0100
• e26acf2c2e Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 15:21:01 +0100
• 062da58745 Updates notes.org Ruben Müller 2014-12-07 15:20:45 +0100
• 4a833902cc addlayers-details Jonas1989 2014-12-07 15:18:43 +0100
• abb1d3c3da Colored capacity panel Ruben Müller 2014-12-07 15:13:19 +0100
• dcf7d78ff9 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 14:45:27 +0100
• c62cc69d15 Added animations Ruben Müller 2014-12-07 14:45:13 +0100
• 0bc344464d add actions Jonas1989 2014-12-07 14:35:53 +0100
• 74cd1bdf4c add actions Jonas1989 2014-12-07 14:27:50 +0100
• 7be346aaaa notes edit Aaron Mueller 2014-12-07 14:19:00 +0100
• d8cfae7940 Entity constraints Aaron Mueller 2014-12-07 14:07:13 +0100
• dfbcb1598c add actions Jonas1989 2014-12-07 14:10:53 +0100
• 09fce2c34b Rename effects Ruben Müller 2014-12-07 14:04:04 +0100
• 5ede943f03 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 14:03:39 +0100
• c1c01eea79 add effects Jonas1989 2014-12-07 14:02:44 +0100
• 29ebab4b46 Working on HUD anim Ruben Müller 2014-12-07 14:02:42 +0100
• 148ea3d9b4 Merge remote-tracking branch 'origin/master' Jonas1989 2014-12-07 14:00:22 +0100
• f87de6febc add layers Jonas1989 2014-12-07 14:00:15 +0100
• 0a71cdbc49 Renamed asset Ruben Müller 2014-12-07 13:48:44 +0100
• 0d772735e8 Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 13:48:17 +0100
• 35d35da83d Added animated item Ruben Müller 2014-12-07 13:48:12 +0100
• a509b65e0a Merge remote-tracking branch 'origin/master' Jonas1989 2014-12-07 13:47:26 +0100
• 45598381db add effects Jonas1989 2014-12-07 13:47:18 +0100
• 0ef1a15efc Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 13:42:55 +0100
• 1ce34f3472 Work on HUD Ruben Müller 2014-12-07 13:42:45 +0100
• b7df9c356c add effects Jonas1989 2014-12-07 13:42:11 +0100
• 3f8532a830 Show selected entities in HUD Ruben Müller 2014-12-07 13:32:10 +0100
• 0dc491909a add entities and layers Jonas1989 2014-12-07 13:22:55 +0100
• 3f7fe8c5cf Fix silo storage calculation Ruben Müller 2014-12-07 13:22:35 +0100
• c4662dba5b Merge branch 'master' of https://github.com/arg-games/ld31 Ruben Müller 2014-12-07 13:20:08 +0100
• bf6d4ee7dc Fixed mouseout-error Ruben Müller 2014-12-07 13:19:53 +0100