1366 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alexander	8744833bf8	use http and not ssh.	2015-08-21 03:31:57 -04:00
Alexander	97f4d9dba4	Update resources	2015-08-21 03:26:26 -04:00
Alexander	7db2764c69	Update resources.	2015-08-21 01:52:13 -04:00
Alexander	7d1fa3e935	Update resources.	2015-08-21 00:43:06 -04:00
Alexander	688979c93e	Control C now works when you use it and the server will crash and reboot if it does crash. TODO: fix report manager to not use threading.	2015-08-21 00:40:42 -04:00
Alexander	8ace2358ae	Add a message for error code 124, Can be changed later.	2015-08-20 22:31:49 -04:00
Alexander	5c0ff2544b	Update resources and pull code from master.	2015-08-20 21:04:27 -04:00
John	d2afb22e07	Fixed that for ya	2015-08-20 11:09:22 +02:00
Alexander	60f3706aae	Fix a rpc method.	2015-08-20 00:49:58 -04:00
Loudrob	d536ca4ec4	They have access to ~allSummons anyway so...	2015-08-19 18:37:24 -04:00
Alexander	6a2a335828	Make maxToon, and dna target and not invoker.	2015-08-19 17:54:05 -04:00
Alexander Behrhof	f7eee2c753	Merge branch 'features/dan' into 'feature/deployment' ... Features/dan See merge request !6	2015-08-19 17:10:00 -04:00
Alexander	f28cf39e61	Change to local ip on prod.	2015-08-19 16:57:07 -04:00
Alexander	c6d182a184	Holocaust base.dg	2015-08-19 16:56:49 -04:00
Alexander Behrhof	02a7981d04	Merge branch 'feature/two-story-houses' into 'feature/deployment' ... Add 2nd floor houses. See merge request !5	2015-08-19 16:43:16 -04:00
Alexander	432c1dc626	Add 2nd floor houses.	2015-08-19 13:45:34 -04:00
Alexander	656185975b	Remove a debug message.	2015-08-18 16:05:45 -04:00
Alexander	2aa8488175	Fix a crash and update resources.	2015-08-18 14:39:38 -04:00
Alexander	d5d0d42e97	Fix missing graphic's so it doesn't revert to openGL.	2015-08-18 01:11:55 -04:00
Loudrob	8f2b51ce29	update commit	2015-08-17 16:16:51 -04:00
Alexander	e6c6f42e01	Update submodule correctly.	2015-08-17 14:33:02 -04:00
John	a867837385	SOS page fix	2015-08-17 16:54:59 +03: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	81f6895954	Bigger text in suit page	2015-08-17 14:24:05 +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
Master Jumblespeed	1c5e6503e4	nirai: add some encryption	2015-08-16 22:32:55 -04: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
Master Jumblespeed	41f5434069	bans: pass accountId of banner along to webserver	2015-08-16 17:07:31 -04:00
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
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