340 commits

Author	SHA1	Message	Date
Alexander Behrhof	f7eee2c753	Merge branch 'features/dan' into 'feature/deployment' ... Features/dan See merge request !6	2015-08-19 17:10:00 -04:00
John	7053ae8676	Add teleport toggle and prevent teleportation when ignored	2015-08-17 16:21:07 +03:00
John	2e744ba51f	SOS page in detail panel	2015-08-17 15:55:43 +03:00
John	a54cbc8778	Cog hover panel in battle gui	2015-08-17 12:42:39 +03:00
John	3f12bc6500	Gag/SOS detail panel popup on battle gui	2015-08-17 11:11:38 +03:00
John	794d1298ee	Add level range to suit page	2015-08-17 01:53:29 +03:00
John	3cc83f1441	Add hover thing to suit page + fix library flickering for Intel HD graphics	2015-08-17 01:29:51 +03:00
Alexander	90fe033e08	Merge remote-tracking branch 'origin/master' into feature/deployment	2015-08-16 16:28:50 -04:00
Alexander Behrhof	029bd08e1f	Merge branch 'features/dan' into 'master' ... Features/dan See merge request !3	2015-08-16 16:19:07 -04:00
Alexander	c98510471d	Fixed the missiong Icon from the game. (Can be reverted)	2015-08-16 02:29:12 -04:00
Alexander	5018215e74	The game now allows you in, and pulled Jumble's ssl, ban, and chat changes.	2015-08-15 19:36:05 -04:00
Master Jumblespeed	6a05d84b04	merge and add	2015-08-14 18:58:37 -04:00
Master Jumblespeed	4904b8040c	chat: finalize speedchat from site	2015-08-14 18:50:30 -04:00
Alexander	e4568ef9fd	Add rest of Nirai code changes, And get the game working without compression.	2015-08-14 16:44:11 -04:00
John	2689789ab1	Clickable browser whispers + cleanup	2015-08-14 19:30:11 +03:00
John	09c412ea74	Remove glove color option from MAT	2015-08-14 17:50:02 +03:00
Alexander	ad81064fb7	Add back files from old deployment branch.	2015-08-14 02:23:24 -04:00
John	b8ef66621f	CHAT_SETTINGS Account dc field	2015-08-14 00:31:23 +03:00
John	a3822b5099	Proper resistance toon DNAs + scarecrow fix in CFO battle	2015-08-13 15:41:18 +03:00
John	0976a80bef	Carry 3 TNTs and 7 trapdoors	2015-08-13 13:58:38 +03:00
John	9299357345	Color picker fixes	2015-08-12 21:49:51 +03:00
John	b3efea4a6d	Teleport button fixed	2015-08-12 20:17:34 +03:00
John	1dcba024d5	NPC fix!!	2015-08-12 18:37:17 +03:00
Alexander	504c178acc	Update Resources, LibPandaDna (broken) and fix the missing resources on the client.	2015-08-08 10:12:50 -04:00
John	0718b91ed4	Add the new shops and NPCs for the street	2015-08-07 23:54:53 +03:00
John	4a0ac70835	Preferred district	2015-08-07 17:36:58 +03: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
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	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	3ff51a9b14	Holocausted Laughing Man	2015-08-04 16:26:11 +03:00
John	a4c9d2957c	Gag popup on hover	2015-08-04 03:18:12 +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	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	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	d4557e69fa	Group Manager	2015-08-01 17:08: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	395130b72f	New phrases	2015-07-31 20:30:54 +03:00
John	30b7ff3b20	The CFO can now jump to revive all goons	2015-07-31 20:18:56 +03:00
John	90b98ad3ef	True Friends	2015-07-31 14:45:00 +03:00
John	42f79c3957	Some cleanup	2015-07-31 01:26:06 +03:00
John	49b2422187	Chairs.. my blood went into this..	2015-07-31 01:15:21 +03:00
Loudrob	369f038b63	Revert "No XP cap" ... This reverts commit f42631b401.	2015-07-29 16:02:57 -04:00
Blurryface	260d5d1ae6	Revert "Added new colors." ... This reverts commit 1bf949cfb0.	2015-07-28 20:10:08 +02:00