Update#1

Open

shintoo wants to merge 274 commits intoshintoo:masterfrom

BillingEmail:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 19, 2015

Commits on Nov 20, 2015

World and game beginnings
shintoo
committed
Changes to level editor and bug fixes
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/DrawBlade
SaddlePaddle
committed
Setting up for writing leveleditor
SaddlePaddle
committed
Added mouse and work on leveleditor
SaddlePaddle
committed
World and stuff
shintoo
committed
help
shintoo
committed
Fix weird commit issue
shintoo
committed

Commits on Nov 21, 2015

Fix commit issues
shintoo
committed
Yeah, comments
kylercn
committed
Merge branch 'master' of https://github.com/BillingEmail/Platformer
kylercn
committed
rename
shintoo
committed
And one overly done pencil screen added
kylercn
committed
Merge branch 'master' of https://github.com/BillingEmail/Platformer
kylercn
committed
Spelling
shintoo
committed
Start screen
shintoo
committed
More commenting
shintoo
committed
Placeholder textures
shintoo
committed
Finishing Touches to LevelEditor
SaddlePaddle
committed
Woops, had to change main
SaddlePaddle
committed
Renaming
shintoo
committed
Completed mainmenu, will add assets in a bit
kylercn
committed
Removed startscreen
kylercn
committed
Now with enum
kylercn
committed
Debugging level editor still
shintoo
committed
old
shintoo
committed
old
shintoo
committed
Some incomplete assets added
kylercn
committed
Error Cleaning for LevelEditor
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/DrawBlade
SaddlePaddle
committed

Commits on Nov 22, 2015

Level editor minor fixes, test level
shintoo
committed
Edit New or Load Message
SaddlePaddle
committed
Some Changes
SaddlePaddle
committed
srry
SaddlePaddle
committed
Satya why
shintoo
committed
stop
shintoo
committed
LevelEditor and Assets Changes
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Adding Assets
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Fix loading
shintoo
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Restructured HUD
shintoo
committed
Fixed main menu
shintoo
committed
HUD and loading world from game
shintoo
committed
Neater struct
shintoo
committed
No weapon
shintoo
committed
Load world from level, render world
shintoo
committed
Main Menu functionality
shintoo
committed
Rename wrapper -> container
shintoo
committed
Rename w -> container, no weapon/behavior
shintoo
committed
Editor Style Changes
SaddlePaddle
committed
woops
SaddlePaddle
committed
Changes for if bounds < Screen size
SaddlePaddle
committed
Fix centering levels smaller than screen size
shintoo
committed

Commits on Nov 23, 2015

Full completion of code for level editor
SaddlePaddle
committed
LevelEditor touches
SaddlePaddle
committed
Fix commit errors
shintoo
committed
Cleaner eraser
shintoo
committed
changes and comments
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
SaddlePaddle
committed
Fixes to everything
shintoo
committed
Main Menu test
shintoo
committed
Testing
shintoo
committed

Commits on Nov 24, 2015

Move TILE_SCALE to allow access in world
shintoo
committed

Commits on Nov 25, 2015

Commits on Nov 26, 2015

Commits on Nov 27, 2015

More changes
SaddlePaddle
committed
font stuff
shintoo
committed
brick stuff still
shintoo
committed
Bug fixes to bricks
SaddlePaddle
committed
New player images
shintoo
committed
Currect bricks in game
shintoo
committed
Player fix test
SaddlePaddle
committed
Working in game bricks
shintoo
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Try this
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
fix it satya
shintoo
committed
Jumping pls
shintoo
committed
Remove outdated tests
shintoo
committed
Fix
SaddlePaddle
committed

Commits on Nov 28, 2015

Brick fixes in game, textbox functionality
shintoo
committed
Assets
shintoo
committed
New and improved textbox, more comments
shintoo
committed
Add transparency
shintoo
committed
Bold font
shintoo
committed
New demo level1
shintoo
committed
Slight adjustments
shintoo
committed
Finishing touches to player animation
SaddlePaddle
committed
Player bug fixes
SaddlePaddle
committed
Fixes
SaddlePaddle
committed
Fixes to animation
SaddlePaddle
committed
old
shintoo
committed
satya
shintoo
committed
oh lord
shintoo
committed
Polished menu done
shintoo
committed
assets, menus, font, etc
shintoo
committed
Beginning changes to leveleditor
SaddlePaddle
committed
Updated lava and ice img assets
kylercn
committed
Updated Medieval img and added its boss
kylercn
committed
Updated spooky img and added its boss
kylercn
committed
Added display capabilities of mana for HUD
kylercn
committed
Added img assets for action
kylercn
committed

Commits on Nov 29, 2015

old
shintoo
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
No executable please, my goodness
shintoo
committed
Added enemies to level 1
shintoo
committed
Temporary solution to render bg's until parallax is finished
shintoo
committed
Two very necessary level-loading functions
shintoo
committed
Complete menus
shintoo
committed
Rename wrapper -> container
shintoo
committed
Mana bar
shintoo
committed
Enemies soon
shintoo
committed
Move menus to manager
shintoo
committed
Remove debugging messages
shintoo
committed
Added 3 more buttons
kylercn
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
kylercn
committed
Animation changes
SaddlePaddle
committed
Yay for imgur
kylercn
committed
Added height and width textures
kylercn
committed
Changes
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
SaddlePaddle
committed
old
shintoo
committed
old
shintoo
committed
new
shintoo
committed
Added new bars/frame
kylercn
committed
Menus getting there
shintoo
committed
Level editor icons for enemies
shintoo
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Updated HUD with new action and health bar
kylercn
committed
Hunting the Standing Still bug
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
SaddlePaddle
committed
old
shintoo
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Bug fix for animation
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Attacking animation fix
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Changed title
kylercn
committed
hud changes
shintoo
committed
HUD changes
kylercn
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
kylercn
committed
Princess fix?
kylercn
committed
Fixed sprites?
kylercn
committed
Try #3 on fixing sprites
kylercn
committed
Try #4
kylercn
committed
Try #5
kylercn
committed
6th time the charm?
kylercn
committed
Hopefully last fix for princess
kylercn
committed
Hopefully last fix for princess
kylercn
committed
Soldier fix
kylercn
committed
Adding parallax
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
SaddlePaddle
committed
old
shintoo
committed
old
shintoo
committed
Resized BG's and fixed soldier
kylercn
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
main.c test leveleditor
SaddlePaddle
committed
old
shintoo
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Added cancel and save buttons, enter lvl name texture
kylercn
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
Leveleditor % bugfix
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo
committed
a bunch of stuff, level editor inside the game etc
shintoo
committed
idk
shintoo
committed
LevelEditor fixes
SaddlePaddle
committed
Fix parallax
SaddlePaddle
committed

Commits on Nov 30, 2015

Commits on Dec 3, 2015

Commenting
SaddlePaddle
committed
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
SaddlePaddle
committed
More comments for the code
SaddlePaddle
committed
Comments, authors
shintoo
committed
my boy
shintoo
committed
dipesh
shintoo
committed
Longer timer
shintoo
committed
better levels
shintoo
committed

Commits on Dec 4, 2015

add license
shintoo
committed
Fix timer
shintoo
committed
Debug off
shintoo
committed
Credit for art
shintoo
committed
Authors
shintoo
committed
Stop timer from starting early
shintoo
committed
pedantic
shintoo
committed
Final comments, also sean stop insulting me with comments pls
SaddlePaddle
committed
comments
SaddlePaddle
committed

Commits on Dec 20, 2015

screenshots added
shintoo
committed

Commits on Feb 6, 2016

I fixed enemies
SaddlePaddle
committed

Commits on May 25, 2016

Update README.md
Satya Patel
committed
Update README.md
Satya Patel
committed