Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Browse files Browse the repository at this point in the history
  • Loading branch information
@csnv
csnv committed Feb 15, 2025
2 parents 3527632 + c1fa550 commit db6e9c4
Show file tree
Hide file tree
Showing 1,548 changed files with 3,946 additions and 3,880 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/cJSON/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/http-parser/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libbacktrace/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/extra/gen/grammar.y
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- mode: C -*- */
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/extra/gen/scanner.l
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- mode: C -*- */
/* --------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/libconfig.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/libconfig.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/parsectx.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/scanctx.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/scanctx.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/scanner.c
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 3rdparty/libconfig/strbuf.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/strbuf.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libconfig/wincompat.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
Copyright (C) 2013-2024 Hercules Dev Team
Copyright (C) 2013-2025 Hercules Dev Team
Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libgif/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/llhttp/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/multipart-parser/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/sfmt/Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ If you are reading this in a text editor, simply ignore this section
### Removed
-->

## [v2025.01] `January 2025`

### Added

- Added some validation checks for unusual/suspicious whitespace in incoming chat messages. (#3335)

## [v2024.11] `November 2024`

### Changed
Expand Down Expand Up @@ -3192,6 +3198,7 @@ Note: everything included in this release is part of PR #3198 which consists of
- New versioning scheme and project changelogs/release notes (#1853)

[Unreleased]: https://github.com/HerculesWS/Hercules/compare/stable...master
[v2025.01]: https://github.com/HerculesWS/Hercules/compare/v2024.11...v2025.01
[v2024.11]: https://github.com/HerculesWS/Hercules/compare/v2024.10...v2024.11
[v2024.10]: https://github.com/HerculesWS/Hercules/compare/v2024.09...v2024.10
[v2024.09]: https://github.com/HerculesWS/Hercules/compare/v2024.08...v2024.09
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is part of Hercules.
# http://herc.ws - http://github.com/HerculesWS/Hercules
#
# Copyright (C) 2012-2024 Hercules Dev Team
# Copyright (C) 2012-2025 Hercules Dev Team
# Copyright (C) Athena Dev Teams
#
# Hercules is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion conf/api/api-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/char/char-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/clans.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2017-2024 Hercules Dev Team
//= Copyright (C) 2017-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/common/emblems.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/common/inter-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/common/map-index.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/common/socket.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/emotes.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/global/console.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/global/sql_connection.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/api-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/battle.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/char-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/emblems.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/inter-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/login-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/logs.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/map-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/script.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/import-tmpl/socket.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/login/login-server.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/map/battle.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion conf/map/battle/battle.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
//= Copyright (C) 2014-2024 Hercules Dev Team
//= Copyright (C) 2014-2025 Hercules Dev Team
//=
//= Hercules is free software: you can redistribute it and/or modify
//= it under the terms of the GNU General Public License as published by
Expand Down
Loading

0 comments on commit db6e9c4

Please sign in to comment.