first commit after a long while
Merge branch 'master' of http://github.com/jensenr30/De_Flux
yay
wow, wtf is wrong with git
wow, wtf is wrong with git
trying to fix da problemz...
fixed da problem
update
Merge branch 'inventory' of https://github.com/jensenr30/De_Flux into inventory

Conflicts:
	.gitignore
Added the guide doxc for maps and tile/item sets. Also added an idea from JP to the "ideas and plans" document.
changed "msp" to "psp". the stack pointer is for portals, so it makes sense to call it the "portal stack pointer" instead of the "map stack pointer". I have no idea what the fuck I was thinking calling it "msp".
^guid .doxc file. + enemies folder. ~reference folder
added more to the De_Flux Guide. Also changed a few minor things in the code.
proof read the "De_Flux core material.docx"

I put the finishing touches on the document.
It is now ready for consumption.

Signed-off-by: jensenr30 <jensenr30@gmail.com>
Merge branch 'inventory'

Conflicts:
	.gitignore
	bin/Debug/De_Flux.exe
	gameplay_functions.h
	globals_and_headers.h
	main.c
	obj/Debug/main.o
	tile_and_item_definitions.h
cleaned up some parts in mapmaker and added a box opening sound.
applied low-pass filter to _button_click.wav
house cleaning
made a spiral map.
^ inventory system and ^ inventory gui

i'm making serious progress with both.
:3