Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,789 Commits 4 Branches 146 Tags
fb9d4cba442e503350648aa224fde7867526ed2d
Commit Graph

99 Commits

Author SHA1 Message Date
Carbenium
fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4 
Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp
 2015-07-22 00:26:09 +02:00
Carbenium
79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Carbenium
c0ee4ceac4 Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
 2015-07-21 19:02:53 +02:00
Nayd
360075129e TDB 335.58 - 2015/03/21 2015-03-21 22:06:46 +00:00
Naios
2bd1c8541d Core/Updates: Add an automatic database update system. Automatically detects new and edited sql updates through file lists and hashing. Detects renames, deletes and is able to create and auto import full databases. * cleanups in main.cpp of world & bnetserver * refactoring in DatabaseWorkerPool.h & MySQLConnection.cpp 
Make sure you re-run cmake, because boost::iostreams was added as dependency.
Maybe you need to install libboost-iostreams1.55-dev on unix as well.

Import every update manual until (included) those INSERT IGNORE updates for each database.

Thanks DDuarte and Shauren for your amazing ideas, help and advises.

In hope that nobody gets a "Your database structure is not up to date..." anymore ,-)

(cherry picked from commit 352012e531)
(cherry picked from commit 1f7f9feafc)

For 3.3.5:
* Synchronized ConfigureBoost.cmake with 6.x, libboost-filesystem1.55-dev also added as dependency!

Signed-off-by: Naios <naios-dev@live.de>
Signed-off-by: Nayd <dnpd.dd@gmail.com>
 2015-03-21 20:54:54 +00:00
Vincent-Michael
7b9bcbea8e SQL: Sync auth database 2014-12-21 20:43:57 +01:00
Nyeriah
c79af3f16f Core/RBAC: Allow setting different default security level roles to different realms 2014-12-10 18:43:14 -02:00
Heihachi
3e03e546d3 Scripts/Commands: mod xp command 
Closes #13476
 2014-11-11 00:45:30 +00:00
ShinDarth
fd0b961781 Core/Commands: implement .pvpstats command 
Shows number of battleground victories in the last 7 days

Closes #13460
 2014-11-10 22:30:20 +00:00
DDuarte
5bf55eacfd Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Instances/InstanceScript.h
	src/server/scripts/Northrend/isle_of_conquest.cpp
	src/server/shared/Database/Implementation/LoginDatabase.cpp
	src/server/shared/Database/Implementation/LoginDatabase.h
 2014-10-19 00:18:06 +01:00
Heihachi
15a9c6729e Scripts/Commands: Implement mutehistory command for GM's with requested improvements 
Closes #13350
 2014-10-18 23:34:18 +01:00
Nyeriah
2f016098c2 Scripts/Commands: Implement commands to set and get boss states during run time 
Closes #13186
 2014-10-18 22:05:04 +01:00
Shauren
1ef31ba752 Battle.net: Implemented cache stream items 2014-10-13 17:22:24 +02:00
Vincent-Michael
9cb92f93aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp
 2014-08-29 06:24:08 +02:00
Odyssey
8adde791d8 Scripts/Commands: Implement .guild info command 
Displays a information summary about the selected player guild or a given guildId or Name

Closes #12949

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 23:04:52 +01:00
Vincent-Michael
cb37e2c9d1 SQL: Sync auth_database 2014-08-28 22:37:46 +02:00
Subv
dfdc19f3bc Merge branch master into boost 
Conflicts:
               BattlegroundMgr.h
 2014-07-13 16:52:38 -05:00
Vincent-Michael
79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
 2014-07-09 21:09:47 +02:00
joschiwald
7a67d816d9 Core/Battleground: 
* added a possibility to reload battleground templates
* cleaned up the template structure
* use mapids from BattlemasterList.dbc to calculate random bg
 2014-07-09 16:43:56 +02:00
Vincent-Michael
6a6403a54e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/CMakeLists.txt
 2014-07-09 10:23:14 +02:00
Vincent-Michael
f9b5cea15c SQL: Sync auth_database 
thx to @Wulfr
Close #12443
 2014-07-08 11:45:46 +02:00
Vincent-Michael
50cf908d78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.h
 2014-06-25 19:51:27 +02:00
Vincent-Michael
f825d6b738 SQL: Sync auth_database 2014-06-25 18:40:03 +02:00
Vincent-Michael
d8234bed42 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
 2014-06-23 23:47:48 +02:00
Ascathor
6949735098 Core/Misc: 
* Fix some codestyle, fix some typos

* Change CMakeLists for: Custom (can be uncommented), Events, World
** Custom is theoretically unchanged. You can, however, uncomment the glob_recurse that initializes every file within. This might be easier for beginners.

* Introducing the IP Based Action Log System:
** On several different actions, e.g. Login, Character Login, etc., a new entry is added
** Can be logged on and off in worldserver config
*** Disabled by default to prevent increased log db size for unknowing users.

* Add a new row to account table called 'last_attempt_ip'
** Lists the last ip trying to connect to the account

* Add a new type of HookScripts: AccountScript
** Includes: OnAccountLogin, OnFailedAccountLogin, OnEmailChange, OnFailedChange, OnPasswordChange, OnFailedPasswordChange

* Added new Hook to PlayerScripts: OnFailedPlayerDelete

* Added new variables to PlayerScripts: OnPlayerDelete
 2014-06-13 16:25:11 +02:00
Shauren
434b3a80e1 Core/Commands: Added a set of commands to manage battle.net accounts 
TODO: Ban commands, linking game accounts to battle.net accounts
 2014-06-08 17:58:28 +02:00
Shauren
9f69eda67f Core/Battle.net: Additional checks 
* Force grunt login for versions < 15595
* Force bn login if supported and game account is linked to bn account
 2014-06-08 15:34:24 +02:00
Shauren
05c0524bf3 Core/Battle.net: Refactored handling multiple game accounts 2014-06-08 14:54:37 +02:00
Shauren
372f043a68 SQL: Sorted out temporary names and added missing statements 2014-06-08 13:02:16 +02:00
Shauren
bdd6e9aa8a Core/Battle.net: Implemented reconnects 2014-06-01 13:56:36 +02:00
Shauren
d9f1d6466d Core/Battle.net: Implemented authserver 2014-05-06 23:43:29 +02:00
Vincent-Michael
65ae868cc8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
 2014-04-28 23:00:41 +02:00
Vincent-Michael
1fd6210aa5 SQL: Update old .sql files to keep consistency with auth_database.sql 
Also update characters_database.sql (generated by mysqldump)
 2014-04-28 13:47:08 +02:00
Vincent-Michael
1390621f4d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp
 2014-04-25 23:42:40 +02:00
Vincent-Michael
c81d6e9b4b Core/Texts: 
* Enable some BroadcastTexts stuff (is not finish)
* Added reload command for broadcast_text table
ToDo:
- Enable: Sound/Emote stuff, etc.
- Auth base need refresh
 2014-04-25 23:25:59 +02:00
Vincent_Michael
7e527f9075 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp
 2014-01-19 20:52:16 +01:00
Vincent_Michael
313b294d6b Core/RBAC: Fix difference problems with 4.3.4 2014-01-19 20:48:15 +01:00
Vincent_Michael
e8be55aa8b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/TotemAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.h
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2013-12-08 20:27:46 +01:00
Carbenium
fa2616fe4e Add mailbox command 2013-12-06 21:37:55 +01:00
Spp
cd48662233 Core/Logging: Minor changes 
- Select stderr when writing ERROR and FATAL messages
- Simplify function defines
- Fix `logs` table structure with latest logging changes
 2013-11-11 14:35:16 +01:00
Shauren
75a790ca47 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-26 17:06:50 +02:00
Vincent-Michael
a0b3863bd1 SQL: Update auth base 2013-10-17 12:17:47 +02:00
Shauren
fca4a5448a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-07 14:30:37 +02:00
Spp
0c0ff98344 Core/RBAC: Fix errors in RBAC sql related to ea2fe0217d 2013-09-30 11:55:51 +02:00
Spp
ad29676c27 Fix compile under linux and update auth db with latest changes 2013-09-29 14:15:58 +02:00
Vincent-Michael
974bf5c427 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
 2013-09-11 22:35:45 +02:00
Nay
6d3ebe925f SQL: Update sql/base/auth_database.sql 2013-09-10 23:21:27 +01:00
Vincent-Michael
611d51af98 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_debug.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-09-02 22:53:44 +02:00
Ascathor
722a6c143a Core/Account: Make account password change security variable and various changes 
Settings within worldserver.conf:

Three settings for secruity level:
0 - None - No change to current system
1 - Email - Always requires the email entered on registration for confirming.
2 - RBAC - Groups applied with the RBAC role always require the email entered on registration for confirming.

RBAC default to every group. Changed some logs to make it more clear what is going on at all.

Emails may now no longer exceed 64 chars. Current email is used as regmail.

On account creation, two emails are saved. Registration email and normal email. Normal email is relevant afterwards. Registration email can be changed by console ONLY.

Includes new commands and changes to existing ones:
.account fulfills several new functions:
* Still prints GM Level.
* If account has permission, it displays the current email. This is not defaulted to any group.
* Security level is displayed. Also displays if user has RBAC perm if RBAC security mode is selected
.account email allows user to change email with sufficient confirmation
.account set sec email allows higher sec with higher sec than account to change the normal email. Registrationemail remains untouched here.
.account set sec regmail allows console to change registration email.
.pinfo now displays the registration and normal mail.

Also fixes .learn all crafts.
Closes #10558
 2013-09-01 21:21:16 +02:00
Nay
a7527b3b48 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/tools/map_extractor/mpq_libmpq04.h
 2013-08-25 14:12:32 +01:00