Commit graph

  • 412bd7526f Merge branch 'master' into feature/deployment Alexander 2015-08-13 18:51:53 -0400
  • 0368de40e3 Update libpandanda. Alexander 2015-08-13 18:51:27 -0400
  • 1e8045172b Add submodule and upload the deployment files. Alexander 2015-08-13 18:38:01 -0400
  • 1ea800b4bd Merge branch 'features/dan' into 'master' Alexander Behrhof 2015-08-13 18:20:28 -0400
  • 655d77a401 Add chat settings RPC command: untested John 2015-08-14 00:38:00 +0300
  • b8ef66621f CHAT_SETTINGS Account dc field John 2015-08-14 00:31:23 +0300
  • be54eb19df 2X merit multiplier for factories John 2015-08-13 23:39:09 +0300
  • 5f9592cdd7 Magic word crash prevention John 2015-08-13 23:06:19 +0300
  • ecc33e1c3d some more mongo stuff (sorry that i pushed it here :() Loudrob 2015-08-13 16:00:50 -0400
  • ae3a7e7dc5 Nerf fish rarity properly John 2015-08-13 22:42:29 +0300
  • a3822b5099 Proper resistance toon DNAs + scarecrow fix in CFO battle John 2015-08-13 15:41:18 +0300
  • fc0a24904c Tutorial chat bubble click fix + arrows fix John 2015-08-13 14:47:51 +0300
  • 1d1e96d055 Fix cast member crash John 2015-08-13 14:03:08 +0300
  • 0976a80bef Carry 3 TNTs and 7 trapdoors John 2015-08-13 13:58:38 +0300
  • dc83a72cc4 Widescreen whisper frame John 2015-08-13 13:54:13 +0300
  • 3880d7e032 NPCToons cleanup John 2015-08-13 13:23:57 +0300
  • 6bdc129b67 Organic gag display in the battle GUI and better ~trackBonus command John 2015-08-13 03:55:51 +0300
  • 3d5a138a68 SOS friends are now sorted by rarity John 2015-08-13 03:19:58 +0300
  • b155962dca Fix a bug with the teleport button John 2015-08-12 22:46:34 +0300
  • 2098275dfa Cog HQ teleport crash fix John 2015-08-12 22:03:58 +0300
  • 9299357345 Color picker fixes John 2015-08-12 21:49:51 +0300
  • 0489a156a3 Color drag John 2015-08-12 21:37:20 +0300
  • b3efea4a6d Teleport button fixed John 2015-08-12 20:17:34 +0300
  • 7a8552c10e More fixes John 2015-08-12 19:14:40 +0300
  • 19608959c5 Tutorial fix John 2015-08-12 19:10:45 +0300
  • f137f3f047 Toons now stop when greeted with a warning message while trying to go into a door instead of running in 1 place John 2015-08-12 18:44:35 +0300
  • 1dcba024d5 NPC fix!! John 2015-08-12 18:37:17 +0300
  • c7011bc757 Don't send trophies on result John 2015-08-12 14:55:03 +0300
  • 41307f6a0f Revert "Another friend fix" John 2015-08-12 14:51:07 +0300
  • 156752b4a7 Another friend fix John 2015-08-12 14:45:48 +0300
  • da0366d02a TV proper loop John 2015-08-12 14:39:31 +0300
  • bacd4b365c Boarding Group messages are now clickable John 2015-08-12 14:21:39 +0300
  • 9d43264adc Friends list bug fix John 2015-08-12 14:17:43 +0300
  • e2d7b9b674 POPSICLES John 2015-08-10 16:33:28 +0300
  • 7b07c84a79 Update resources. Alexander 2015-08-10 00:48:28 -0400
  • 1d8fe20587 Refactor suit health bar John 2015-08-09 15:23:35 +0300
  • 7019d1ba9a Rewritten (no pun intended) cog panel John 2015-08-09 14:32:13 +0300
  • a2d5b004c9 Holocaust fire cost John 2015-08-09 13:41:30 +0300
  • 1d4caa84e9 Revert to old way for now. Alexander 2015-08-08 22:53:39 -0400
  • 9b1dfba315 Let's try this. Alexander 2015-08-08 22:38:16 -0400
  • 4ac30dbe52 Forgot a import. Alexander 2015-08-08 22:29:39 -0400
  • 4a12f647ee Fix game crashing now? Alexander 2015-08-08 22:24:05 -0400
  • aa99dab28d Avoid using the account-bridge on prod. Alexander 2015-08-08 22:14:29 -0400
  • f6e34fd8a5 Fix Missing 'mongodb' Alexander 2015-08-08 21:14:57 -0400
  • 59b5db96f3 Fix import of missing os Alexander 2015-08-08 20:05:53 -0400
  • d6b8f5a7ea Remove not needed server resources Alexander 2015-08-08 19:19:14 -0400
  • 6c8e93db79 Fix config, add way to update libpandadna when needed, and add modded Start scripts to not try to include a folder that doesn't exist in production. Alexander 2015-08-08 18:24:42 -0400
  • 070616b987 Update .pyd and .so to fix issue with not being able to connect. Alexander 2015-08-08 18:01:53 -0400
  • 504c178acc Update Resources, LibPandaDna (broken) and fix the missing resources on the client. Alexander 2015-08-08 10:12:50 -0400
  • 80b5e4c548 New magic word: ~secondVP - skips to second battle John 2015-08-08 13:32:48 +0300
  • ce8d856ebe Proper Fish Bingo implementation using News Manager John 2015-08-08 12:08:45 +0300
  • 0718b91ed4 Add the new shops and NPCs for the street John 2015-08-07 23:54:53 +0300
  • 56c9f71296 Yet another fix.. John 2015-08-07 23:32:10 +0300
  • d696338f5d Color shop crash fix John 2015-08-07 23:27:54 +0300
  • d93a8e5e60 Merge remote-tracking branch 'origin/master' into feature/deployment Alexander 2015-08-07 16:13:37 -0400
  • 4a0ac70835 Preferred district John 2015-08-07 17:36:58 +0300
  • e31d7fae8e NPC Tuple magic word John 2015-08-07 13:02:07 +0300
  • 21c051ce42 Merge branch 'features/ttn' into 'master' Ryan Lewis 2015-08-06 15:24:32 -0400
  • 68b8b047a5 Grammar fixes, settings.json beautify, crash fixes, GC fixes (still breaks though with #f), and gag selection fix John 2015-08-06 14:55:00 +0300
  • 3093813f06 Holocaust minimum laff for elevators John 2015-08-06 12:29:26 +0300
  • b6d88c96d4 Fix missing fonts Alexander 2015-08-05 16:11:42 -0400
  • b5c75adc24 Made a mistake. Alexander 2015-08-05 15:43:28 -0400
  • ad206df3e9 Add some more things needed for deployment. Alexander 2015-08-05 15:41:39 -0400
  • 06a4913f29 Update libpandadna.so to latest 1.10 support. Alexander 2015-08-05 13:34:23 -0400
  • c00680154d Falling asleep fix John 2015-08-05 13:54:18 +0300
  • 7ad94d8034 Holocaust Talkative Tyler John 2015-08-05 13:44:56 +0300
  • 57cb06e3fa Migrate color after manual change John 2015-08-05 13:30:52 +0300
  • 567c556ebc No TV looping John 2015-08-05 11:38:49 +0300
  • ead19d7c63 Another fix John 2015-08-05 11:05:01 +0300
  • 00e3650737 Replace self.shard with the correct districtId. Alexander 2015-08-05 04:02:12 -0400
  • 5c776d6cc8 Fix a mistake I made. Alexander 2015-08-05 03:55:11 -0400
  • 2e6cc13c56 Add the resources as a submodule for deployment. Alexander 2015-08-05 03:46:11 -0400
  • c609a44980 Shuffle button fix John 2015-08-04 23:17:48 +0300
  • b036e788e8 Cut down on colors John 2015-08-04 22:11:43 +0300
  • 859eba5e10 Fix Glove NPC.. I promise John 2015-08-04 22:08:38 +0300
  • ed9c41bbf4 Glove NPC John 2015-08-04 22:00:20 +0300
  • 8acb336dae Actual color picker John 2015-08-04 21:57:39 +0300
  • 86223ef6df Take that colorful coons! John 2015-08-04 19:59:47 +0300
  • edb6fa9d40 Broken af John 2015-08-04 19:33:25 +0300
  • 3ff51a9b14 Holocausted Laughing Man John 2015-08-04 16:26:11 +0300
  • 1f4783607d Color gender equality John 2015-08-04 14:46:02 +0300
  • a4c9d2957c Gag popup on hover John 2015-08-04 03:18:12 +0300
  • 1b6c2c0176 Buster's pitched cog fall apart sound John 2015-08-03 17:31:13 +0300
  • e0e2c27681 Added a few NPCs to the new street - the NameMe ones are missing John 2015-08-03 15:49:36 +0300
  • a5b7293a35 Fix emote access John 2015-08-03 03:53:39 +0300
  • ba586faa6f Improved TV with "remote" John 2015-08-03 03:25:37 +0300
  • 323d181e6f Text to speech John 2015-08-03 02:48:36 +0300
  • 61a703e04d Initial work on new street John 2015-08-03 02:48:08 +0300
  • ab5ae94e17 Add teleport transition toggle button John 2015-08-01 23:19:18 +0300
  • 5fb794cf41 Andrew's rename John 2015-08-01 22:06:44 +0300
  • 5441e4ce0d Added back teleport animation John 2015-08-01 21:56:42 +0300
  • 6dd6ad8951 Potential fix for laff meter overlapping John 2015-08-01 21:41:53 +0300
  • 0686115b24 ~satanGrowFlowers grows trees now, treasures are now every 30 seconds instead of 10, TTC heals 1 -> DDL heals 6, and treasures are incremented by 3 John 2015-08-01 21:13:36 +0300
  • 1c5a9ebbbe WTF John 2015-08-01 19:14:50 +0300
  • d4557e69fa Group Manager John 2015-08-01 17:08:37 +0300
  • e3c34e4fe8 Top Toons Bool Loudrob 2015-08-01 10:01:28 -0400
  • e78d84f9e4 Merits are not in the random unite list anymore John 2015-08-01 02:45:37 +0300
  • 067667c019 Holocaust Cog HQ clerks John 2015-08-01 02:43:28 +0300
  • f1f38cdae8 Holocaust admin nametags + do Loudrob's pro stuff John 2015-08-01 02:37:41 +0300
  • 2687adb691 Hot fix John 2015-07-31 21:17:41 +0300