KimLS
ee8b950df1
Merge branch 'master' into web_interface
2014-12-07 13:23:55 -08:00
KimLS
29b4498534
Hopefully completely merged from master in what is the biggest merge ever
2014-12-07 13:23:16 -08:00
Akkadius
afd3b9acdc
Header and code cleanup of debug.cpp
2014-12-07 03:02:57 -06:00
Michael Cook (mackal)
3e73df2c72
Clean up common/misc_functions.h
2014-12-06 21:56:14 -05:00
Trevius
5713dc2de1
Guild Names now display properly in RoF2.
2014-12-06 18:18:49 -06:00
Trevius
206bbe9e62
Merge branch 'master' of https://github.com/EQEmu/Server
2014-12-06 14:39:32 -06:00
Trevius
97a34b5793
The RoF2 client is now enabled by default. It is almost caught up to RoF Client compatibility.
2014-12-06 14:38:34 -06:00
Michael Cook (mackal)
51b997aa27
Implement OP_ClearAA and OP_ClearLeadershipAbilities for SoF+
...
This is nice since #resetaa will no longer require a kick
2014-12-05 22:29:41 -05:00
Uleat
60563aead6
Added MapKrono entry to RoF2::InventoryMaps enumeration
2014-12-05 19:33:25 -05:00
Trevius
f1260a598d
Merge branch 'master' of https://github.com/EQEmu/Server
2014-12-04 23:07:23 -06:00
Trevius
36c945a77c
Updated a large number of RoF2 opcodes.
2014-12-04 23:06:43 -06:00
Michael Cook (mackal)
0a8f3554e9
Merge branch 'master' into random
2014-12-04 13:07:32 -05:00
Trevius
af42af7869
Initial addition of the RoF2 client from May 10th 2013 (currently available on Steam as the F2P client).
...
RoF2 is disabled by default, but you can enable by editing /common/patches/patches.cpp (see comments)
2014-12-04 02:13:01 -06:00
Michael Cook (mackal)
dc0eb0f6b5
Merge branch 'master' into random
...
Conflicts:
zone/command.cpp
zone/merc.cpp
2014-12-02 14:05:55 -05:00
Trevius
24ea7a0d45
Mercenaries now spawn as the same Gender and Size of the Merchant they are purchased from.
...
Mercenaries now spawn with randomized facial features when purchased.
Setting a lastname for NPCs will now override any hard coded lastname (such as GM Trainers).
2014-12-01 19:54:01 -06:00
Michael Cook (mackal)
6f867ebca3
Add license info
2014-12-01 19:50:05 -05:00
Michael Cook (mackal)
395be050a3
Switch random function to std::mt19937
...
Added class EQEmu::Random
Functions:
EQEmu::Random::Int(int low, int high)
EQEmu::Random::Real(double low, double high)
EQEmu::Random::Roll(int required)
EQEmu::Random::Roll(double required)
EQEmu::Random::Reseed()
For zone, you will access the random object through the zone object
ex.
zone->random.Int(0, 100);
Int returns a random int between low and high
Real returns a random double between low and high
Roll(int) returns true if Int(0, 99) < required is true
Roll(double) returns true if Real(0.0, 1.0) <= required is true
2014-12-01 18:13:12 -05:00
Michael Cook (mackal)
a59cdc2c89
Merge pull request #304 from KayenEQ/Development
...
Implemented archery projectiles to do damage on impact.
2014-12-01 16:30:26 -05:00
Akkadius
c0b546921e
Merge pull request #297 from addtheice/warning_suppress
...
Warning suppress
2014-11-30 15:54:23 -06:00
KayenEQ
e8ae28b439
Merge git://github.com/EQEmu/Server into Development
2014-11-29 20:56:13 -05:00
akkadius
5d5c3fbfd1
database.h forward declaration
...
database.cpp #include house-keeping
2014-11-29 04:30:03 -06:00
KayenEQ
ca3b5a3221
Merge git://github.com/EQEmu/Server into Development
...
Conflicts:
changelog.txt
2014-11-29 03:22:11 -05:00
Trevius
84fa042c75
Fixed a zone crash related to numhits for spells.
...
Fixed a query related to group leaders logging in.
Fixed a world crash related to attempting to join an adventure with Mercenaries.
2014-11-28 20:23:42 -06:00
Michael Cook (mackal)
b7c19e4034
Fix model_name in RoF Arrow_Struct
2014-11-28 02:19:45 -05:00
KayenEQ
94a0cb3522
Merge git://github.com/EQEmu/Server into Development
2014-11-28 01:07:55 -05:00
akkadius
baa7a1feb9
Disabling file check for db_updater.pl temporarily to force update the update script for users. Will leave it this way for a few weeks and the nre-enable it because the latest one supports automatic update checking
2014-11-27 23:24:32 -06:00
KayenEQ
191aa575f8
Projectiles (ie Arrows) fired from an archery attacks will do damage upon
...
actually hitting the target, instead of instantly when fired. Consistent
with live.
Optional SQL added to disable this.
Throwing will be implemented in a future update.
2014-11-27 22:12:13 -05:00
Akkadius
f0881d4aa9
Self patching db_update script for when new versions come out
2014-11-27 00:03:49 -06:00
Uleat
cfa05587fc
Added versioning for required ornament inventory sql
2014-11-26 21:05:43 -05:00
Michael Cook (mackal)
32a034bd58
Flipped logic wrong :P
2014-11-26 19:12:04 -05:00
Michael Cook (mackal)
2814130aad
Fix for compilers w/o C++11 uniform initialization
2014-11-26 19:04:20 -05:00
Michael Cook (mackal)
c5c778f575
Minor bug fixes
2014-11-26 18:29:07 -05:00
Natedog2012
daec5bde66
Item Transformation now works!
2014-11-26 17:23:04 -05:00
Akkadius
5c5cde7fe5
Database::GetGroupLeaderForLogin fix
2014-11-26 00:31:50 -06:00
Trevius
bee04c1b53
Merge branch 'master' of https://github.com/EQEmu/Server
2014-11-24 02:36:13 -06:00
Trevius
2fbe6b304c
Added Rule NPC:EnableMeritBasedFaction (disabled by default) - Allows faction gain to work similar to experience.
2014-11-24 02:32:33 -06:00
Akkadius
02e82f1cfc
Fix for bot build
2014-11-24 02:06:51 -06:00
Akkadius
50a69a8e20
Finish of automatic corpse convert routine
2014-11-24 01:53:21 -06:00
Akkadius
a5207b58e1
Added namespace Convert:: to contain all of the player profile and corpse related structs so that when any of the structs change else where in the code, it does not break the conversion scripts. These are self contained structs just for the conversion scripts.
2014-11-24 01:12:12 -06:00
Akkadius
3c2b8d13b9
Restructure and refactoring of database convert/upgrade check routine, breaking out to individual functions
2014-11-23 23:46:06 -06:00
Akkadius
e4f45d7b35
Removed DBCore::RunQuery
...
Converted last corpse.cpp function that mixed database code with corpse code
2014-11-23 22:57:46 -06:00
Akkadius
ce248d83d6
Corpse Class Private scope variables renamed for understandability across the source
...
Removed ThrowDBError from the source
Implemented MySQL query error log at the root of the MySQL API
Readability changes
2014-11-23 21:37:42 -06:00
Akkadius
6b67c3736b
Increased Max charge or stack count on corpses to uint16 (Beyond 1k)
...
Fixed the deletion of items so that they occur immediately when removed from corpse instead of clicking 'Done'
Fixed loading of item tints and other fields since atoi caps at 2147483647
2014-11-23 19:51:01 -06:00
Akkadius
f328853251
More restructures, non-working state
2014-11-22 23:28:20 -06:00
Akkadius
111fb84041
Moved zonedatabase functions out of corpse.cpp
...
Conversion portion mostly complete
Some header readability cleanup
Some function renaming
Struct renaming
Many variable renaming
MySQL error log for all of QueryDatabase
Corpse table renaming
Corpse table field renaming
Most corpse database functions redone
2014-11-22 17:55:48 -06:00
Arthur Ice
fdd78e41da
warning from library file SocketLib\Mime.cpp disabled
2014-11-19 21:22:37 -08:00
KimLS
c506e33018
Fixed merge
2014-11-18 21:12:48 -08:00
Michael Cook (mackal)
d7e05de556
Merge pull request #292 from KayenEQ/Development
...
Updated swarm pet AI to be consistent with live.
2014-11-18 15:04:08 -05:00
Michael Cook (mackal)
0b44f58518
Correct OP_AugmentInfo reply
...
This fixes the display issue for RoF
SoF/SoD/UF still won't show the charm info on Adventurer's Stone,
probably a client bug.
2014-11-17 16:41:37 -05:00
Akkadius
9d6248886c
Turn off potential warning garbage for different versions of perl
2014-11-16 21:22:09 -06:00