aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.cpp
AgeCommit message (Collapse)Author
2015-09-16Fixed ConflictsAndy Belle-Isle
Had to remove -Wextra because it didn't allow for int argc, char** argv and SDL requires those in the main function. Also removed glActiveTexture() because it wasn't declared, currently everything works fine without it, but I'll find a way to fix it soon, but for now it works.
2015-09-16hiAndy Belle-Isle
2015-09-16Fixed mouse, and debugAndy Belle-Isle
2015-09-16shitty bug fixesClyne Sullivan
2015-09-16shitty bug fixesClyne Sullivan
2015-09-15Fixed timestep, added AA and a mouse cursorAndy Belle-Isle
2015-09-15mouseClyne Sullivan
2015-09-14fps stuffClyne Sullivan
2015-09-14Added mouse support, and debugAndy Belle-Isle
Added FPS display and deltaTime display
2015-09-14cheap-excuse jump fixClyne Sullivan
2015-09-14fixesClyne Sullivan
2015-09-14FIXED TIMINGgit statusgit status oh yeah and jumpingClyne Sullivan
2015-09-14millis stuffClyne Sullivan
2015-09-14Added NPC StuffAndy Belle-Isle
Added Wandering, and variable spawning amounts
2015-09-130.2?Clyne Sullivan
2015-09-13added text using freetype2Clyne Sullivan
2015-09-13fixed jumpingClyne Sullivan
2015-09-12stuffClyne Sullivan
2015-09-12fixed layer jumpClyne Sullivan
2015-09-12yayClyne Sullivan
2015-09-12Updated village spawning with fixes to other thingsAndy Belle-Isle
2015-09-12jumpClyne Sullivan
2015-09-12ortho stuffClyne Sullivan
2015-09-12uhClyne Sullivan
2015-09-12entity-world bindingClyne Sullivan
2015-09-12Real layered worlds n stuffClyne Sullivan
2015-09-12fexidClyne Sullivan
2015-09-12Fixed movement and did a SUPER BETA version of NPC'sAndy Belle-Isle
As much as I didn't want to, I had to get rid of SDL_AddTimer. Since it runs in a separate thread and does calculations at the same time as the main thread, a bunch of the data was getting messed up during the loop, so it was just easiest to remove it. (Just refresh the world a lot to see a village house spawn)
2015-09-11improved layersClyne Sullivan
2015-09-11basic layered worlds :)Clyne Sullivan
2015-09-11fixed main.cppClyne Sullivan
2015-09-11good mergeClyne Sullivan
2015-09-10world savingClyne Sullivan
2015-09-10more betterClyne Sullivan
2015-09-10improved world travelingClyne Sullivan
2015-09-10more fixes :)Clyne Sullivan
2015-09-10fixedClyne Sullivan
2015-09-10added linked worldsClyne Sullivan
2015-09-10Merge remote-tracking branch 'origin/master'Andy Belle-Isle
d Conflicts: include/World.h include/common.h include/entities.h src/UIClass.cpp src/World.cpp src/entities.cpp src/main.cpp
2015-09-10aAndy Belle-Isle
2015-09-10yeahClyne Sullivan
2015-09-09world genClyne Sullivan
2015-09-09mhmClyne Sullivan
2015-09-08Init'd SDL_imageClyne Sullivan
2015-09-08exit on errorClyne Sullivan
2015-09-08Updated stuff to fix borkAndy Belle-Isle
2015-09-07HeyClyne Sullivan
2015-09-07Added New Header File and UI ClassAndy Belle-Isle
Added UI Class for controlling the UI of course :P Added gameHeader.h for variables that are accessed by multiple files/classes
2015-09-07esc to quitClyne Sullivan
2015-09-07fixed glClearClyne Sullivan