Skip to content

Commit

Permalink
Merge branch 'main' into fix/map-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
elsongabriel authored Feb 29, 2024
2 parents 1d8c82f + 414ddc1 commit b6a5d77
Show file tree
Hide file tree
Showing 382 changed files with 8,567 additions and 74,718 deletions.
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
BinPackArguments: true
BinPackParameters: true
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
Expand All @@ -42,7 +43,6 @@ BraceWrapping:
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: All
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
Expand Down
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,6 @@ other open-source initiatives.
<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg" alt="JetBrains" width="150" />
</a>

## Project supported by [TNT Cloud](https://tntcloudbr.com.br/)

Thanks for supporting our open-source project with your game cloud hosting services.

<a href="https://tntcloudbr.com.br/">
<img src="https://tntcloudbr.com.br/logo.png" alt="TNT Cloud - Game Hosting" width="300" />
</a>

### Partners

[![Supported by OTServ Brasil](https://raw.githubusercontent.com/otbr/otserv-brasil/main/otbr.png)](https://forums.otserv.com.br)
6 changes: 5 additions & 1 deletion config.lua.dist
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,15 @@ multiplierSpeedOnFist = 5
maxSpeedOnFist = 500
disableLegacyRaids = false
disableMonsterArmor = false
combatChainDelay = 50
minElementalResistance = -200
maxElementalResistance = 200
maxDamageReflection = 200

-- Chain system
toggleChainSystem = true
combatChainDelay = 50
combatChainTargets = 5

-- Global server Save
-- NOTE: globalServerSaveNotifyDuration in minutes
globalServerSaveNotifyMessage = true
Expand Down
69 changes: 0 additions & 69 deletions data-canary/scripts/actions/other/cask_kegs.lua

This file was deleted.

17 changes: 0 additions & 17 deletions data-canary/scripts/actions/other/scroll_of_ascension.lua

This file was deleted.

33 changes: 0 additions & 33 deletions data-canary/scripts/movements/swimming.lua

This file was deleted.

Loading

0 comments on commit b6a5d77

Please sign in to comment.