Arthur Ice cff96b23a8 Merge branch 'master' into RunQueryToDatabaseQuery_database ...

Conflicts:
	changelog.txt
	common/spdat.h
	zone/attack.cpp
	zone/bonuses.cpp
	zone/common.h
	zone/mob.h
	zone/special_attacks.cpp
	zone/spell_effects.cpp

2014-07-10 14:15:05 -07:00

..

AA.cpp

Implemented SE_IllusionOther - Allows next Illusion buff (self only)

2014-07-08 21:09:53 -07:00

AA.h

Implemented SE_IllusionOther - Allows next Illusion buff (self only)

2014-07-08 21:09:53 -07:00

aggro.cpp

Merge branch 'master' into raycast

2014-04-27 14:36:05 -07:00

attack.cpp

Re-Implemented SE_TriggerMeleeThreshold and SE_TriggerSpellThreshold correctly - Trigger spell if owner of buff

2014-07-08 21:09:57 -07:00

basic_functions.h

Change space indentation to tabs

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

beacon.cpp

removed visual studio 5,6,7 specific code except in tinyxml and StackWalker.

2013-05-20 22:40:10 -07:00

beacon.h

Converted SkillType typedef enumeration to SkillUseTypes enumeration

2013-10-27 13:03:41 -04:00

bonuses.cpp

Changed SE_LimitMaxMana to SE_MeleeVulnerability - Weakness/Mitigation verse melee damage

2014-07-08 21:09:57 -07:00

bot.cpp

Renamed a few spell effects more appropriately.

2014-07-08 21:09:55 -07:00

bot.h

Complete revision of SE_SkillProc, SE_LimitToSkill,

2014-07-06 18:58:16 -04:00

botspellsai.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

botStructs.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

client_logs.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

client_logs.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

client_mods.cpp

Implemented SE_HeadShot, SE_HeadShotLevel - Defines headshot damage and level requirements.

2014-07-08 21:09:54 -07:00

client_packet.cpp

Complete revision of SE_SkillProc, SE_LimitToSkill,

2014-07-06 18:58:16 -04:00

client_packet.h

Change space indentation to tabs

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

client_process.cpp

Melee 'facing' code updated to client derived function

2014-05-05 15:29:29 -04:00

client.cpp

Implemented SE_FactionModPct - Modifies faction gains and losses by percent.

2014-07-08 21:09:56 -07:00

client.h

Updated SE_Sanctuary - Adjust way hate lowering effect worked to be more accurate

2014-07-04 23:35:15 -04:00

CMakeLists.txt

Debug logs for map, also can actually turn perl off on zone

2014-05-23 15:54:26 -07:00

command.cpp

Experimental changes to lua get_qglobal implementation to try to see if we can figure out this gcc x86 bug.

2014-06-08 15:18:48 -07:00

command.h

Fix for fear failing, removed #fear command because it was blank anyway, added a cmake command to change the default map/water/path directory

2014-05-31 16:32:15 -07:00

common.h

Changed SE_LimitMaxMana to SE_MeleeVulnerability - Weakness/Mitigation verse melee damage

2014-07-08 21:09:57 -07:00

corpse.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

corpse.h

Converted SkillType typedef enumeration to SkillUseTypes enumeration

2013-10-27 13:03:41 -04:00

doors.cpp

Switched some things to StringID defines

2014-01-24 02:05:26 -05:00

doors.h

Lua doors api

2013-06-03 00:08:41 -07:00

effects.cpp

Fix for test... (conn_state != client_state)

2014-05-05 21:59:21 -04:00

embparser_api.cpp

Fixed a zone crash in spawn_conditions.

2014-04-25 12:40:25 -07:00

embparser.cpp

Memory leak work around for perl, should play better with events that call other events now.

2014-03-09 17:55:24 -07:00

embparser.h

Memory leak work around for perl, should play better with events that call other events now.

2014-03-09 17:55:24 -07:00

embperl.cpp

Fixed zone shutdown (or #reloadqst) reinitalization of Perl. This should allow for Perl 5.14 and later to work on Windows under the new quest system.

2013-10-10 05:15:38 -07:00

embperl.h

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

embxs.cpp

Perl parser works, still needs a little cleanup

2013-05-09 14:52:20 -07:00

embxs.h

Remove trailing whitespace

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

entity.cpp

Merge branch 'master' into raycast

2014-04-27 14:36:05 -07:00

entity.h

Revert "It's never ogre with these hatelist crashes.."

2014-04-23 12:50:25 -04:00

errmsg.h

Change space indentation to tabs

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

event_codes.h

Lua packet handler dispatch

2013-07-13 13:53:41 -07:00

exp.cpp

Added optional rule for allowing bots to auto-update with their owner.

2014-03-31 09:31:49 -04:00

fearpath.cpp

Merge branch 'master' into raycast

2014-03-01 17:49:21 -08:00

forage.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

forage.h

Change space indentation to tabs

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

groups.cpp

Fix to SE_BlanaceMana to only check classes in group that have mana.

2014-07-08 21:09:52 -07:00

groups.h

Update to SE_BalanaceMana, SE_BalanceHP to support limit value which caps max mana/hp that can be taken per player.

2014-07-08 21:09:52 -07:00

guild_mgr.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

guild_mgr.h

Remove trailing whitespace

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

guild.cpp

Identified the opcode/struct for guild ranks in Rain of Fear+ clients and created a temporary workaround for permissions until full DB support is added for the new permissions system.

2014-05-17 23:33:35 -04:00

hate_list.cpp

Updated SE_Sanctuary - Adjust way hate lowering effect worked to be more accurate

2014-07-04 23:35:15 -04:00

hate_list.h

Kayen: Implemented additional functionality for SE_CurrentHP utilizing base2 values. (ie limit to body type)

2013-12-13 21:29:35 -05:00

horse.cpp

Fix for special_abilities crash dealing with std::string in struct that was then memcpyed

2013-07-18 00:24:43 -07:00

horse.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

inventory.cpp

Fix for unconscious ability skillups.

2014-03-31 03:21:22 -04:00

loottables.cpp

Changed ItemTypes to ItemUseTypes

2013-10-27 09:04:52 -04:00

lua_bit.cpp

NPC Special Attacks should all work right: also huge explanation in changelog.txt

2013-07-11 13:44:45 -07:00

lua_bit.h

Sorta hacky work around for doing nukeitem in item quests. Added lua bitop library. Made excluding io/os optional

2013-06-25 14:51:06 -07:00

lua_client.cpp

Exported TrainDisc to Lua.

2014-02-27 23:21:57 -08:00

lua_client.h

Exported TrainDisc to Lua.

2014-02-27 23:21:57 -08:00

lua_corpse.cpp

Lua doors api

2013-06-03 00:08:41 -07:00

lua_corpse.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_door.cpp

NPC Special Attacks should all work right: also huge explanation in changelog.txt

2013-07-11 13:44:45 -07:00

lua_door.h

NPC Special Attacks should all work right: also huge explanation in changelog.txt

2013-07-11 13:44:45 -07:00

lua_entity_list.cpp

Added entity_list::IsMobSpawnedByNpcTypeID

2014-02-25 23:15:14 -05:00

lua_entity_list.h

Added entity_list::IsMobSpawnedByNpcTypeID

2014-02-25 23:15:14 -05:00

lua_entity.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_entity.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_general.cpp

Some potential fixes for clang, not complete

2014-07-08 21:09:52 -07:00

lua_general.h

Added Spawn object to lua and functions to manipulate them

2013-06-23 14:48:36 -07:00

lua_group.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_group.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_hate_entry.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_hate_list.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_hate_list.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_inventory.cpp

Augment item events

2013-06-21 14:20:30 -07:00

lua_inventory.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_item.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_item.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_iteminst.cpp

Changed ItemClass enumeration to ItemClassTypes enumeration

2013-10-27 06:38:34 -04:00

lua_iteminst.h

encounter events can now watch all events by all npcs/items/quests by registering themselves to watch -1, fix #74

2013-06-22 14:23:07 -07:00

lua_mob.cpp

Some potential fixes for clang, not complete

2014-07-08 21:09:52 -07:00

lua_mob.h

Some potential fixes for clang, not complete

2014-07-08 21:09:52 -07:00

lua_npc.cpp

Revision of slow mitigation code.

2014-04-12 00:18:19 -04:00

lua_npc.h

Implement ability for NPC Merchants to open and close shop

2014-04-01 21:03:49 -04:00

lua_object.cpp

Player event export plus lua_object api

2013-06-03 16:49:47 -07:00

lua_object.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_packet.cpp

Lua packet handler dispatch

2013-07-13 13:53:41 -07:00

lua_packet.h

Lua packet handler dispatch

2013-07-13 13:53:41 -07:00

lua_parser_events.cpp

Some potential fixes for clang, not complete

2014-07-08 21:09:52 -07:00

lua_parser_events.h

Lua packet handler dispatch

2013-07-13 13:53:41 -07:00

lua_parser.cpp

Some potential fixes for clang, not complete

2014-07-08 21:09:52 -07:00

lua_parser.h

Some potential fixes for clang, not complete

2014-07-08 21:09:52 -07:00

lua_ptr.h

Added all lua objects i need for now, a ton of API too

2013-06-02 00:15:26 -07:00

lua_raid.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

lua_raid.h

Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.

2013-06-22 01:32:41 -07:00

lua_spawn.cpp

Added Spawn object to lua and functions to manipulate them

2013-06-23 14:48:36 -07:00

lua_spawn.h

Added Spawn object to lua and functions to manipulate them

2013-06-23 14:48:36 -07:00

lua_spell.cpp

Fix for Spell(int) not working in lua...

2013-07-03 15:20:42 -07:00

lua_spell.h

Fix for Spell(int) not working in lua...

2013-07-03 15:20:42 -07:00

map.cpp

Work around for msvc tuple bug

2014-06-16 15:09:17 -07:00

map.h

Added loading of v2 regular maps, also #bestz will report water info even if a reg map failed to load.

2014-05-21 17:30:54 -07:00

masterentity.h

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

maxskill.h

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

merc.cpp

Merge branch 'master' into water_map_v2

2014-05-23 16:09:46 -07:00

merc.h

Merge with master

2014-02-10 12:04:35 -05:00

message.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

mob.cpp

Changed SE_LimitMaxMana to SE_MeleeVulnerability - Weakness/Mitigation verse melee damage

2014-07-08 21:09:57 -07:00

mob.h

Implemented SE_LimitSpellClass - Focus Limits spell to pre defined categories. (3=Cures,3=Offensive, 6=Lifetap)

2014-07-08 21:09:57 -07:00

MobAI.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

mod_functions_base.cpp

Merge from master

2013-06-17 11:47:45 -07:00

mod_functions.cpp

Fix mod_spell_resist to be no-op by default ...

2014-02-16 23:58:18 -05:00

net.cpp

(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

2014-04-05 03:38:58 -05:00

net.h

Change space indentation to tabs

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

npc.cpp

Implemention for SE_Berserk, SE_Vampirism (These are not used on live)

2014-07-08 21:09:51 -07:00

npc.h

Implemention for SE_Berserk, SE_Vampirism (These are not used on live)

2014-07-08 21:09:51 -07:00

NpcAI.cpp

svn -> git Migration

2013-02-16 16:14:39 -08:00

NpcAI.h

Change space indentation to tabs

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

Object.cpp

Changed ItemUseType enumeration to ItemInstTypes enumeration - naming conflicted with definition

2013-10-27 05:45:52 -04:00

object.h

Converted SkillType typedef enumeration to SkillUseTypes enumeration

2013-10-27 13:03:41 -04:00

oldcode.cpp

Change space indentation to tabs

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

oldcode.h

Change space indentation to tabs

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

oriented_bounding_box.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

oriented_bounding_box.h

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

pathing.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

pathing.h

Partial port of der's map rewrite, no new azone format yet but it's coming. Will convert legacy map formats on the fly atm.

2014-02-23 21:17:28 -08:00

perl_client.cpp

Exported $client->SendMarqueeMessage(type, priority, fade_in, fade_out, duration, msg) - Will be available for simple plugin use

2014-04-15 12:00:33 -05:00

perl_doors.cpp

Change space indentation to tabs

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

perl_entity.cpp

Added entity_list::IsMobSpawnedByNpcTypeID

2014-02-25 23:15:14 -05:00

perl_groups.cpp

Change space indentation to tabs

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

perl_hateentry.cpp

Change space indentation to tabs

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

perl_mob.cpp

-Implemented the ability to properly use live spell projectile graphics.

2014-04-09 05:17:36 -04:00

perl_npc.cpp

Revision of slow mitigation code.

2014-04-12 00:18:19 -04:00

perl_object.cpp

Change space indentation to tabs

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

perl_perlpacket.cpp

Change space indentation to tabs

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

perl_PlayerCorpse.cpp

Raid/Group lua stuff, renamed corpses

2013-06-02 13:47:52 -07:00

perl_questitem.cpp

Changed ItemClass enumeration to ItemClassTypes enumeration

2013-10-27 06:38:34 -04:00

perl_raids.cpp

Change space indentation to tabs

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

perlpacket.cpp

Change space indentation to tabs

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

perlpacket.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

perlparser.h

Cleanup perl parsers

2013-05-09 21:25:50 -07:00

petitions.cpp

Merging

2013-05-23 00:31:02 -07:00

petitions.h

Change space indentation to tabs

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

pets.cpp

Coverted melee and magic runes to use bonuses.

2014-03-12 05:14:19 -04:00

pets.h

Add /pet hold on and /pet hold off support for UF/RoF

2013-09-13 15:20:45 -04:00

QGlobals.cpp

Function for retrieving a qglobal or list of them

2013-05-24 00:52:28 -07:00

QGlobals.h

Function for retrieving a qglobal or list of them

2013-05-24 00:52:28 -07:00

Quest.cpp

Change space indentation to tabs

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

Quest.h

Change space indentation to tabs

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

QuestInterface.h

Fixed translocate, dispatch event now returns values properly, embparser now stores errors (what few it has)

2013-06-26 09:26:19 -07:00

questmgr.cpp

Fixed a zone crash in spawn_conditions.

2014-04-25 12:40:25 -07:00

questmgr.h

Fixed a zone crash in spawn_conditions.

2014-04-25 12:40:25 -07:00

QuestParserCollection.cpp

Fix for a problem with global player quests and hasquestsub

2014-05-27 16:16:06 -07:00

QuestParserCollection.h

Fixed an order-of-operations crash within the Quest Parser classes

2014-02-14 12:30:50 -05:00

queues.h

Change space indentation to tabs

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

raid.h

Change space indentation to tabs

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

raids.cpp

Fix to SE_BlanaceMana to only check classes in group that have mana.

2014-07-08 21:09:52 -07:00

raids.h

Update to SE_BalanaceMana, SE_BalanceHP to support limit value which caps max mana/hp that can be taken per player.

2014-07-08 21:09:52 -07:00

RaycastMesh.cpp

And of course memset too way to not include the whole error message the first time jerk

2014-04-28 13:15:43 -07:00

RaycastMesh.h

RaycastMesh work der started I'm going to pick up...

2014-02-23 17:14:50 -08:00

skills.h

Converted SkillType typedef enumeration to SkillUseTypes enumeration

2013-10-27 13:03:41 -04:00

spawn2.cpp

Fixed a zone crash in spawn_conditions.

2014-04-25 12:40:25 -07:00

spawn2.h

Fixed a zone crash in spawn_conditions.

2014-04-25 12:40:25 -07:00

spawngroup.cpp

Better flee runspeed calculation.

2014-02-26 18:06:16 -08:00

spawngroup.h

Better flee runspeed calculation.

2014-02-26 18:06:16 -08:00

special_attacks.cpp

Merge branch 'master' into RunQueryToDatabaseQuery_database

2014-07-10 14:15:05 -07:00

spell_effects.cpp

Update SE_InterruptCasting: Will now work for instant spells (as well as over time).

2014-07-08 21:09:57 -07:00

spells.cpp

Implemented SE_Sanctuary - Places caster at bottom hate list,

2014-07-08 21:09:56 -07:00

StringIDs.h

Add mez break message

2014-04-22 00:48:46 -04:00

tasks.cpp

Prevented an endless loop crash related to EVENT_TASK_STAGE_COMPLETE.

2014-03-31 22:03:11 -05:00

tasks.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

titles.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

titles.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

tradeskills.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

trading.cpp

Fix for trade being retained on logout/zone

2013-06-29 12:18:40 -07:00

trap.cpp

demonstar55's entity list changes (slightly modified) and a crash fix for the #repop command used in rapid succession.

2014-02-10 10:39:12 -05:00

trap.h

Change space indentation to tabs

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

tribute.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00

water_map_v1.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

water_map_v1.h

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

water_map_v2.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

water_map_v2.h

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

water_map.cpp

Fix for fear failing, removed #fear command because it was blank anyway, added a cmake command to change the default map/water/path directory

2014-05-31 16:32:15 -07:00

water_map.h

Fix for fear failing, removed #fear command because it was blank anyway, added a cmake command to change the default map/water/path directory

2014-05-31 16:32:15 -07:00

waypoints.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

worldserver.cpp

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

worldserver.h

Change space indentation to tabs

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

zone_logsys.cpp

Change space indentation to tabs

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

zone.cpp

Initial v2 water map format.

2014-05-20 00:14:26 -07:00

zone.h

Compiler option for playing with npctype_cache as was requested for a feature. Not entirely tested may need some work. Currently defaults to old behavior on #repop.

2014-01-31 20:38:32 -08:00

ZoneConfig.cpp

Change space indentation to tabs

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

ZoneConfig.h

Remove 'using namespaces std' fixes #61

2013-05-22 16:17:19 -04:00

zonedb.cpp

Developement Branch AISpellEffects.

2014-04-25 08:52:49 -04:00

zonedb.h

Developement Branch AISpellEffects.

2014-04-25 08:52:49 -04:00

zonedbasync.cpp

High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still

2013-10-27 03:13:10 -04:00

zonedbasync.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

zonedump.h

Developement Branch AISpellEffects.

2014-04-25 08:52:49 -04:00

zoning.cpp

Prefer prefix ++/-- on non-primitive types

2014-01-13 22:14:02 -05:00