Commit graph

65 commits

Author SHA1 Message Date
33eecd7cc7 Updated Oversimplified.CopyObject() to allow passing options object to override any GameObject properties. 2016-04-13 23:18:29 -06:00
434d7e411e Increased price of items in short supply on islands. 2016-04-13 23:16:59 -06:00
f80775702a Screenshots from yesterday that I forgot to commit. 2016-04-13 22:15:23 -06:00
4cf021ff74 Reset base popularity to 5, just in case I don't get stat increases into the game on time. Also added a screenshot. 2016-04-13 18:06:45 -06:00
6c64da02a3 Made island economy make sense based on the inventory it generates. 2016-04-13 17:56:52 -06:00
3d90f9639d Added arrows to indicate when there are multiple pages to look through. 2016-04-13 17:32:56 -06:00
e8a43df0bc Finished Trade GUI and got trading working! There's test data in there, so this isn't ready to merge yet. 2016-04-13 16:49:32 -06:00
470bac1997 Eliminate the concept of a tradeRoom. 2016-04-13 16:48:32 -06:00
1255929124 Make words wrap nicely, but allow punctuation to wrap to next line. 2016-04-13 16:46:31 -06:00
d8cb0151d8 Replaced every instance of OS.S.pixelScale with pixel() to make life easier. 2016-04-12 18:14:09 -06:00
0825c135c1 Made some more noise 2016-04-12 18:12:41 -06:00
d45a8b6903 Made some noise 2016-04-12 17:07:22 -06:00
4cee4c49b6 Started work on Trade interaction. 2016-04-12 10:02:27 -06:00
1e2638c1f0 Little bit of work on Trade screen. 2016-04-11 22:47:01 -06:00
b4afa9c8a8 Expand all Oversimplified.R to Oversimplified.Rooms 2016-04-11 22:44:00 -06:00
4f58ea6ba4 Started work on Trade room. Found a bug with background color not changing when rooms change! 2016-04-11 18:06:06 -06:00
3208d230bf Prevent moving ship if inventory screen is open. Also resize map. 2016-04-11 17:00:27 -06:00
aac13ca552 Reset variables for presentation. 2016-04-11 16:30:39 -06:00
3816805784 Fix broken controls. 2016-04-11 16:30:15 -06:00
1f24b91a28 Built out Inventory GUI, moved some things around to where they made more sense, altered how Cargo is managed. 2016-04-11 16:22:56 -06:00
2647ebd724 Work on Inventory GUI. 2016-04-10 22:31:04 -06:00
eb82c3432c Started preparing the icons to be able to use. 2016-04-10 13:02:50 -06:00
654e71f14f Started kind of working on making a GUI for the Inventory. 2016-04-09 20:13:08 -06:00
5b5465ab97 Began trying to figure out the best way to do interactions. 2016-04-09 20:12:16 -06:00
7012f201ab My first step toward fumbling my way through adding a GUI class to OversimplifiedJS. 2016-04-09 20:11:42 -06:00
193f643c82 Added awesome contributions from Paws Screen! 2016-04-09 20:10:32 -06:00
ec2689d4c0 Unified hunger and thirst/food and water, balanced energy a bit. 2016-04-08 14:39:12 -06:00
357c25e59a Added more helpful info. 2016-04-08 13:57:19 -06:00
8c1750d188 Merge branch 'master' into gh-pages
# Conflicts:
#	index.html
2016-04-08 13:48:58 -06:00
342f1d6273 Create gh-pages branch via GitHub 2016-04-08 13:42:15 -06:00
ce19d757df Added a way to find a point in front of the ship. 2016-04-08 07:52:28 -06:00
fbfa3faa53 Added Oversimplified.GameObjectsAtPoint() to return a list of all objects overlapping with a point, altered Oversimplified.CollisionAtPoint() to use Oversimpified.GameObjectsAtPoint() to reduce code. 2016-04-08 07:33:11 -06:00
9ad26265d1 Setting up island economy functions. 2016-04-08 00:19:55 -06:00
bfcb459d74 Added energy consumption and display, updated Ship prefab to use the new Oversimplified.GameObject.SimpleMove() to stop if crashed. 2016-04-07 18:20:23 -06:00
2c25adab8b Improved Oversimplified.GameObject.SimpleMove() by allowing the user to specify what interval of pixels they want to check for collisions instead of each and every collision. 2016-04-07 18:19:30 -06:00
31a61f6808 Added Economy variables and functions. 2016-04-07 18:17:45 -06:00
052e58fb4f Fixed some island stuff (All GameObjects MUST HAVE at least 1 animation) and took a screenshot. 2016-04-07 13:19:22 -06:00
914168459c Started islands and items. 2016-04-07 12:39:11 -06:00
3719e69ba3 Added seamless transitions on the map, shrank Ocean room to allow making an in-game map. 2016-04-07 12:26:36 -06:00
8694b5412b Fixed some little things. 2016-04-07 12:24:16 -06:00
fd077aa54a Added item icons. 2016-04-06 17:50:24 -06:00
9c2e2ba64d Update font attribution. 2016-04-06 15:06:15 -06:00
f7adca5a79 Added pixel text writing to start.js and 4x4 and 5x6 alphabets. Added test to rooms/oceanRoom.js. 2016-04-06 14:52:02 -06:00
84434851a1 Made ocean faster and move randomly every 2 frames. 2016-04-06 14:49:37 -06:00
02e70bcf73 Moved Ship Stats from the Player object to Game Manager 2016-04-06 14:41:40 -06:00
beecc22cb5 Remembered the Oversimplified.GameObject.SimpleMove() function and replaced ship movement with that to help with collisions later. 2016-04-06 14:40:42 -06:00
b46fcf8d0f Restructured Oversimplified.Settings for better readability in code, added preventRightClick option defaulted to true, moved Oversimplified.SetCamera() out of the Oversimplified.Settings namespace because that just makes more sense, fixed SetCamera() references accordingly. 2016-04-06 14:36:51 -06:00
760bb5c9b1 Improved Oversimplified.Settings.SetCamera() by setting it to pass an options object instead of parameters. 2016-04-06 12:46:36 -06:00
e03607b581 Finished ocean & wave particles. Added animated screenshot. 2016-04-06 08:01:52 -06:00
f8f1c77ba2 Fixed uncapitalized reference 2016-04-06 08:00:58 -06:00