1452 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
John	0718b91ed4	Add the new shops and NPCs for the street	2015-08-07 23:54:53 +03:00
John	56c9f71296	Yet another fix..	2015-08-07 23:32:10 +03:00
John	d696338f5d	Color shop crash fix	2015-08-07 23:27:54 +03:00
Alexander	d93a8e5e60	Merge remote-tracking branch 'origin/master' into feature/deployment	2015-08-07 16:13:37 -04:00
John	4a0ac70835	Preferred district	2015-08-07 17:36:58 +03:00
John	e31d7fae8e	NPC Tuple magic word	2015-08-07 13:02:07 +03:00
Ryan Lewis	21c051ce42	Merge branch 'features/ttn' into 'master' ... Features/ttn It's ready <3 See merge request !1	2015-08-06 15:24:32 -04:00
John	68b8b047a5	Grammar fixes, settings.json beautify, crash fixes, GC fixes (still breaks though with #f), and gag selection fix	2015-08-06 14:55:00 +03:00
John	3093813f06	Holocaust minimum laff for elevators	2015-08-06 12:29:26 +03:00
Alexander	b6d88c96d4	Fix missing fonts	2015-08-05 16:11:42 -04:00
Alexander	b5c75adc24	Made a mistake.	2015-08-05 15:43:28 -04:00
Alexander	ad206df3e9	Add some more things needed for deployment.	2015-08-05 15:41:39 -04:00
Alexander	06a4913f29	Update libpandadna.so to latest 1.10 support.	2015-08-05 13:34:23 -04:00
John	c00680154d	Falling asleep fix	2015-08-05 13:54:18 +03:00
John	7ad94d8034	Holocaust Talkative Tyler	2015-08-05 13:44:56 +03:00
John	57cb06e3fa	Migrate color after manual change	2015-08-05 13:30:52 +03:00
John	567c556ebc	No TV looping	2015-08-05 11:38:49 +03:00
John	ead19d7c63	Another fix	2015-08-05 11:05:01 +03:00
Alexander	00e3650737	Replace self.shard with the correct districtId.	2015-08-05 04:02:12 -04:00
Alexander	5c776d6cc8	Fix a mistake I made.	2015-08-05 03:55:11 -04:00
Alexander	2e6cc13c56	Add the resources as a submodule for deployment.	2015-08-05 03:46:11 -04:00
John	c609a44980	Shuffle button fix	2015-08-04 23:17:48 +03:00
John	b036e788e8	Cut down on colors	2015-08-04 22:11:43 +03:00
John	859eba5e10	Fix Glove NPC.. I promise	2015-08-04 22:08:38 +03:00
John	ed9c41bbf4	Glove NPC	2015-08-04 22:00:20 +03:00
John	8acb336dae	Actual color picker	2015-08-04 21:57:39 +03:00
John	86223ef6df	Take that colorful coons!	2015-08-04 19:59:47 +03:00
John	edb6fa9d40	Broken af	2015-08-04 19:33:25 +03:00
John	3ff51a9b14	Holocausted Laughing Man	2015-08-04 16:26:11 +03:00
John	1f4783607d	Color gender equality	2015-08-04 14:46:02 +03:00
John	a4c9d2957c	Gag popup on hover	2015-08-04 03:18:12 +03:00
John	1b6c2c0176	Buster's pitched cog fall apart sound	2015-08-03 17:31:13 +03:00
John	e0e2c27681	Added a few NPCs to the new street - the NameMe ones are missing	2015-08-03 15:49:36 +03:00
John	a5b7293a35	Fix emote access	2015-08-03 03:53:39 +03:00
John	ba586faa6f	Improved TV with "remote"	2015-08-03 03:25:37 +03:00
John	323d181e6f	Text to speech	2015-08-03 02:48:36 +03:00
John	61a703e04d	Initial work on new street	2015-08-03 02:48:08 +03:00
John	ab5ae94e17	Add teleport transition toggle button	2015-08-01 23:19:18 +03:00
John	5fb794cf41	Andrew's rename	2015-08-01 22:06:44 +03:00
John	5441e4ce0d	Added back teleport animation	2015-08-01 21:56:42 +03:00
John	6dd6ad8951	Potential fix for laff meter overlapping	2015-08-01 21:41:53 +03:00
John	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	2015-08-01 21:13:36 +03:00
John	1c5a9ebbbe	WTF	2015-08-01 19:14:50 +03:00
John	d4557e69fa	Group Manager	2015-08-01 17:08:37 +03:00
Loudrob	e3c34e4fe8	Top Toons Bool	2015-08-01 10:01:28 -04:00
John	e78d84f9e4	Merits are not in the random unite list anymore	2015-08-01 02:45:37 +03:00
John	067667c019	Holocaust Cog HQ clerks	2015-08-01 02:43:28 +03:00
John	f1f38cdae8	Holocaust admin nametags + do Loudrob's pro stuff	2015-08-01 02:37:41 +03:00
John	2687adb691	Hot fix	2015-07-31 21:17:41 +03:00
John	395130b72f	New phrases	2015-07-31 20:30:54 +03:00