2359 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Steven Lawson	e70f8ffff3	Shouldn't create new instances of a list when we can just clear it.	2013-09-03 17:18:03 -04:00
Steven Lawson	896af4198a	...	2013-09-03 16:49:48 -04:00
Steven Lawson	d1ffbe0412	Merge branch 'waiting' into staging	2013-09-03 16:41:21 -04:00
Steven Lawson	8f70fa2c82	Merge branch 'untested' into staging	2013-09-03 16:41:12 -04:00
Steven Lawson	a89948f76d	Javascript support	2013-09-03 16:35:11 -04:00
StevenLawson	41cca7cd6a	Working on schematic uploader. ... Sorry for not branching out on this, but its almost done.	2013-09-03 15:20:28 -04:00
StevenLawson	0067e2cc65	Added socket parameter for access to remote IP. ... Started on schematic module.	2013-09-03 10:28:56 -04:00
JeromSar	2168aa957a	Incremented version number to reflect latest changes	2013-09-03 16:10:50 +02:00
JeromSar	3babf8388c	Merge branch 'master' into frontdoor	2013-09-03 15:59:49 +02:00
JeromSar	0b0e17e526	Finished TFM_FrontDoor, made some variables thread-safe.	2013-09-03 15:57:49 +02:00
JeromSar	5247a33f88	More bugtesting and tweaks with FrontDoor	2013-08-29 13:31:07 +02:00
JeromSar	3f2aa224f6	More work on TFM_FrontDoor	2013-08-28 21:40:14 +02:00
JeromSar	bc00e42990	Started work on TFM_FrontDoor	2013-08-28 19:11:27 +02:00
StevenLawson	88103cefc2	Some more tweaks to WebHelp.	2013-08-28 11:26:08 -04:00
Steven Lawson	3819c57adf	Finished file serving module (default). ... Added config options.	2013-08-27 20:20:11 -04:00
StevenLawson	c3f8bd33ff	Added file module, for public file serving.	2013-08-27 15:09:07 -04:00
StevenLawson	baf7a3b2c1	Merge branch 'master' into nanohttpd	2013-08-27 13:56:21 -04:00
StevenLawson	74bfdad389	...	2013-08-27 13:55:03 -04:00
StevenLawson	08a9329864	Web help refinement.	2013-08-27 13:49:45 -04:00
StevenLawson	be87075337	Rename help module.	2013-08-27 12:40:59 -04:00
StevenLawson	ada803cd7d	Web help roughly implemented.	2013-08-27 12:39:28 -04:00
JeromSar	0b146943ff	Added /rollback undo	2013-08-27 16:23:10 +02:00
StevenLawson	0f31ea2953	Make it thread safe.	2013-08-27 09:01:12 -04:00
StevenLawson	3ca46853ac	Merge branch 'master' into nanohttpd	2013-08-27 08:02:32 -04:00
StevenLawson	ee6b93e208	Playing the memory reduction game - lets reduce the use of "new".	2013-08-27 07:46:25 -04:00
StevenLawson	3e5e11197f	Merge branch 'master' into nanohttpd	2013-08-27 07:18:43 -04:00
JeromSar	6035f9e50b	TFM_PlayerListener cleanup	2013-08-27 12:35:32 +02:00
JeromSar	f45cc11846	Don't track blockchanges from Superadmins	2013-08-27 12:10:20 +02:00
JeromSar	b28a0778b4	Optimized RollbackEntry for memory	2013-08-27 11:52:28 +02:00
Steven Lawson	174043fa58	Getting HTTP server framework ready...	2013-08-26 21:48:04 -04:00
Steven Lawson	dfb6df63c8	Use NanoHTTPD instead, more stable.	2013-08-26 20:39:30 -04:00
Steven Lawson	7a6cc55640	Clean up EntryType	2013-08-26 19:09:39 -04:00
Steven Lawson	5c61ff27b0	Formatting	2013-08-26 18:44:18 -04:00
JeromSar	3da03393e6	Small bugfix with the logblock stick	2013-08-26 17:48:19 +02:00
JeromSar	5876f86ac3	Added logblock stick	2013-08-26 17:22:35 +02:00
JeromSar	fbdf2b5fc2	More /cage tweaks	2013-08-26 15:12:06 +02:00
JeromSar	fd6aa7b94b	Tweaks to /cage	2013-08-26 01:08:53 +02:00
JeromSar	5981f7f33f	Converted variable names to CamelCase as convention	2013-08-25 18:32:01 +02:00
JeromSar	55d94b5d59	Changed back to raw Lists in config	2013-08-25 17:32:24 +02:00
JeromSar	d71b043102	Added unbannable usernames (defined in config) ... Changed all raw Lists in config to StringLists	2013-08-24 21:35:09 +02:00
Steven Lawson	143b323854	Implement weather and time control in /adminworld.	2013-08-23 21:22:13 -04:00
Steven Lawson	1f32455e06	A few more adminworld checks.	2013-08-23 16:59:31 -04:00
Jerom van der Sar	8718b3a8c2	Merge pull request #73 from Wild1145/patch-7 ... Removed Disaster from Developer access	2013-08-23 13:49:10 -07:00
Steven Lawson	f5e21f69fd	More guest list changes.	2013-08-23 16:29:46 -04:00
StevenLawson	bf7877addc	Finish guest list.	2013-08-23 14:43:58 -04:00
Steven Lawson	6d0b8362b7	Merge branch 'master' into adminworld ... Conflicts: appinfo.properties buildnumber.properties	2013-08-22 17:08:52 -04:00
Steven Lawson	10f905ea36	Got rid of varargs in logger, possible cause of exceptions.	2013-08-22 16:56:17 -04:00
Ryan	dcb6a4513e	Removed Disaster from Developer access ... Noticed this when working on the CJFreedom version, thought it should be removed!	2013-08-22 20:29:16 +01:00
unknown	ff4751941b	Working on guestlist	2013-08-22 15:26:12 -04:00
Steven Lawson	e64fd42855	Added TFM_CustomWorld superclass.	2013-08-21 20:07:14 -04:00