Submitting Interactive programming project - #22

Open

IanOlin wants to merge 101 commits into

sd16spring:masterfrom

Commits on Mar 3, 2016

Initializing a shell for the game
Ian Paul
committed
ba28c8f
updated readme
Ian Paul
committed
db377d3
added a pic and made it bg
Ian Paul
committed
bf694b1

Commits on Mar 4, 2016

got screen sizing to work
Ian Paul
committed
c0146cd
Implemented a character model and got the controller to move it unrestricted
Ian Paul
committed
2e36670

Commits on Mar 6, 2016

Moved the images into their own folder
Ian Paul
committed
bf50554
updated readme and tidied up some of the naming scheme
IanOlin
committed
07921d1
Add a jank sprite for character model facing a different direction. Also added a sprite sheet to trim for all of the animations.
IanOlin
committed
1e801bd
resized
IanOlin
committed
cedde5f
commented out transforms, now the game is scaled correctly
Ian Paul
committed
01b78c5
character now moonwalks vertically.
Ian Paul
committed
a3d90ad
Added todo
Ian Paul
committed
06661bd
splite the spritesheet into 12 separate images for animation purposes
IanOlin
committed
0acde72
Added animation to the right. Need to find a way to buffer multiple inputs before resolving them. also need to find a good distance to move during animation.
Ian Paul
committed
1c51200
Renamed a bunch of files to be more intuitive
Ian Paul
committed
70f5dcc
Cleaned up the code. Updated documentation. Should be more readable now.
Ian Paul
committed
d658c3a
Added our todolist to the README.md
IanOlin
committed
6ac5d38

Commits on Mar 7, 2016

The game now runs using sprites.
Ian Paul
committed
15efa8a
fixed transparency
Ian Paul
committed
20f2049
moving is now broken
Ian Paul
committed
90edfd3
Game works but sprites are a little off. U, D,L are all to the left, R is below
Ian Paul
committed
982b6c8
fixed animation a little bit
Ian Paul
committed
ea326ba
tuned animation to be level and smooth
Ian Paul
committed
91654d9
updated Readme
Ian Paul
committed
d5fef9f
Added a soundtrack and a step sound (should only play in down direction)
Ian Paul
committed
e875faf
moved sounds to their own directories
Ian Paul
committed
2ab3dd3
updated readme
Ian Paul
committed
68cc91c
Added a couple more barely usable room images
IanOlin
committed
183a21c
sounds
Ian Paul
committed
7fc7c51
no changes made, just cleaning the git
Ian Paul
committed
1f43284
added some docs for taylor
Ian Paul
committed
5a8f1be

Commits on Mar 9, 2016

Commits on Mar 10, 2016

Fixed colisions, now the model stays with the hitbox.
Ian Paul
committed
f5748c5
Working on removing excess code from the main file
Ian Paul
committed
387636b
tinkering
Ian Paul
committed
939525d
tinkering
Ian Paul
committed
e68859b
tinkering
Ian Paul
committed
ae851d2
tinkering
Ian Paul
committed
7d45833
tinkering
Ian Paul
committed
120cd7f
tinkering
Ian Paul
committed
6ca55d2
tinkering
Ian Paul
committed
c794514
Tinkering
Ian Paul
committed
37a0001
Merge branch 'modular'
Ian Paul
committed
6fd7705
Merged in modular
Ian Paul
committed
e286421
git ignore
Ian Paul
committed
969c5f8
Merged in modular
Ian Paul
committed
83440d2
Added a git ignore and cleaned up some dead files
Ian Paul
committed
9efff2a
modularization
Ian Paul
committed
0bd9e0b
modularized the player. Now takes walls as an additional parameter. This is potentially bad because walls in mutable. We need to reinitialize the character for every screen
Ian Paul
committed
6f47fea
updated readme for the final report
Ian Paul
committed
083873e
fized the bed
Ian Paul
committed
23d87e4
added some references for room generation to the Readme
IanOlin
committed
4413e13
cleanup
Halliax
committed
95647ce
made a function
IanOlin
committed
07324c6
Merge branch 'levels' of github.com:IanOlin/InteractiveProgramming into levels
Ian Paul
committed
c4f9243
Made a random level string generator at MVP state.
Ian Paul
committed
e9bfddb
Added a whole bunch of tileset shit to the rooms folder
Halliax
committed
54a8851
broked as fuck
Ian Paul
committed
d091147
Made room changing sort of work
Halliax
committed
018ef57
got a creepy-ass picture, wrong dimensions
Halliax
committed
8024f3b
image changes
IanOlin
committed
ccbd2db
removed some images
IanOlin
committed
5afe427
Merge branch 'master' of github.com:IanOlin/InteractiveProgramming into levels
IanOlin
committed
90a6b68
made a 'tileset'
IanOlin
committed
2386acf
made some progress on displaying a tileset for levels
Ian Paul
committed
080bb31
struggle
Ian Paul
committed
1d239a8
struggleing
IanOlin
committed
4cd7289
somethings it works
Ian Paul
committed
c3d7ff2
heres some of the writeup
Halliax
committed
abcfc64
Merge branch 'levels' of https://github.com/IanOlin/InteractiveProgramming into levels
Halliax
committed
edf6e82
'finished' the doc
Ian Paul
committed
dadac39
added tilesets, made room gen work sort of
Halliax
committed
0346a96
Merge branch 'levels' of https://github.com/IanOlin/InteractiveProgramming into levels
Halliax
committed
6e47628
updated essay
Ian Paul
committed
9eb9e23
asd
Ian Paul
committed
575a5df
gixed git
Ian Paul
committed
04ea59a
implemented doors and floors and a random tileset for all of them
Ian Paul
committed
19471aa
Made the hitboxes work for all doors, made spawning happen near bed, made you ender a room near a wall.
Ian Paul
committed
3e781fb
writeup just needs screenshots, one included
Halliax
committed
9dbc24e
cleanup
Halliax
committed
9a033f8
added ending
Ian Paul
committed
a39b709
modified a bunch of shit also added creepy sound
Halliax
committed
8f69f78
creeps
Ian Paul
committed
b469bba
got creepy shit to work correctly also 9 does the thing
Halliax
committed
22f00a3
added uml
Ian Paul
committed
1a8c42f
Added controls to readme
Halliax
committed
2a00cd9
another little readme edit, attributed more or less correctly now
Halliax
committed
1dc8edd
made the sound more sudden and terrifying
Halliax
committed
18fb99d
Merge branch 'levels' of github.com:IanOlin/InteractiveProgramming into levels
Ian Paul
committed
5fa531d
added the correct sound file, is good now
Halliax
committed
a915c8c
Added documentation and cleaned up old code
Ian Paul
committed
7c723fe
updated readme slightly
Ian Paul
committed
bf1fccc
added screenshots of the game
Ian Paul
committed
99418c5
pdf-ed the write up
IanOlin
committed
725a078
fixed the doors, made them gradually decrease in frequency, removed door generation in corners, etc etc
Halliax
committed
b907751
resolved conflicts and merged features
Ian Paul
committed
521a8b3
HTML now contains a webpage documenting all of the code, with what I beleive counts as UML
Ian Paul
committed
6051079
in-class changes; no weird walls/collisions in game start after reset, fullscreen jump scare, balcony no longer ends the game
Halliax
committed
fbc29f8

Commits on Apr 19, 2016

Implemented direcitonal continuity, added a bunch of comments and organized some stuff better. Collision bugs maybe sort of fixed?
Halliax
committed
415d664