7666 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Uleat	01b3b41bae	Fix for mailkey-based server crashes (does not fix the problem of non-existent mailkeys...)	2019-10-30 07:22:11 -04:00
Uleat	135eaae402	Merge pull request #925 from prestanneth/master ... Added some backticks on mysql keywords	2019-10-23 22:22:51 -04:00
kentai	62be0c475e	Added backticks on sql keyword	2019-10-24 02:44:57 +11:00
kentai	1c6971da4a	Merge branch 'master' of https://github.com/prestanneth/Server	2019-10-24 02:11:13 +11:00
Uleat	653801a54b	Fix for tradeskill combine-based zone crashes	2019-10-18 20:47:21 -04:00
KentaiVZ	6a393afdf3	Merge pull request #2 from EQEmu/master ... SYNC	2019-10-18 16:30:58 +11:00
Michael Cook (mackal)	b0efe88a03	Merge pull request #922 from noudess/spawn2 ... Fix some bugs with the use of the model field in npc_types	2019-10-15 21:02:36 -04:00
Noudess	7eb2e834b1	Fix some bugs with the use of the model field in npc_types	2019-10-15 13:22:49 -04:00
KimLS	754ed71f9a	Update dependency locations	2019-10-15 00:07:02 -07:00
Alex	4f538fbdad	Merge pull request #921 from EQEmu/master_build_revert ... Build merge into master again	2019-10-13 21:47:06 -07:00
Uleat	99ee4e04d9	Added bot command 'precombat' to manually set pre-combat mode rather than the 'assumption' process used before; Added rule Bot:AllowOwnerOptionAltCombat to allow admins control over its use	2019-10-13 22:24:06 -04:00
Alex	7989451c36	Merge pull request #920 from EQEmu/build ... Build	2019-10-13 18:50:33 -07:00
Alex	4c9c070d67	Merge pull request #919 from EQEmu/revert-917-revert-916-build ... Revert "Revert "Build System Updated""	2019-10-13 18:49:42 -07:00
Alex	058a722569	Revert "Revert "Build System Updated""	2019-10-13 18:49:16 -07:00
Alex	1d460bd636	Merge pull request #918 from EQEmu/revert-821-feature/remove_boost ... Revert "Remove boost"	2019-10-13 01:30:26 -07:00
Alex	47ee5b5afb	Revert "Remove boost"	2019-10-13 00:53:31 -07:00
Alex	7edfdbd9db	Merge pull request #917 from EQEmu/revert-916-build ... Revert "Build System Updated"	2019-10-12 21:08:09 -07:00
Alex	b9f57f1f28	Revert "Build System Updated"	2019-10-12 21:07:06 -07:00
Alex	579471afcc	Merge pull request #916 from EQEmu/build ... Build System Updated	2019-10-12 19:04:26 -07:00
KimLS	04e7238a6e	Fix for wrong perl lib in auto dependencies	2019-10-11 15:53:23 -07:00
KimLS	0e9fae3181	Merge remote-tracking branch 'origin/master' into build	2019-10-10 17:29:17 -07:00
Michael Cook (mackal)	37d4371acd	Merge pull request #915 from noudess/spawn2 ... Old School poison changes to be close to live. Added extending proci…	2019-10-10 17:32:48 -04:00
Noudess	bcf0af0a8d	Old School poison changes to be close to live. Added extending procing rule.	2019-10-10 14:32:27 -04:00
Chris Miles	f17779efeb	Merge pull request #913 from EQEmu/quest_logging ... Added logging functions to perl/lua apis	2019-10-08 20:56:03 -05:00
Uleat	3aed0e257a	Added logging functions to perl/lua apis	2019-10-08 20:35:03 -04:00
Uleat	a26227f258	Fix for #npceditmass command failure on string-based updates	2019-10-07 22:15:24 -04:00
Michael Cook (mackal)	db085b7126	Merge pull request #911 from noudess/spawn2 ... Old school apply poison was allowing multiple poisons at once.	2019-10-07 17:18:35 -04:00
Paul Coene	bca567d2f5	Merge branch 'master' into spawn2	2019-10-07 13:25:12 -04:00
Noudess	c62d9040cb	Old school apply poison was allowing multiple poisons at once.	2019-10-07 13:16:52 -04:00
Uleat	abb1086e52	Added rules Bots:AllowOwnerAutoDefend and Bots:LeashDistance	2019-10-05 23:11:16 -04:00
Uleat	1f04938535	Merge pull request #910 from EQEmu/bot_ai_rework ... Updated Bot AI to make use of neglected commands/features	2019-10-05 19:15:13 -04:00
Uleat	12204dd927	Updated Bot AI to make use of neglected commands/features	2019-10-05 18:17:23 -04:00
Chris Miles	b118864920	Merge pull request #907 from alimalkhalifa/master ... Added automated initialization of login.json [ci skip]	2019-10-05 00:54:49 -05:00
Ali	af749cf07a	Updated do_install_config_login_json to pull from EQEmu repo [ci skip]	2019-10-01 23:14:01 +03:00
Ali	bf45e8b491	Fix missing ;s [ci skip]	2019-10-01 21:31:22 +03:00
KimLS	abd14f556a	Merge remote-tracking branch 'origin/master' into build	2019-09-30 14:02:39 -07:00
Akkadius	29b90fbeaf	Fix escaping issue in #npcspawn create	2019-09-30 14:14:59 -05:00
Akkadius	6cecc85d17	Change login config defaults to avoid confusion [skip ci]	2019-09-30 01:26:09 -05:00
Akkadius	f3c85dc585	Auto convert insecure world server admin passwords during the world authentication process, add cli support for updating world admin account	2019-09-30 01:22:40 -05:00
Ali	2e4868d3eb	Added automated initialization of login.json [ci skip]	2019-09-30 08:39:41 +03:00
Chris Miles	0005df31f7	Merge pull request #906 from alimalkhalifa/master ... Modified eqemu_server.pl to use new login server schema	2019-09-28 02:22:28 -05:00
Ali	1f3287759a	Modified eqemu_server.pl to use new login server schema	2019-09-28 10:20:05 +03:00
Alex	3c345b9a9c	Merge pull request #821 from adam4813/feature/remove_boost ... Merged finally, to build which will hit master soon (tm)	2019-09-27 17:47:27 -07:00
Alex	895c8626b6	Merge branch 'build' into feature/remove_boost	2019-09-27 16:32:13 -07:00
KimLS	2965ab28e2	Remove oldcode	2019-09-27 16:28:14 -07:00
KimLS	259bce9509	Refactor zone net class (nothing to do with networking -.-)	2019-09-27 14:42:35 -07:00
KimLS	316d645f33	Merge remote-tracking branch 'origin/master' into build	2019-09-27 12:04:47 -07:00
KimLS	135b4aac34	Fix for compile error	2019-09-26 17:19:38 -07:00
Kinglykrab	0b3c489028	Exported MerchantCloseShop() and MerchantOpenShop() to Perl.	2019-09-25 20:07:32 -04:00
Akkadius	cda6a1465b	Fix small loginserver bug where when a worldserver pings world for the first time it may not show up	2019-09-24 21:51:42 -05:00