Commit Graph

186 Commits

Author SHA1 Message Date
Yehonal 921861c19f Merge branch 'master' into custom
# Conflicts:
#	modules/acore/framework/Database/Implementation/CharacterDatabase.cpp
#	src/game/Groups/GroupMgr.cpp
2016-08-13 20:41:35 +02:00
Yehonal acfdd2d3fa Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk 2016-08-13 20:32:41 +02:00
Yehonal ff6201921c created hw-core bash libraries
will be traited as a git subtree
2016-08-13 20:32:21 +02:00
Yehonal 86fc3b01f4 minor updates to mysql-tools 2016-08-13 20:32:17 +02:00
Yehonal f6221a400e Merge commit 'ce7b05ccae4549ca6e1ae2de1d3e36a8b3b82690' as 'modules/uwd/mysql-tools' 2016-08-13 20:31:44 +02:00
Yehonal d0d3ba67bc [AZTH] default conf for extra db 2016-08-13 20:26:17 +02:00
Yehonal e4f51a353b created hw-core bash libraries
will be traited as a git subtree
2016-08-13 20:25:34 +02:00
Yehonal f2143ef4ef minor updates to mysql-tools 2016-08-13 20:22:49 +02:00
Yehonal ab241be66e renamed mysql_tools 2016-08-13 19:48:25 +02:00
Yehonal 2ae721dc16 Merge commit 'd4213c19608fe15e06fca31782151eca4e903c9f' as 'modules/uwd/mysql_tools' 2016-08-13 14:02:18 +02:00
ShinDarth e9089ed793 DB/Characters: update DB structure 2016-08-12 11:49:04 +02:00
Yehonal ba04de9c97 Merge branch 'master' into custom 2016-08-12 07:48:17 +02:00
Yehonal c9610ca0b5 removed wrong submodule 2016-08-12 07:47:18 +02:00
Yehonal 86211c5137 [AZTH] Add missing tags and code/conf cleaning 2016-08-12 03:32:35 +02:00
Yehonal d11a9a8561 Merge branch 'master' into custom 2016-08-12 03:00:57 +02:00
Yehonal 7fa2d80c68 Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk 2016-08-12 02:43:52 +02:00
Yehonal c1a76e07ff Another big repo refactoring, should be latest
I've restored old paths for scripts and flattened the src structure
2016-08-12 02:40:23 +02:00
Yehonal 3972a1da63 Continuing cmake path fixing 2016-08-12 02:40:15 +02:00
Yehonal dec72dddca Fixed paths for cmake 2016-08-12 02:38:30 +02:00
Yehonal b0c8eceb08 Refactoring part 2 [W.I.P] 2016-08-12 02:38:26 +02:00
Yehonal e80aeedb9e Another big repo refactoring, should be latest
I've restored old paths for scripts and flattened the src structure
2016-08-12 02:37:42 +02:00
Yehonal 3e05d84dde [DEV-OP] [AZTH] cmake path fixing 2016-08-12 00:56:12 +02:00
Yehonal c88297db83 Continuing cmake path fixing 2016-08-12 00:55:18 +02:00
Yehonal edd301e54a Fixed paths for cmake 2016-08-12 00:52:12 +02:00
Yehonal 31591a2327 Refactoring part 2 [W.I.P] 2016-08-12 00:46:43 +02:00
Yehonal f6f4762c53 Merge branch 'master' into custom 2016-08-12 00:30:13 +02:00
Luth31 a1e8106622 Script/Commands: .account create will now grant the latest enabled expansion (Set in worldserver.conf 2016-08-11 23:57:41 +03:00
Yehonal a73ad5cd6e Corrected path for ScriptWotlkLoader 2016-08-11 21:52:49 +02:00
Yehonal e1dc2f8b01 Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk 2016-08-11 21:44:31 +02:00
Yehonal f1ab657e19 fixed an inclusion 2016-08-11 21:44:03 +02:00
Yehonal b3214eb5c0 Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git into custom 2016-08-11 21:14:34 +02:00
Yehonal 5cbfdd2871 Update README.md 2016-08-11 21:09:56 +02:00
Yehonal 3d1243197b [AZTH] imported git-bdiff 2016-08-11 21:00:48 +02:00
Yehonal 80453e215e Rewritten cmakes allowing compilation with new structure 2016-08-11 20:25:42 +02:00
Yehonal 0f85ce1c54 Big re-organization of repository [W.I.P] 2016-08-11 20:25:27 +02:00
Yehonal d11d3851aa [AZTH] Fix cmake 2016-08-11 20:08:57 +02:00
Yehonal 4b959267f9 Rewritten cmakes allowing compilation with new structure 2016-08-11 20:07:14 +02:00
Yehonal 8ced823acf Big re-organization of repository [W.I.P] 2016-08-11 19:18:36 +02:00
Yehonal a6dde657de Using more appropriate NS prefixes for our macro and cmake vars 2016-08-11 17:27:09 +02:00
Yehonal e5c88fd7ee Merge branch 'master' into custom 2016-08-11 14:57:52 +02:00
Luth31 a2c8a0a24e Fix CMake on Windows 2016-08-11 00:03:15 +03:00
Yehonal 3e0270d0eb [AZTH] updated gitlogger 2016-08-08 15:25:04 +02:00
Yehonal b878f2217e [AZTH] removed sql imported in public repo 2016-08-08 15:13:20 +02:00
Yehonal a99323aa1b Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git
# Conflicts:
#	src/server/worldserver/worldserver.conf.dist
2016-08-08 12:28:38 +02:00
Yehonal 9ae79b282f multiple changes to sync with public repository
* Some AZTH has been converted to official changes for public repo
2016-08-08 12:14:04 +02:00
ShinDarth a7a81f90b1 Merge branch 'master' into git 2016-08-07 14:55:21 +02:00
Yehonal 7a9d176088 Merge branch 'gh-master'
# Conflicts:
#	.gitignore
#	data/sql/updates/world/2016_07_28_00.sql
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/scripts/Pet/pet_dk.cpp
2016-08-07 12:59:26 +02:00
Yehonal 47c2b72123 Merging 2016-08-07 12:47:10 +02:00
Yehonal 648163a2e0 Fixed .gitignore to support modules inclusion 2016-08-07 12:24:00 +02:00
Yehonal a1c27e7fe6 Merge branch 'master' of gitlab.com:azerothshard/azerothcore 2016-08-07 11:38:13 +02:00