1102 commits

Author	SHA1	Message	Date
Alexander	cc19bbaebb	Kill useless code.	2015-08-16 16:31:11 -04: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
Master Jumblespeed	9ba059adc4	rpc: fix small bug with calling toons	2015-08-16 16:10:47 -04:00
Master Jumblespeed	1f21d7053f	tokens: add some token checks	2015-08-16 15:12:23 -04:00
Alexander	398ede7a85	Jumble, WHY U DELETE MY COMMITS <3	2015-08-16 14:01:39 -04:00
Master Jumblespeed	61b8cc4fd3	Merge branch 'feature/deployment' of Repo.Ez-webz.com:Stride/src into feature/deployment	2015-08-16 02:45:23 -04:00
Master Jumblespeed	c3f9e861d0	rpc: change rpc_getUserAccountId to call data from site	2015-08-16 02:44:23 -04:00
Alexander	833d9b2880	Remove debug message.	2015-08-16 02:32:13 -04:00
Alexander	c98510471d	Fixed the missiong Icon from the game. (Can be reverted)	2015-08-16 02:29:12 -04:00
Alexander	2f96488aec	Changed the way we call the mongodb so the database match up.	2015-08-16 02:28:44 -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
Loudrob	7139be634f	cashbot boss treasure	2015-08-14 19:24:08 -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	b4afca2fce	Teleport fail cooldown + whisper frame text fix	2015-08-14 19:47:48 +03: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
John	0154fb4453	Remove black, gray, white toons from the make a toon and random toon generation (Sorry, Sid Sonata!)	2015-08-14 17:43:59 +03:00
John	d686796023	Merge SnowUtil and SkyUtil into SZUtil, fix mayChange spam in log because of the map, fix the various issues with the underwater fog.	2015-08-14 17:23:45 +03:00
John	699c54b40d	DisplaySettingsDialog fix	2015-08-14 16:47:05 +03:00
Alexander	ad81064fb7	Add back files from old deployment branch.	2015-08-14 02:23:24 -04:00
John	655d77a401	Add chat settings RPC command: untested	2015-08-14 00:38:00 +03:00
John	b8ef66621f	CHAT_SETTINGS Account dc field	2015-08-14 00:31:23 +03:00
John	be54eb19df	2X merit multiplier for factories	2015-08-13 23:39:09 +03:00
Loudrob	ecc33e1c3d	some more mongo stuff (sorry that i pushed it here :()	2015-08-13 16:00:50 -04:00
John	ae3a7e7dc5	Nerf fish rarity properly	2015-08-13 22:42:29 +03:00
John	a3822b5099	Proper resistance toon DNAs + scarecrow fix in CFO battle	2015-08-13 15:41:18 +03:00
John	fc0a24904c	Tutorial chat bubble click fix + arrows fix	2015-08-13 14:47:51 +03:00
John	1d1e96d055	Fix cast member crash	2015-08-13 14:03:08 +03:00
John	0976a80bef	Carry 3 TNTs and 7 trapdoors	2015-08-13 13:58:38 +03:00
John	dc83a72cc4	Widescreen whisper frame	2015-08-13 13:54:13 +03:00
John	3880d7e032	NPCToons cleanup	2015-08-13 13:23:57 +03:00
John	6bdc129b67	Organic gag display in the battle GUI and better ~trackBonus command	2015-08-13 03:55:51 +03:00
John	3d5a138a68	SOS friends are now sorted by rarity	2015-08-13 03:19:58 +03:00
John	b155962dca	Fix a bug with the teleport button	2015-08-12 22:46:34 +03:00
John	2098275dfa	Cog HQ teleport crash fix	2015-08-12 22:03:58 +03:00
John	9299357345	Color picker fixes	2015-08-12 21:49:51 +03:00
John	0489a156a3	Color drag	2015-08-12 21:37:20 +03:00
John	b3efea4a6d	Teleport button fixed	2015-08-12 20:17:34 +03:00
John	7a8552c10e	More fixes	2015-08-12 19:14:40 +03:00
John	19608959c5	Tutorial fix	2015-08-12 19:10:45 +03:00
John	f137f3f047	Toons now stop when greeted with a warning message while trying to go into a door instead of running in 1 place	2015-08-12 18:44:35 +03:00
John	1dcba024d5	NPC fix!!	2015-08-12 18:37:17 +03:00
John	c7011bc757	Don't send trophies on result	2015-08-12 14:55:03 +03:00
John	41307f6a0f	Revert "Another friend fix" ... This reverts commit 156752b4a7.	2015-08-12 14:51:07 +03:00
John	156752b4a7	Another friend fix	2015-08-12 14:45:48 +03:00
John	da0366d02a	TV proper loop	2015-08-12 14:39:31 +03:00
John	bacd4b365c	Boarding Group messages are now clickable	2015-08-12 14:21:39 +03:00