Commit graph

35 commits

Author SHA1 Message Date
Ash Reynolds
9cd355036c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/com/game/Actor/Spike.java
#	core/src/com/game/Screens/Play.java
2016-02-22 18:54:07 +00:00
Ash Reynolds
3b1aea382d Refactoring and platform graphics 2016-02-22 18:36:56 +00:00
ESloman
a3d850647d Level Changes
Updated Level 8 + 9
2016-02-22 15:40:49 +00:00
ESloman
d91ee3946c Level Changes
Adding in a new layer in later levels caused old levels to crash due to
missing layer. Added empty layer for the older levels.
2016-02-22 14:30:33 +00:00
ESloman
9f2627947c Level Changes
Added in additional layer to previous levels for Spikes.
2016-02-22 14:17:46 +00:00
rumps
556f5fae30 Added mission intros 2016-02-22 14:01:04 +00:00
ESloman
299d1a2d94 Level Changes
Added in Level 8.
Also removed the walls that the player had to pass through in levels 4
onwards.
Edited Level 4 to introduce spikes and added a 'SPIKES' layer in Tiled.
Also added the texture to assets. Unfortunately my code is wrong and it
isn't working so level 4 is currently broken.
2016-02-22 12:34:54 +00:00
Ash Reynolds
61322d04d4 More UI changes 2016-02-16 16:10:25 +00:00
Ash Reynolds
ec583e75be Fixed player rotation 2016-02-16 15:02:24 +00:00
ESloman
71d9c3afba Various Changes
Started work on getting Endless Mode to work.
Some level tweaks.
Made it so you can't change colours when in a pause menu.
2016-02-16 13:15:11 +00:00
ESloman
03f5bea581 Updated levels and created new ones
Updated levels 1 and 2 to make them playable.
Added in levels 3 - 10.
2016-02-16 11:00:43 +00:00
Rumps
a7ee3d7de7 Intros 2016-02-14 15:25:27 +00:00
Rumps
fdae895cf9 Sounds 2016-02-14 14:30:54 +00:00
Rumps
bc2a200beb Endgame menus done 2016-02-14 14:14:35 +00:00
Ash Reynolds
b5fc10546d Colour changing implementation 2016-02-13 15:47:03 +00:00
Ash Reynolds
4593a6c686 Level select menu 2016-02-13 01:12:43 +00:00
Ash Reynolds
cfb59a3c4a Increased performance (Huge Refactor) 2016-02-12 23:23:59 +00:00
Ash Reynolds
3553152649 Main menu 2016-02-12 19:13:05 +00:00
Ash Reynolds
4432e1d3cb Updated Play screen 2016-02-11 18:58:18 +00:00
ESloman
063cb770da Name change of Java Application
Change 'TITLE' to 'A Reckless Disregard for Mercy' instead of 'Group
Project'
2016-02-11 18:41:50 +00:00
Ash Reynolds
fbd68c2169 Screen functionality
Basic screen functionality, working loading screen with asset loader and
manager
2016-02-11 18:35:15 +00:00
Ash Reynolds
61a10aa7e7 Camera utilities and menu implementation 2016-02-10 18:21:32 +00:00
Ash Reynolds
71ffec00ab Code Refactor
Made some utilities
2016-02-09 18:33:12 +00:00
Ash Reynolds
71f048e3ca Implemented boundary and jumping collision detection 2016-02-09 16:37:43 +00:00
ESloman
9a31d7b078 Icon Changes
Made some changes so that the application now has a custom icon. Changes
were only really made to DesktopLauncher.java and added the icon to the
asset folder. The other two files edited weren't actually changed.
2016-02-09 13:12:43 +00:00
ESloman
d114083688 Level 2 and character edits
Made subtle changes to Level 2. Added the characters svg and png to the
asset folder. Also added a separate player png.
2016-02-09 12:49:16 +00:00
ESloman
99ed248ec6 ??
??
2016-02-09 12:17:28 +00:00
ESloman
cd0296ca0a Various
Added Level 2 and also added a jumping sound for when the player jumps.
Jumping sound comes out distorted but oh well.
2016-02-09 12:07:13 +00:00
ESloman
481f51dc2b Boundary change 2016-02-09 11:49:40 +00:00
ESloman
1672f9c6c9 Level 1 Change
Misc
2016-02-09 11:47:50 +00:00
ESloman
f580e72ad3 Level 1 Change #2
Moved boundary and player
2016-02-09 11:14:14 +00:00
ESloman
4c17b3800c Level 1 change
Moved played start
2016-02-09 11:10:54 +00:00
Ash Reynolds
e663268480 ? 2016-02-09 00:05:48 +00:00
Ash Reynolds
6edb84511f Basic Files 2016-02-08 18:08:43 +00:00
Ash Reynolds
447fbed207 :neckbeard: Added .gitattributes 2016-02-08 17:03:03 +00:00