1482 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Master Jumblespeed	9ba059adc4	rpc: fix small bug with calling toons	2015-08-16 16:10:47 -04:00
Alexander	2722d7970e	Change some configs for dev testing.	2015-08-16 15:14:51 -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
Alexander	b51df42bdb	Allow the dev server to have crates, but disable them in prod version.	2015-08-16 13:45:57 -04:00
Loudrob	be39b1a950	We won't have these initially.	2015-08-16 13:36:21 -04:00
Master Jumblespeed	723603f5a8	nirai: improve data decryption	2015-08-16 12:29:30 -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
Master Jumblespeed	3c85a9e886	bans: minor changes	2015-08-15 02:40:35 -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	5f431480d2	Forgot to remove this.	2015-08-14 16:46:00 -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	a38ca63a30	Add submodule's from nirai branch.	2015-08-14 02:31:35 -04:00
Alexander	ad81064fb7	Add back files from old deployment branch.	2015-08-14 02:23:24 -04:00
Alexander	21ce879162	Update submodule.	2015-08-14 02:19:53 -04:00
Alexander	57bb586613	Add resources submodule.	2015-08-14 02:17:05 -04:00
Alexander	412bd7526f	Merge branch 'master' into feature/deployment	2015-08-13 18:51:53 -04:00
Alexander	0368de40e3	Update libpandanda.	2015-08-13 18:51:27 -04:00
Alexander	1e8045172b	Add submodule and upload the deployment files.	2015-08-13 18:38:01 -04:00
Alexander Behrhof	1ea800b4bd	Merge branch 'features/dan' into 'master' ... Features/dan See merge request !2	2015-08-13 18:20:28 -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
John	5f9592cdd7	Magic word crash prevention	2015-08-13 23:06:19 +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