Commit Graph

5 Commits

Author SHA1 Message Date
Guus Sliepen 36f0e7a85d Merge remote-tracking branch 'origin/sdl2'
Conflicts:
	src/player.cpp
2014-05-13 16:22:11 +02:00
Julian b1ae2a4128 Added the changes I proposed a while back.
So now, when currentGame.gamePlay is set to GAMEPLAY_ONPON:
- You start with 50 shield, and never gain any increased capacity.
- You can't charge the charge cannon and shoot at the same time; if
  you shoot the plasma gun, the charge cannon shoots as well (as if
  you had released the charge key).

I didn't add in the feature to keep the view from slowing you down,
because the method I used was imperfect anyway.
2014-03-12 14:35:24 -04:00
Guus Sliepen 593ea01386 Initial conversion to SDL2. 2013-09-30 16:52:43 +02:00
Guus Sliepen c357c28966 Ensure the joystick is usable in the title screen. 2013-07-13 15:10:29 +02:00
Guus Sliepen bd4a449e10 Rename code/ to src/. 2013-07-11 14:24:37 +02:00