a602640188
Merge branch 'master' into web_interface
2014-08-18 18:36:31 -07:00
7c3cfd43de
Stuff
2014-08-03 01:20:19 -05:00
379ecc655c
Changed a bunch of function names to be shorter but still descriptive
2014-08-02 14:31:39 -07:00
ae30d8b257
More cleanup
2014-08-01 19:07:54 -07:00
40b555a55b
More work on subscription events, and relaying through world.
2014-08-01 18:29:41 -07:00
002f5e3bcc
Work on relay
2014-07-30 20:07:36 -07:00
780789fbad
More work on getting remote calls up and running, added two remote calls list_zones and get_zone_info.
2014-07-30 15:23:14 -07:00
0f6ce6a1f4
Upstream merge
2014-07-30 14:46:02 -07:00
da6d7538b0
Position updates with do_pos_update test call
2014-07-22 23:14:44 -05:00
e442d682cd
Added rapidjson library
...
Added web_interface_utils.cpp/.h to common to provide string based functions for outputting JSON
Adjusted CMake to include rapidjson library and new web_interface_utils.h/cpp to common
Currently, I have code set up hackishly for testing so do not think it is final. It is merely for demonstrating what I've done and played with.
2014-07-20 15:02:06 -05:00
b7e36feeeb
Removed more socket server stuff, changed some of the build stuff.
2014-07-14 15:44:28 -07:00
80892f1d4d
Reworking a lot of stuff at once, this will look very chaotic.
2014-07-14 15:09:55 -07:00
cc69e81dab
Fix case-sensitive issue
2014-07-08 21:09:56 -07:00
6a59b83d43
StringFormat converted to move semantics
2014-07-08 21:09:55 -07:00
3e0f6b8520
Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.
2014-07-08 21:09:55 -07:00
9e3e8dbfa6
Cleaned up web interface server, starting work on getting tcp connections to persist then will hook it up to the websockets/http/whatever else we deem worthy.
2014-07-07 22:19:46 -07:00
e599555ddb
Fix case-sensitive issue
2014-07-04 00:46:53 -04:00
a92b4c04e9
Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.
2014-07-02 22:17:45 -05:00
4d70cb20e7
Merge remote-tracking branch 'upstream/master'
2014-04-07 10:05:46 -07:00
7cfc5b085e
(Performance Adjustment) Removed AsyncLoadVariables from InterserverTimer.Check() in both zone and world. By watching the MySQL general.log file on mass zone idle activity, you can
...
see that the query 'SELECT varname, value, unix_timestamp() FROM variables where unix_timestamp(ts) >= timestamp' is called every 10 seconds. This function is loading
variables that are initially loaded on World and Zone bootup. When running a large amount of zone servers, the amount of MySQL chatter that is produced is enormous and
unnecessary. For example, if I ran 400 zone servers, I would see 3,456,000 unnecessary queries from all idle or active zone processes in a 24 hour interval.
2014-04-05 03:38:58 -05:00
f6046477b4
Changes for intel Mac OSX build
2014-04-03 14:10:03 -07:00
4216627604
Prefer prefix ++/-- on non-primitive types
...
Postfix ++/-- might cause the creation of a tmp instance
that might be optimized out. Mights are bad. Prefix doesn't
have this problem.
2014-01-13 22:14:02 -05:00
e3805d5920
Converted SkillType typedef enumeration to SkillUseTypes enumeration
2013-10-27 13:03:41 -04:00
0d5fc26841
Converted MATERIAL defines to MaterialUseSlots enumeration
2013-10-27 08:01:37 -04:00
98c835e470
Fix Titanium clients from not being able to start in Tutorial zone.
2013-10-12 00:29:44 -04:00
549dfc9781
Allow use of Go Home button when Tutorial still selected in RoF.
2013-10-11 22:40:49 -04:00
8327f22f6f
Revert change to EnterWorldPacket introduced on 22 April 2013 to fix inability to enter Tutorial or Go Home from character select screen.
2013-10-10 22:38:23 -04:00
7ee417ab05
Simplify conditional linking with libdl
2013-10-09 19:27:52 +04:00
fcd9b525a8
Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.
2013-08-29 15:46:40 -07:00
dfe63f87c3
Merge pull request #78 from j883376/cleanups
...
Code cleanups, take two
2013-07-12 13:36:02 -07:00
0578f45490
Revert "Revert "Merge pull request #77 from j883376/cleanups""
...
This reverts commit d25205d9d3
2013-06-28 04:25:44 -04:00
a5db4310c6
Merge branch 'master' into lua
...
Conflicts:
zone/merc.cpp
2013-06-27 12:53:47 -07:00
d25205d9d3
Revert "Merge pull request #77 from j883376/cleanups"
...
This reverts commit 4ff2efea43e811e3975b
2013-06-27 12:50:20 -07:00
9e1115f899
Merge master, pretty close to RC atm
2013-06-26 12:52:00 -07:00
536e31d771
Change binary output path to use CMake variable
...
Tools that use CMake's EXECUTABLE_OUTPUT_PATH variable to
determine which binary to launch for debugging may be confused
by a relative path, so use CMake variable PROJECT_BINARY_DIR
instead.
2013-06-21 23:21:57 -04:00
2a39449f6e
Fix exit code values
...
- Change all exit codes to match the standard of 0 for success
and 1 for error
- Add empty shared folder to utils/defaults for shared_memory
2013-06-21 22:54:28 -04:00
76e25f75fa
Fix a few memory leaks
...
- Rewrite zonename_array to use std::map rather than a pointer to an array
of character pointers
- Properly delete ZoneConfig on Zone shutdown
- Delete AdventureTemplates in AdventureManager destructor
2013-06-21 17:09:46 -04:00
7b894a7c61
Added direct inventory access, and event_loot for items and event_weapon_proc for items
2013-06-20 14:03:22 -07:00
7fca5a7a89
Merge branch 'master' of https://github.com/EQEmu/Server into EQEmu-master
...
Conflicts:
zone/client.h
zone/mod_functions.cpp
zone/mod_functions_base.cpp
2013-06-01 19:17:23 -05:00
510ce16f0e
Added reloadworld console command
2013-05-27 08:46:50 -05:00
52b8c0e078
Merge pull request #66 from j883376/gcc-changes
...
GCC Changes
2013-05-24 01:16:10 -07:00
b47597b813
Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes
2013-05-23 21:12:07 -04:00
d6ff01d63c
Fix several GCC warnings
2013-05-23 20:22:42 -04:00
fcb769e353
Merge branch 'master' into small_stage_cleanup
...
Conflicts:
common/EQStream.cpp
zone/client.h
2013-05-23 12:49:22 -07:00
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -07:00
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
5255c236c3
added std:: to a lot of locations which where
...
missed and added NOMINMAX to cmakelist
2013-05-22 23:55:49 -07:00
54914a970e
Merge branch 'StringFormatting' into small_stage_cleanup
...
Conflicts:
common/Item.cpp
world/client.cpp
zone/net.cpp
2013-05-22 18:55:06 -07:00
ea2a1651d5
Merge branch 'master' into StringFormatting
...
Conflicts:
common/debug.cpp
2013-05-22 18:07:39 -07:00
5c6e95f921
Merge branch 'master' of https://github.com/EQEmu/Server
2013-05-22 17:38:26 -07:00
KimLS
Akkadius
Arthur Ice
Michael Cook (mackal)
Corysia Taware
Uleat
JJ
Dmitry Marakasov
j883376
root