pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-04 15:43:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
281 Commits 87 Branches 159 Tags
Commit Graph

154 Commits

Author SHA1 Message Date
Arthur Ice
dcec112b91 reordering includes to make it easier to simplify. 2013-05-20 22:17:56 -07:00
Arthur Ice
7b0de551e1 removed char buffer in 'UpdateWindowTitle" 2013-05-20 22:15:33 -07:00
Arthur Ice
f1a487f606 Merge branch 'master' into StringFormatting. 
Cleaned up the problems. Tested on Linux. Still need to test on windows.

Conflicts:
	common/CMakeLists.txt
	common/MiscFunctions.cpp
	common/MiscFunctions.h
	common/debug.cpp
	world/Adventure.cpp
 2013-05-19 18:56:21 -07:00
Arthur Ice
fca9c1458b Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	common/debug.cpp
	common/debug.h
	zone/PlayerCorpse.cpp
	zone/beacon.cpp
	zone/client.cpp
	zone/net.cpp
	zone/tribute.cpp
 2013-05-19 16:19:22 -07:00
KimLS
9e13a2271c Merge conflicts 2013-05-15 13:22:46 -07:00
josheb
b9a32185d7 Merge pull request #60 from josheb/master 
CHA scribe logic fix.
 2013-05-12 19:44:07 -07:00
root
0f880177e4 Merge branch 'master' of https://github.com/josheb/Server 2013-05-12 21:36:13 -05:00
root
7683252896 CHA scribe rule logic fix 2013-05-12 21:35:21 -05:00
Michael Cook
73a4e87379 FreeBSD support and clean up of unnecessary ifdef FREEBSD 2013-05-11 14:32:14 -04:00
Arthur Ice
9a139a7604 missed two string conversion functions. Moved them to StringUtil 2013-05-11 00:17:02 -07:00
Arthur Ice
373ff66240 moved string functions from MiscFunctions to StringUtil 2013-05-11 00:05:11 -07:00
Arthur Ice
3521472942 Merge branch 'master' of https://github.com/EQEmu/Server 2013-05-10 22:55:15 -07:00
Uleat
7a4cac84ac -- Added missing wrapper to bot update message 
-- Added notes to AESpell() update
 2013-05-10 22:24:56 -04:00
Uleat
c98c115cb6 -- Added Bot primary weapon proc (secondary and ranged already exist) 
-- Added Bard Bot Instrumentation bonuses
-- Added checks to avoid AE Buff casting on enemy mobs
-- Fixed a few typos in 'Vah Shir'-related code
 2013-05-09 20:57:02 -04:00
j883376
4bdd8b2502 Change space indentation to tabs 2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1 Remove trailing whitespace 2013-05-09 11:13:16 -04:00
KimLS
7a93966158 VS2012 fix + return 0 fix 2013-05-08 21:03:35 -07:00
Arthur Ice
23c524812d Removed the _MSC_VER special cases for Visual Studio 2008 and lower. 
We no longer support 2008 and lower so these defines will never be used.
 2013-05-08 17:09:13 -07:00
mackal
f6100ed834 Fixed NPC::GetScore and XS_NPC_GetScore 2013-05-08 17:07:49 -04:00
Derision
21a9434f89 Changed dummy strings written into the TaskSelector packet from nullptr to ABCD since the packet size calculation was based on the strings being 4 characters long. 2013-05-08 20:02:55 +01:00
af4t
4ee4992330 Merge branch 'master' of git://github.com/EQEmu/Server 2013-05-08 06:07:11 -04:00
Michael Cook
059ecdb50b Fix NULL to nullptr for SQL queries take 2 2013-05-07 18:20:09 -04:00
Michael Cook
0838d4507a Fix NULL to nullptr for SQL queries 2013-05-07 17:41:05 -04:00
af4t
5cda797531 VS2010 compatibility 2013-05-07 15:19:27 -04:00
tabasco
a0a92587b4 Fixing some regressions 2013-05-06 16:24:44 -05:00
josheb
8e49ab9179 Merge pull request #3 from EQEmu/master 
sync
 2013-05-06 14:16:46 -07:00
Alex
90c7fab452 Merge pull request #50 from j883376/master 
Fix Auto XTargets not clearing on death
 2013-05-05 23:42:14 -07:00
Tabasco
f983d19e01 Removed my bookmark comments and cleaned up itemtick for cases where there are no tick items. 2013-05-05 18:04:22 -05:00
j883376
4a0749f811 Change NULL to nullptr in RemoveAutoXTargets() 2013-05-05 18:51:20 -04:00
j883376
e2fd78b510 Fix Auto XTargets not clearing on death 2013-05-05 06:47:53 -04:00
Arthur Ice
7560b6b0a7 NULL to nullptr 2013-05-04 18:06:58 -07:00
josheb
824b101831 Merge pull request #2 from EQEmu/master 
sync
 2013-05-04 07:30:46 -07:00
Derision
e1c2657b11 NULL check in Merc::CalcItemBonuses 2013-05-03 09:36:16 +01:00
KimLS
c5c945f0c3 Make perl truely optional (Dalaya) 2013-05-02 23:21:04 -07:00
josheb
43b91b5938 Merge pull request #1 from EQEmu/master 
Sync
 2013-04-25 05:34:17 -07:00
badcaptain
e2f25d1c92 Fixed a couple of merc stat issues and a few bot aggro issues, removed unneeded bot pet AI. 2013-04-25 00:42:52 -04:00
Tabasco
56490400ca Dungeon Crawl custom code merge 
Added numerous modding hooks.
Added rules:
	Character:KeepLevelOverMax - Don't delevel a character if they are found to be over max level rule.
	Spells:UseCHAScribeHack - Optionally omit spells with CHA in effect12 when using scribespells and traindiscs
	Combat:MonkACBonusWeight - Adjust the weight threshold for monk AC bonus
	Combat:ClientStunLevel - Adjust the level clients kicks and bashes start to roll for stuns
	Combat;QuiverWRHasteDiv - Adjust the divisor applied to weight reduction for haste calcs
	Combat:UseArcheryBonusRoll - Make archery stationary bonus a roll
	Combat:ArcheryBonusChance - Archery stationary bonus chance

Added account flags and associated perl wrappers
Added EVENT_ITEM_TICK for interactive items
Added EVENT_DUEL_WIN and EVENT_DUEL_LOSE, which exports $enemyname and $enemyid
Added timer and interval to console worldshutdown command
Added EQW interface for worldshutdown and server-wide messages
 2013-04-24 15:58:51 -05:00
JJ
a7ce66856b Fix rare case where heals from buffs could be negative. 2013-04-20 14:04:08 -04:00
Derision
3b42f295d6 Moved entity_list.Clear() prior to destruction of Perl objects in zone shutdown 2013-04-12 19:20:43 +01:00
mackal
b8febdd440 Realized there was a better way to do the DB entries for salvage, so I changed the script. 
Run the optional 2013_04_09_SalvageCleanOld.sql if you ran the old script.
 2013-04-09 14:50:51 -04:00
mackal
81ca7a1bfd More work on salvage, added some extra checks and won't return stacks of items 2013-04-08 14:16:08 -04:00
mackal
91c817d9dd Work on implementing salvage 2013-04-07 22:38:43 -04:00
JJ
88b9f96b91 Attempting manual merge for Nature's Bounty 2013-04-06 08:23:09 -04:00
mackal
20f086dc37 Switched rest of pet messages to MT_PetResponse 
Overloaded Mob::Say_StringID with a version that takes a message type
 2013-04-03 16:09:44 -04:00
badcaptain
15e31d1c03 Merge branch 'master' of https://github.com/EQEmu/Server 2013-04-02 19:10:18 -04:00
badcaptain
a787a7ce72 Fixed Merc lack of use of heal over time spells (causing excessive healing), fixed pet mitigation/AC issues. 2013-04-02 19:09:32 -04:00
JJ
989d132423 Merge pull request #45 from mackal/aa_fix 
Bards can now use instant cast AAs while singing (Fading Memories, Boast...
 2013-04-01 15:49:19 -07:00
KimLS
757fc01b78 Patch for: 
-Perl blessing of exported variables is causing the SVs to be overwritten but never freed by the Perl GC.  I'm not sure if this is a feature or a bug in Perl as the documentation sucks.

Addressed by setting the blessed SVs in question to be undefined at the end of every script.  Caused a noticeable drop in memory for zones with a lot of quest events firing but it's probably not perfect.
 2013-04-01 14:23:54 -07:00
mackal
353d7cede0 Bards can now use instant cast AAs while singing (Fading Memories, Boastful Bellow) 
AA reuse timers now start before the spell is cast and reset upon failure or canceling
 2013-04-01 17:19:45 -04:00
mackal
96b42ed86f Fix pet message to use StringIDs, most should be correct related to pet "saying" or just the client getting a message 
Added the pet taunting message
 2013-03-30 22:57:20 -04:00