-creating a merge conflict
-fixing merge conflict
Merge branch 'master' of https://github.com/gameDevPrep/PaddleGame.git
- Fixed SquishBug <3
-merge
Merge remote-tracking branch 'origin/master'
-added Settings.ini to git ignore
-fixed Mouse recentering bug
-Fixed Esc trigger bug
-Fixed some "stupiding" in button behavior
-removed unnecessary loops and checks in Menu
-Fixed exploit, paddle can no longer move while game is paused
-testing gitignore on settings.ini
-implemented checkBox for color/texture Mode
-Added textures for: CheckBox, ApplyButton, CancelButton and
SettingsFrame
-forgot to commit button and checkbox textures
-working on level builder
-save and load functions fully implemented, working on GUI for
levelBuilder
-save commit
-levelBuilder is fully functional, need to add file name reading
-need to modify Level to actually generate appropreate level according
to number
-need to modify Main Menu to allow for custom level loading