Akkadius dd6d1d5511 Merge remote-tracking branch 'remotes/origin/master' into web_interface ...

Conflicts:
	CMakeLists.txt
	common/logtypes.h
	common/shareddb.cpp
	world/net.cpp
	zone/client_logs.cpp
	zone/corpse.cpp
	zone/mob.cpp
	zone/net.cpp

2015-02-02 23:11:31 -06:00

..

adventure_manager.cpp

Remove Duplicative MySQL Error: Error in AdventureManager:::GetLeaderboardInfo: %s (%s)

2015-01-19 05:25:20 -06:00

adventure_manager.h

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

adventure_template.h

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

adventure.cpp

More cleanup of some QueryDatabase references that no longer need auto results

2015-01-19 05:35:28 -06:00

adventure.h

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

client.cpp

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

client.h

Many tweaks to stream memory allocation, including but not limited to streams now are shared_ptrs.

2015-01-27 21:12:44 -08:00

cliententry.cpp

Another tell_queue leak fix

2015-01-30 22:00:39 -05:00

cliententry.h

Implement tell queues

2014-09-18 22:55:06 -04:00

clientlist.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

clientlist.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

CMakeLists.txt

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

console.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

console.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

eql_config.cpp

Remove Duplicative MySQL Error: Error in SetDynamicCount query: %s

2015-01-20 01:41:58 -06:00

eql_config.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

eqw_http_handler.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

eqw_http_handler.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

eqw_parser.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

eqw_parser.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

eqw.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

eqw.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

http_request.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

http_request.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

launcher_link.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

launcher_link.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

launcher_list.cpp

Remove commented printf : Proc %s(%d): %p\n

2015-01-20 01:34:38 -06:00

launcher_list.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

lfplist.cpp

Removal of logsys.h from #include(s)

2015-01-18 04:03:45 -06:00

lfplist.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

login_server_list.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

login_server_list.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

login_server.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

login_server.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

net.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

net.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

perl_eql_config.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_eqw.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

perl_http_request.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

queryserv.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

queryserv.h

Renaming headers is hard work

2014-08-21 17:26:32 -07:00

remote_call.cpp

Zone.GetEntityAttributes

2014-12-07 19:43:00 -06:00

remote_call.h

First implementation of read/write file access. We need better security for this though, you could potentially overwrite any file on the local machine the user of world has write access to atm.

2014-10-23 14:35:16 -07:00

sof_char_create_data.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

ucs.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

ucs.h

Renaming headers is hard work

2014-08-21 17:26:32 -07:00

web_interface.cpp

Hopefully completely merged from master in what is the biggest merge ever

2014-12-07 13:23:16 -08:00

web_interface.h

Hopefully completely merged from master in what is the biggest merge ever

2014-12-07 13:23:16 -08:00

wguild_mgr.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

wguild_mgr.h

Remove trailing whitespace

2013-05-09 11:13:16 -04:00

world_config.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

world_config.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

world_tcp_connection.h

More renames, world should be done

2014-08-21 23:30:09 -07:00

worlddb.cpp

Some minor cleanup. [skip ci]

2015-01-31 17:03:44 -05:00

worlddb.h

Altered the way that start zone overrides work. These now no longer use an entry in the variables table, but rather use TitaniumStartZoneID, and SofStartZoneID in the rule_values table.

2015-01-13 21:47:51 +00:00

zonelist.cpp

Rename debug.h to global_define.h, update cmakelists and such

2015-01-19 04:12:09 -06:00

zonelist.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

zoneserver.cpp

Merge remote-tracking branch 'remotes/origin/master' into web_interface

2015-02-02 23:11:31 -06:00

zoneserver.h

Spelling errors and revised my cle change to put it much lower so it shouldn't have any side effects other than avoiding the crash

2015-01-30 15:03:02 -08:00