Commit Graph

11 Commits

Author SHA1 Message Date
郑佩茹
a44c241430 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/apps/worldserver/worldserver.conf.dist
#	src/server/game/Battlegrounds/Battleground.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/World/World.cpp
2022-07-13 10:31:30 -06:00
ZhengPeiRu21
a6e8f060a5 feat(Core/Config): Configurable Water Breath Timer (#11945)
* feat(Core/Config): Configurable Water Breath Timer

* Config Formatting

Add missing linebreaks

* Use int instead of float for water breath timer

* Correctly get CONFIG_WATER_BREATH as Int instead of Float value

* Move CONFIG_WATER_BREATH_TIMER to WorldInt configs

* More logical WaterBreath configuration
2022-07-10 14:14:27 -04:00
郑佩茹
98c22aa96d Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-06-21 13:23:18 -06:00
Kitzunu
73bd2b446c fix(Core/Groups): Level restriction on allowing raid groups (#12110) 2022-06-21 13:18:03 -03:00
郑佩茹
743479e817 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-06-16 10:06:30 -06:00
郑佩茹
7cc44a4ab1 Merge branch 'breathTimerConfig' into Playerbot 2022-06-16 10:06:05 -06:00
ZhengPeiRu21
2d7cba14db Merge branch 'azerothcore:master' into Playerbot 2022-06-10 08:51:40 -06:00
Kargatum
94528cd44d feat(Tools/DbImport): implement separated app for importing DB (#11614) 2022-06-09 08:23:38 -03:00
郑佩茹
46e9e82118 feat(Core/Config): Configurable Water Breath Timer 2022-06-03 12:34:31 -06:00
郑佩茹
b314b3a711 Merge branch 'master' into Playerbot 2022-05-31 09:11:39 -06:00
Kargatum
4fbec972a8 refactor(Cmake): add support build selected applications and tools (#11836) 2022-05-31 17:05:39 +07:00