From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 4 Jan 2016 02:46:03 +0000 (-0500)
Subject: shit
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=5c7c99ac5fe1158adbdf0469fb36ddd153511f5d;p=clyne%2Fgamedev.git

shit
---

5c7c99ac5fe1158adbdf0469fb36ddd153511f5d
diff --cc Changelog
index 18b918e,c0d2b9e..c14ead9
--- a/Changelog
+++ b/Changelog
@@@ -411,9 -408,6 +411,7 @@@
  	- imrpoved BGM handling
  	- continued work on particles, made a fountain
  	- added sanic
- <<<<<<< HEAD
- >>>>>>> 43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3
 +=======
  	
  	~ Broke 5000 lines of code/doc, now with some file Doxygen'd
  
@@@ -426,4 -420,43 +424,44 @@@
  	- fixed fading bugs
  	- continued fixing general game bugs
  	- fixed structure spawn issues
- >>>>>>> e67bfdde0b7e15ac6bc29993a92a89a844474554
++=======
+ 
+ 12/15/2015:
+ ===========
+ 
+ 	- began/continued work on original player sprite
+ 	- began working on dirt textures
+ 
+ 12/16/2015:
+ ===========
+ 
+ 	- added more soundtracks
+ 	- completed dirt texturizing, improved ground shading
+ 	- checking files for potential divide by 0 errors, due to random floating point errors
+ 		still have floating point errors
+ 	- restarted work on real shading (GLSL stuffs)
+ 
+ 12/17/2015:
+ ===========
+ 
+ 	- continued work on player sprite
+ 	- continued work on GLSL shaders
+ 	- fixed NPC spawning world location stuff
+ 	- messed with threads/forks
+ 	- re-fixed/added indoor environment; fixed indoor background
+ 
+ 12/18/2015:
+ ===========
+ 
+ 	- upgraded development utilities
+ 	- began working on pages, made sprite and handler
+ 	- GLSL shaders are better
+ 	- redid theme_jazz
+ 
+ 12/21/2015:
+ ===========
+ 
+ 	- fixed dialog options issues, finished basic pages
+ 	- added World::getAvailableNPC() for easy quest assigner assigning
+ 	- added the Condition class, so that events and actions can be remembered by NPCs
+ 	- added functionality for multiple lights (GLSL)
diff --cc include/common.h
index 31126d7,038bf42..5713c56
--- a/include/common.h
+++ b/include/common.h
@@@ -70,7 -70,7 +70,7 @@@ typedef struct
   * The desired width of the game window.
   */
  
--#define SCREEN_WIDTH	1024
++#define SCREEN_WIDTH	1280
  
  /**
   * The desired height of the game window.
diff --cc src/gameplay.cpp
index 70630dd,7dbe98e..5184136
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@@ -115,11 -137,7 +137,12 @@@ void initEverything(void)
  	worldSpawnHill3 = new World();
  	worldSpawnHill3->generateFunc(1000,gen_worldSpawnHill3);
  	worldSpawnHill3->setBackground(BG_FOREST);
 -	worldSpawnHill3->setBGM("assets/music/ozone.wav");
 +	worldSpawnHill3->setBGM("assets/music/embark.wav");
- 	worldSpawnHill3->addMob(MS_TRIGGER,-500,0,worldSpawnHill3_itemGet);
- 	worldSpawnHill3->addMob(MS_TRIGGER,0,0,worldSpawnHill3_itemSee);
++	//worldSpawnHill3->addMob(MS_TRIGGER,-500,0,worldSpawnHill3_itemGet);
++	//worldSpawnHill3->addMob(MS_TRIGGER,0,0,worldSpawnHill3_itemSee);
 +	worldSpawnHill3->addObject(FLASHLIGHT,false,"",-200,300);
- 	worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave);
++	//worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave);
++
  	worldSpawnHill3->addHole(800,1000);
  	
  	worldSpawnHill1->toRight = worldSpawnHill2;