GitGirl - Conflict Resolver

Overall★★★★★★★★★★3.33
Fun★★★★★★★★★★2.99
Innovation★★★★★★★★★★2.87
Theme★★★★★★★★★★2.71
Graphics★★★★★★★★★★3.66
Audio★★★★★★★★★★3.21
Humor★★★★★★★★★★2.67
Mood★★★★★★★★★★3.08
Coolness★★★★★★★★★★100%
Ever wonder how conflicts are resolved in a git repository? Well if you play this game, then maybe! It only takes 10 seconds-ish.

Controls:

Arrow keys - Movement.
Space - Jump. Double jump. Wall jump.
Z - Throw bomb.

*Update*
- Added Linux build. Let me know if it doesn't work, I can't test it.

Comments81

ThirteenWB26 Aug 2013, 00:58
If I wasn't making my game by myself, I would probably run out of time just trying to resolve those pesky conflicts xD.
Looks awesome, I'll be back once voting starts!
demiurgo
demiurgo26 Aug 2013, 18:19
Are you using Unity right?
If you can, export a linux version too.
I would like to try the game :)
bonsairobo26 Aug 2013, 18:24
I like this idea. Wall jumping was kinda weird but otherwise, cool!
sgehlich26 Aug 2013, 18:28
I love the graphics, but the gameplay is way too slow :(
crashbanito
crashbanito26 Aug 2013, 18:28
I really love that art style. I would really love to see this expanded with more levels.

My only problem with the game was a bug with the physics on the second level (bomb kept floating left instead of falling down, but was resolved when the level restarted). Also I feel like the wall jumping could use a speed boost.
Jishenaz
Jishenaz26 Aug 2013, 18:30
Cute. My only problem was that movement was a little slow. Otherwise, I enjoyed it.
GFM
GFM26 Aug 2013, 18:35
Really short, but I liked the level design. Those rotations were really nice! :)
ddionisio
ddionisioauthor26 Aug 2013, 19:11
Linux build is up, let me know if there's an issue with it. I tried with a binary build on windows and it works...hopefully it's the same for Linux!
Colapsydo
Colapsydo26 Aug 2013, 19:24
I love the character.
The gameplay is nice, it could be fun to have some action to do with the bomb to exploit the 10 seconds limit.
The game theme is nice, reminds me of super meat boy.
Also the "Conflict resolved" tune has a really low volume.
skywing
skywing26 Aug 2013, 20:47
Its tough starting over from the beginning when you lose, and the speed isn't quite as fast as I'd like it, but I can't hate any platformer with walljumping.
markengley
markengley26 Aug 2013, 20:49
Cool little game. Really nice drawings. Found the platforming a bit awkward, but I liked how you used the rotation mechanic.
Mase
Mase26 Aug 2013, 20:52
I... don't actually know what a git repository is... so the allegory's nuances were sort of lost on me. Cute graphics though.
AdventureIslands
AdventureIslands26 Aug 2013, 20:52
Played it through, not bad! I was expecting more puzzling with the bomb, but it's fine how it is, nice character! shame the game is so little, could have been fun to see the pixel characters little larger.
JimMakesGames
JimMakesGames26 Aug 2013, 20:54
A quite challenging platform game. Controls are tight and the jumping is tricky but manageable. The gravity changing is a nice mechanic.

I like the character. Anyone who carries a bomb on her head is badass. Graphics are wonderful and the music is most pleasing. It was a bit short with two levels and it would be great to see it expanded on.
VagabondEx26 Aug 2013, 20:57
Short, but shows the promise in the idea. I am not a big friend of platformers, but I really liked this one. Please go on and create new levels :)
imef26 Aug 2013, 21:05
Quite a nice platformer! The controls are fluid and the graphics are nice.
bisk8s
bisk8s26 Aug 2013, 21:21
NICE! Well done! Nice game nice music! I loved to play it! One of the best for shure!
Latcarf27 Aug 2013, 00:24
The Linux build seems to work but (at least on my computer) it's so slow that it's unplayable (about 1 or 2 fps, even on the title page).
Erkberg
Erkberg27 Aug 2013, 01:20
Stunning visuals and music! Nice gameplay too with the rotations. Walljumping felt a little strange and the character moves a bit too slow, but apart from that this is an awesome game.
nicotuason27 Aug 2013, 03:22
Great character design! The jumping feels a bit floaty but the level design kept it interesting.
sP0CkEr227 Aug 2013, 03:34
nice intro graphics but the controls were a little wonky -- not sure how to get past the first level -- nice entry
ddionisio
ddionisioauthor27 Aug 2013, 03:53
Thanks a lot for the comments guys, really good feedback! So the general consensus is the movement is slow.

I'm wondering now if the slowness of the character is due to low framerate...I'm going to see if I can have the option to turn off the background effect. That for sure is a performance killer :P
larb27 Aug 2013, 04:01
The wall jumping felt a bit awkward. But, great art and music. Some real talent here. Great entry!
Richard Matey27 Aug 2013, 04:10
I like your trippy background and hardcore midi.
Tortche27 Aug 2013, 04:19
The wall jump and relative world are really cool ideas.
evilDan27 Aug 2013, 04:32
Cool! Love the start screen and the screens between levels. Also love the gravity change.

The player controls could use a bit of tightening but the overall feel is very nice.
BloodJohn
BloodJohn27 Aug 2013, 06:42
Puzzle game. Simple control. Involving gameplay.
Travis Irby27 Aug 2013, 07:02
Really cool style and fresh platformer concepts. nice work!
Sakuyan
Sakuyan27 Aug 2013, 07:19
I had fun playing the game :D
kayupla27 Aug 2013, 07:49
really great universe! Visuals great! but the theme....?
Tanser27 Aug 2013, 08:35
The overall atmosphere is really nice and the graphics and music are great. Nice job!
SamuelDivinium27 Aug 2013, 09:09
The graphics and music are fantastic, but the platforming was reeeeallly slow to me as well as the wall jumping was a bit clunky imo. Good game though!
0110110127 Aug 2013, 10:36
The UI and music are really well done and polished, great job! Controls are a bit slow but it still plays fairly well. I liked the VVVVVV kind of gravity changes :)
Hypnohustla
Hypnohustla27 Aug 2013, 10:51
Love the character. It did feel a bit slow though. The jumping took some time to get used to but otherwise a solid game :)
whiteravens27 Aug 2013, 12:00
I really enjoyed the sound and the Japaense game feel. :) You may want to make it a bit more faster, but still great work!
Ghostik
Ghostik27 Aug 2013, 12:42
I enjoyed this one :)
Misfit27 Aug 2013, 13:13
Nice little game. Maybe jumping has something weird.
RennFarnell27 Aug 2013, 13:19
I think you could have focussed more on the 10 seconds, relaly like the menu graphics and the controls were smooth =]
Typedeaf
Typedeaf27 Aug 2013, 14:18
Loved the cutscene graphics, second level was pretty tricky
Zccc
Zccc27 Aug 2013, 16:58
This was amazing, please do more levels :D
Diptoman
Diptoman27 Aug 2013, 17:23
Loved the art and the music in this! The menu graphics were very pleasing. Plus I have this weakness for wall jumping.
I know there wasn't much time, but it'd have been great if there were more stuff to abuse the 10 second timer.
Great job on this nonetheless. I'd love to more levels and strategies.
Reverend Speed27 Aug 2013, 18:20
Loved the art, loved the sound, found the jumping awkward but fine for a 48 hour entry! Level designs look interesting - would like to see this developed further!
PeaCe
PeaCe27 Aug 2013, 18:38
Nice!
The controls could do with improvements if you're gonna continue completing this game.
Orni
Orni27 Aug 2013, 19:24
great little game, I enjoyed it a lot - despite being used to faster platformers (super meatboy and consorts)

well done :)
Dir3kt
Dir3kt27 Aug 2013, 20:00
Haaa. Really like the main character.
gre
gre27 Aug 2013, 20:27
Game mecanisms are good, especially the gravity rotation.
Gameplay is a bit hard.
Pinktreeleaf27 Aug 2013, 20:58
loving the area flips and the cover art well and the bomb holding 10 second mechanic. Beat the first level and played a bit of level two. oh yea and the wall jumping.
RoseNinja27 Aug 2013, 21:39
Like the art style and character, good game. Well done
fgielow27 Aug 2013, 21:44
Great made for 48 hours.
Very well executed. Nice graphics and sound.
GaTechGrad27 Aug 2013, 23:44
Nice little platformer. The level rotation mechanic was a nice touch.
bassarisse
bassarisse28 Aug 2013, 00:51
I really liked it, but 2 things bothered me: the slow movement and the awkward way of wall jumping.
zatyka
zatyka28 Aug 2013, 00:55
Very nice graphics, and fun rotating level mechanics. My only issues are the jumping control, and the lack of more levels. Nice job through!
Nick Weihs28 Aug 2013, 07:19
Wall jumping was a cool addition.
bobylito
bobylito28 Aug 2013, 09:20
Very nice game.
recursor
recursor28 Aug 2013, 12:30
The art for the little character is quite nice, but the gameplay feels a bit slow. I must admit I got frustrated trying to double jump and wall jump up to where I was supposed to throw the bomb. The wall jumps seemed to not always work like I expected them to. I also wish I had more than 1 bomb. When I finally made it to the platform, I threw my bomb in the wrong direction and was unable to get to it before it exploded.
TobiasW
TobiasW28 Aug 2013, 15:10
BOMBS - my favourite way to solve conflicts, haha :D

The music is perfect, and the graphics are cute. A little bit too tiny on my screen though, but that's hardly your fault!

I liked your screen-turning mechanic; that could've been explored a little more than just being a visual effect. I really wish I could make my double-jump after I made a wall-jump - I can do jump & double-jump & wall-jump, why can't I jump & wall-jump & double-jump? That killed my on my first play-through: I wanted to double-jump, but I wall-jumped instead, and then time was up.

I'll never view git conflict resolutions the same way - cool game!
TobiasW
TobiasW28 Aug 2013, 15:12
Oh, I just played the second level - disregard what I said about the screen-turning, you use if for puzzles there. Good job!
ddionisio
ddionisioauthor28 Aug 2013, 17:21
Thanks guys for the comments!

@recursor Hm, more than one bomb may not be an actually bad idea! It might be a funny way to solve a puzzle too, like sacrificing one 'life'. :P

@TobiasW Yeah, I think there should be a way to double jump after wall-jump. I'm pretty sure I removed it because it's giving the player too much vertical movement :P Though maybe I'll have it so that you can jump->wall jump->jump, but not jump->double jump->wall jump->jump.

I've been researching wall jumping by playing games that use them :D The best implementation I found is Meat Boy's, I think the newest version will have a more enjoyable wall-jumping experience. Stay tune!

I'm also considering if checkpoint is a good idea or just make the level shorter, we'll see. But I definitely need to remove the gameover screen so you can continue in-game much faster!
Beardbotnik
Beardbotnik29 Aug 2013, 01:59
Fun game, the wall jump could be a little weird, but it was really fun overall. Awesome job! I absolutely love the music, reminds me a lot of the music from the Disgaea series.
zillix
zillix29 Aug 2013, 06:22
today I learned that I've been using git wrong the whole time. thanks, gitgirl!
Crazi45629 Aug 2013, 07:17
Nice interesting mechanics! Well done!
tigerj
tigerj29 Aug 2013, 15:43
Well this is an amazing entry. hands down really funny for anyone using git and been in conflict hell.

Thanks for making this. I love the idea, the art and the music.
psychomonster
psychomonster30 Aug 2013, 06:01
Nice character. Level design is super... after a short time of orientation the double jump and wall jump worked fine for me. Enjoyed to learn about how to resolve a conflict in a git ^^
xndr30 Aug 2013, 08:55
very cool! good job.
Codexus
Codexus31 Aug 2013, 21:39
I love the title. Nice graphics, especially the title screen and such. The game itself was nice but the controls could have been better.
ENDESGA
ENDESGA2 Sep 2013, 03:58
kinda difficult imh :P
great game nonetheless
UnixXNova2 Sep 2013, 05:36
controls felt unresponsive but other than that it was a nice game i liked the wall jumping
matthias_zarzecki2 Sep 2013, 07:49
Solid platformer! Level-design is pretty hard though.
FlashRocks2 Sep 2013, 18:09
An awesome but challenging game. My only complaint is that wall jumping was a bit glitchy.
Capro
Capro3 Sep 2013, 11:46
Great concept and great game! Keep working on it, make more levels. :)
DaggerHog
DaggerHog3 Sep 2013, 13:31
Nice game. Could be a little faster, and the wall-jumping took some time to get used to. I liked the graphics and music, though it's a shame you weren't able to finish more levels in time.
RoyBatty4 Sep 2013, 13:02
Great entry! Really liked the rotating world mechanic, solid platforming, rockin' music- thank you. :-)

-thatwhichis, team RoyBatty
Ravenous Games4 Sep 2013, 13:10
Loved the background! I would have expected to be able to jump again after a wall jump if I had only jumped once previous to the wall collision but it made for some interesting gravity flipping platforming.
fferro2345 Sep 2013, 03:42
Great game. The double jump and wall jump and rotating world worked really well. I was sad that there were only two levels. Great job.
Atmospherium
Atmospherium6 Sep 2013, 14:28
Great premise and fun gameplay. Controls could be polished a bunch, but the core of the game definitely works. The graphics and music really worked well together.
ChrisGaudino
ChrisGaudino7 Sep 2013, 20:55
I agree with the others that have said the gameplay is a little on the slow side. Other than that I think this is great.
lordjosephdeburg
lordjosephdeburg15 Sep 2013, 21:06
dd, out of the 200 entries I have judged this is easily in the top 10, thank you for making such a beautiful experience! 5 stars in all... I would love to see this game developed further with more levels. A restart button would also be nice as sometimes you really cant get to the bomb with crazy shifts in gravity. One to remember this LD for sure.

Other games by @ddionisio

Found a bug?
Tell us on Discord