Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
274 commits
Select commit Hold shift + click to select a range
86f457e
Polished HUD
shintoo Nov 19, 2015
0abfe54
A little more descriptive.
shintoo Nov 19, 2015
dbd1045
Update
shintoo Nov 19, 2015
c666cd9
Smaller headers
shintoo Nov 19, 2015
633ba32
Cleaned up some code and added comments
Nov 19, 2015
cf09017
World and game beginnings
shintoo Nov 20, 2015
814ca61
Changes to level editor and bug fixes
Nov 20, 2015
eaaa148
Merge branch 'master' of https://github.com/BillingEmail/DrawBlade
Nov 20, 2015
8c02749
Setting up for writing leveleditor
Nov 20, 2015
4c9faa5
Added mouse and work on leveleditor
Nov 20, 2015
5341dfd
World and stuff
shintoo Nov 20, 2015
aa54c9f
help
shintoo Nov 20, 2015
d49d426
Fix weird commit issue
shintoo Nov 20, 2015
a6466a6
Fix commit issues
shintoo Nov 21, 2015
75b91cb
Yeah, comments
kylercn Nov 21, 2015
808e6f4
Merge branch 'master' of https://github.com/BillingEmail/Platformer
kylercn Nov 21, 2015
28a213a
rename
shintoo Nov 21, 2015
dce5ba0
And one overly done pencil screen added
kylercn Nov 21, 2015
4784fe0
Merge branch 'master' of https://github.com/BillingEmail/Platformer
kylercn Nov 21, 2015
f02ba38
Spelling
shintoo Nov 21, 2015
dcf2b79
Start screen
shintoo Nov 21, 2015
0cc85e0
More commenting
shintoo Nov 21, 2015
60432b4
Placeholder textures
shintoo Nov 21, 2015
4604523
Finishing Touches to LevelEditor
Nov 21, 2015
d0def58
Woops, had to change main
Nov 21, 2015
20d0d85
Renaming
shintoo Nov 21, 2015
f32355c
Completed mainmenu, will add assets in a bit
kylercn Nov 21, 2015
052e9d0
Removed startscreen
kylercn Nov 21, 2015
77c2767
Now with enum
kylercn Nov 21, 2015
28be241
Debugging level editor still
shintoo Nov 21, 2015
3774f0f
old
shintoo Nov 21, 2015
42545f4
old
shintoo Nov 21, 2015
7a4b1f3
Some incomplete assets added
kylercn Nov 21, 2015
1ac1da8
Error Cleaning for LevelEditor
Nov 21, 2015
7c7808e
Merge branch 'master' of https://github.com/BillingEmail/DrawBlade
Nov 21, 2015
d8fe665
Level editor minor fixes, test level
shintoo Nov 22, 2015
66bed48
Edit New or Load Message
Nov 22, 2015
09fb3f0
Some Changes
Nov 22, 2015
e6eec87
srry
Nov 22, 2015
0ee8d3d
Satya why
shintoo Nov 22, 2015
92412c4
stop
shintoo Nov 22, 2015
b3dddac
LevelEditor and Assets Changes
Nov 22, 2015
88b9547
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 22, 2015
2037a43
Adding Assets
Nov 22, 2015
a55e19d
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 22, 2015
6816f41
Fix loading
shintoo Nov 22, 2015
06ee11f
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 22, 2015
7265b9c
Restructured HUD
shintoo Nov 22, 2015
7d19253
Fixed main menu
shintoo Nov 22, 2015
2608de0
HUD and loading world from game
shintoo Nov 22, 2015
f171b1f
Neater struct
shintoo Nov 22, 2015
e72ab49
No weapon
shintoo Nov 22, 2015
33d01c2
Load world from level, render world
shintoo Nov 22, 2015
c1932b9
Main Menu functionality
shintoo Nov 22, 2015
12737ac
Rename wrapper -> container
shintoo Nov 22, 2015
8ec971f
Rename w -> container, no weapon/behavior
shintoo Nov 22, 2015
e383fc7
Editor Style Changes
Nov 22, 2015
e56b93a
woops
Nov 22, 2015
0f3d91d
Changes for if bounds < Screen size
Nov 22, 2015
8d6c374
Fix centering levels smaller than screen size
shintoo Nov 22, 2015
0644697
Full completion of code for level editor
Nov 23, 2015
3435770
LevelEditor touches
Nov 23, 2015
e2738f0
Fix commit errors
shintoo Nov 23, 2015
a328329
Cleaner eraser
shintoo Nov 23, 2015
a762089
changes and comments
Nov 23, 2015
86fa757
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
Nov 23, 2015
a0838d7
Fixes to everything
shintoo Nov 23, 2015
acbc131
Main Menu test
shintoo Nov 23, 2015
e023e29
Testing
shintoo Nov 23, 2015
829f007
Move TILE_SCALE to allow access in world
shintoo Nov 24, 2015
d8a224b
Rendering overhaul WIP
shintoo Nov 25, 2015
c8b3a40
Bug fixes to be tested
Nov 25, 2015
9ff27fe
Back to back
shintoo Nov 25, 2015
30639b3
Level switch on n, animation WIP
shintoo Nov 25, 2015
4780d4b
Extra images
shintoo Nov 25, 2015
b92b178
Fixing animation
Nov 25, 2015
fc0a230
IDK IF I FIXED IT
Nov 25, 2015
b439b16
Reorganizing assets, HUD WIP
shintoo Nov 25, 2015
b660959
First menu_rework commit
shintoo Nov 25, 2015
5a200bb
Up and running
shintoo Nov 25, 2015
79811d8
New menu system
shintoo Nov 25, 2015
d4edb3b
remove debugging message
shintoo Nov 25, 2015
3e22d55
New fluid menu system and switcher, loading custom levels from menu WIP
shintoo Nov 26, 2015
165207c
Textbox WIP
shintoo Nov 26, 2015
8eaf12f
N to swap levels again
shintoo Nov 26, 2015
c296cd2
More changes
Nov 27, 2015
0d29919
font stuff
shintoo Nov 27, 2015
732921a
brick stuff still
shintoo Nov 27, 2015
38221aa
Bug fixes to bricks
Nov 27, 2015
be564e0
New player images
shintoo Nov 27, 2015
a3ed527
Currect bricks in game
shintoo Nov 27, 2015
860e3ec
Player fix test
Nov 27, 2015
2bb67c8
Working in game bricks
shintoo Nov 27, 2015
fa680f1
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 27, 2015
114b10f
Try this
Nov 27, 2015
7c94ef3
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 27, 2015
d077e05
fix it satya
shintoo Nov 27, 2015
ea0166a
Jumping pls
shintoo Nov 27, 2015
c401ce5
Remove outdated tests
shintoo Nov 27, 2015
09f08b2
Fix
Nov 27, 2015
e98bf3a
Brick fixes in game, textbox functionality
shintoo Nov 28, 2015
102a281
Assets
shintoo Nov 28, 2015
3642fa9
New and improved textbox, more comments
shintoo Nov 28, 2015
99b84a9
Add transparency
shintoo Nov 28, 2015
59ac032
Bold font
shintoo Nov 28, 2015
609dec6
New demo level1
shintoo Nov 28, 2015
0b63b1d
Slight adjustments
shintoo Nov 28, 2015
71be910
Finishing touches to player animation
Nov 28, 2015
9b86603
Player bug fixes
Nov 28, 2015
1072ec9
Fixes
Nov 28, 2015
9afb321
Fixes to animation
Nov 28, 2015
f0e4732
old
shintoo Nov 28, 2015
3c5bf5c
satya
shintoo Nov 28, 2015
6f1cd3e
oh lord
shintoo Nov 28, 2015
1d43b7a
Polished menu done
shintoo Nov 28, 2015
8c04a29
assets, menus, font, etc
shintoo Nov 28, 2015
beee957
Beginning changes to leveleditor
Nov 28, 2015
48b0c1b
Updated lava and ice img assets
kylercn Nov 28, 2015
2ac9bf5
Updated Medieval img and added its boss
kylercn Nov 28, 2015
f922729
Updated spooky img and added its boss
kylercn Nov 28, 2015
4cbb43a
Added display capabilities of mana for HUD
kylercn Nov 28, 2015
9657ee4
Added img assets for action
kylercn Nov 28, 2015
16652fb
old
shintoo Nov 29, 2015
e622ca8
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
0d72174
No executable please, my goodness
shintoo Nov 29, 2015
46f4afc
Added enemies to level 1
shintoo Nov 29, 2015
7d0d68b
Temporary solution to render bg's until parallax is finished
shintoo Nov 29, 2015
f80acb8
Two very necessary level-loading functions
shintoo Nov 29, 2015
2d95504
Complete menus
shintoo Nov 29, 2015
b55ba56
Rename wrapper -> container
shintoo Nov 29, 2015
e3fa583
Mana bar
shintoo Nov 29, 2015
67e0b21
Enemies soon
shintoo Nov 29, 2015
8640244
Move menus to manager
shintoo Nov 29, 2015
71f16f1
Remove debugging messages
shintoo Nov 29, 2015
86cef9f
Added 3 more buttons
kylercn Nov 29, 2015
2685a5a
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
kylercn Nov 29, 2015
59a7e0a
Animation changes
Nov 29, 2015
d6aa186
Yay for imgur
kylercn Nov 29, 2015
7d05819
Added height and width textures
kylercn Nov 29, 2015
0998efb
Changes
Nov 29, 2015
4f4f813
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
Nov 29, 2015
3f303cb
old
shintoo Nov 29, 2015
8e02817
old
shintoo Nov 29, 2015
30f54d2
new
shintoo Nov 29, 2015
baf630d
Added new bars/frame
kylercn Nov 29, 2015
51e94b8
Menus getting there
shintoo Nov 29, 2015
896f505
Level editor icons for enemies
shintoo Nov 29, 2015
dd8a818
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
cf9011d
Updated HUD with new action and health bar
kylercn Nov 29, 2015
a5c2af7
Hunting the Standing Still bug
Nov 29, 2015
afbd8cb
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
Nov 29, 2015
5758590
old
shintoo Nov 29, 2015
8d21e51
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
e38afe0
Bug fix for animation
Nov 29, 2015
88ba2ce
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
d257b4c
Attacking animation fix
Nov 29, 2015
f3694e9
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
46c7840
Changed title
kylercn Nov 29, 2015
6490b41
hud changes
shintoo Nov 29, 2015
b6542f8
HUD changes
kylercn Nov 29, 2015
8c69d3c
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
kylercn Nov 29, 2015
40bce7d
Princess fix?
kylercn Nov 29, 2015
ce0a9a1
Fixed sprites?
kylercn Nov 29, 2015
ccf91c3
Try #3 on fixing sprites
kylercn Nov 29, 2015
a02757a
Try #4
kylercn Nov 29, 2015
e5be8e7
Try #5
kylercn Nov 29, 2015
ab09ae7
6th time the charm?
kylercn Nov 29, 2015
13022a1
Hopefully last fix for princess
kylercn Nov 29, 2015
8e0f8d2
Hopefully last fix for princess
kylercn Nov 29, 2015
6c607ce
Soldier fix
kylercn Nov 29, 2015
a701a80
Adding parallax
Nov 29, 2015
bd6bead
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
Nov 29, 2015
529be3c
old
shintoo Nov 29, 2015
98e24fe
old
shintoo Nov 29, 2015
9c893c5
Resized BG's and fixed soldier
kylercn Nov 29, 2015
663704c
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
723b25d
main.c test leveleditor
Nov 29, 2015
6a5d638
old
shintoo Nov 29, 2015
8f819a1
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
a15790a
Added cancel and save buttons, enter lvl name texture
kylercn Nov 29, 2015
ab7729a
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
aee6eac
Leveleditor % bugfix
Nov 29, 2015
654f6b7
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
Nov 29, 2015
282aa9d
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 29, 2015
05a24cf
a bunch of stuff, level editor inside the game etc
shintoo Nov 29, 2015
8db0921
idk
shintoo Nov 29, 2015
ad924d9
LevelEditor fixes
Nov 29, 2015
964b509
Fix parallax
Nov 29, 2015
b15646b
wb not rb
shintoo Nov 30, 2015
e1dac37
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 30, 2015
295e8ac
pls
Nov 30, 2015
70dc7d6
l
Nov 30, 2015
acc7451
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 30, 2015
2934ffd
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 30, 2015
b08b421
Added the sword:
kylercn Nov 30, 2015
cc34307
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
kylercn Nov 30, 2015
88d893f
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 30, 2015
75d79bf
Removed spooky from medieval
kylercn Nov 30, 2015
a472324
Did the X2 in actionbar
kylercn Nov 30, 2015
3528548
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
shintoo Nov 30, 2015
2252cb4
no click-throughs
shintoo Nov 30, 2015
0882d3d
Idk what this is
shintoo Nov 30, 2015
ed80480
Updated the goblins (hopefully fixing some issues) and added arrow
kylercn Nov 30, 2015
d5e396f
Darkened spooky bricks
kylercn Nov 30, 2015
2543eda
Added do better and retry
kylercn Nov 30, 2015
04a0fe2
Added smoke puff
kylercn Nov 30, 2015
cdd9d91
Added a text file with info
kylercn Nov 30, 2015
f88f69f
Changes
shintoo Nov 30, 2015
1aaf533
gift for satya
shintoo Nov 30, 2015
3454875
i hate this
shintoo Nov 30, 2015
8afabde
GPLv3
shintoo Nov 30, 2015
20dacc6
No parallax
shintoo Nov 30, 2015
d163d21
Small test
shintoo Nov 30, 2015
f5afa0c
Set up to write behaviors
shintoo Nov 30, 2015
6ec89c2
Neater menus
shintoo Nov 30, 2015
8256a56
Debug messages
shintoo Nov 30, 2015
ea4f329
You wouldn't sizeof a char
shintoo Nov 30, 2015
c64defa
Installation instructions
shintoo Nov 30, 2015
11dcb84
no makefile fo LE
shintoo Nov 30, 2015
fb8d491
No enemies
shintoo Nov 30, 2015
7fa3f73
now a running game thank to our incompetence
shintoo Nov 30, 2015
74ee374
Getting there
shintoo Dec 1, 2015
ab1c6e2
To main menu on all adventure levels cleared
shintoo Dec 1, 2015
059b061
Update
shintoo Dec 1, 2015
1cea2ab
Fix sizing issue
shintoo Dec 1, 2015
a493ffb
initialize timer
shintoo Dec 1, 2015
0032dc2
return to main menu if level not found
shintoo Dec 1, 2015
1ce6f9e
timer try
shintoo Dec 1, 2015
fbdb9c0
more levels
shintoo Dec 1, 2015
3c11539
Commenting
Dec 3, 2015
a23d076
Merge branch 'master' of https://github.com/BillingEmail/Drawblade
Dec 3, 2015
8194ae7
More comments for the code
Dec 3, 2015
1fce33b
Comments, authors
shintoo Dec 3, 2015
610f9c5
my boy
shintoo Dec 3, 2015
2378b18
dipesh
shintoo Dec 3, 2015
2883209
Longer timer
shintoo Dec 3, 2015
f8a8d14
better levels
shintoo Dec 3, 2015
8d5b25a
add license
shintoo Dec 4, 2015
6ff5eac
Fix timer
shintoo Dec 4, 2015
752dd1a
Debug off
shintoo Dec 4, 2015
5f1a39d
Credit for art
shintoo Dec 4, 2015
88ee85d
Authors
shintoo Dec 4, 2015
b055f4c
Stop timer from starting early
shintoo Dec 4, 2015
fde83e1
pedantic
shintoo Dec 4, 2015
e10b4ed
Final comments, also sean stop insulting me with comments pls
Dec 4, 2015
1896d16
comments
Dec 4, 2015
2dbcdbb
screenshots added
shintoo Dec 20, 2015
7d45f67
I fixed enemies
Feb 6, 2016
9103442
Update README.md
May 25, 2016
5e42e26
Update README.md
May 25, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Copyright (c) 2015 Sean Rapp, Satyel Patel, Kyle Condon

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

58 changes: 58 additions & 0 deletions LevelEditor/include/leveleditor.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/* leveleditor.h - Everything to do with the level editor.
*
* Author: Satya Patel
*/

#ifndef LEVELEDITOR_H
#define LEVELEDITOR_H

#include "../../shared/include/level.h"
#include "../../shared/include/texture.h"
#include "../../shared/include/container.h"
#include <stdbool.h>

/* All of the components of a leveleditor */
typedef struct _LevelEditor {
Container *container;
Level *level;
Texture *textureArray[4][7];
Texture *backgroundArray[4][2];
Texture *blankIcon;
int currentItem;
Renderpos FirstBkgRP[3];
} LevelEditor;

/*
All of the functions for editing a level are within this
It is broken into making a new leveleditor, running it,
and destroying it
*/
void Level_Edit(Level *level, Container *container);


/* Creates a new LevelEditor struct and fills it */
LevelEditor *New_LevelEditor(Level *level, Container *container);

/* Destroys a LevelEditor struct */
void LevelEditor_End(LevelEditor *editor);

/* This has functions for rendering and updating a level */
void LevelEditor_Run(LevelEditor *editor);

/* Components of Run */
void LevelEditor_Render(LevelEditor *editor);

/* Components of Render (Brick Rendering) */
void LevelEditor_RenderBricks(LevelEditor *editor, int i, int j);
void Texture_RenderBrick(Texture *t, SDL_Renderer *r, int x, int y, SDL_Rect *Camera, BrickChoice b);

void LevelEditor_Update(LevelEditor *editor);

/* Components of Update */
void LevelEditor_AdjustBackground(LevelEditor *editor, int xdiff, int ydiff);
void LevelEditor_AssertCameraBounds(LevelEditor *editor);
bool LevelEditor_checkEditTile(LevelEditor *editor);
void LevelEditor_getCurrentTheme(LevelEditor *editor);
void LevelEditor_getCurrentItemType(LevelEditor *editor);

#endif
Loading