102 Commits

Author SHA1 Message Date
Jittapan Pluemsumran
ac558d7c1e
Initial implementation of pet evolution system + Pet DB conversion to YAML (#3544)
* Implemented official pet evolution system
* Added evolved pets to pet database
* Corrected various pet system mechanics
* Migrated pet database to YAML format and the converter from CSV format

Thanks to @Lemongrass3110 @aleos89 and @Atemo for their suggestions and additional fixes
2019-03-26 22:51:57 +07:00
Lemongrass3110
232b3885b5
Fixed csv2yaml for guild skill tree (#4018)
It now properly uses skill names instead of the skill id.

Fixes #4017
2019-03-17 21:54:09 +01:00
Daegaladh
cbe0d6b271 Splitted guild_skill_tree.txt into re and pre-re (#3841)
Converted Guild Skill Tree database to YAML

Please run csv2yaml to convert your existing databases if necessary.

Thanks to @aleos89, @Atemo and @Lemongrass3110
2019-03-11 19:57:52 +01:00
Lemongrass3110
c2899d754f
Added the skeleton for the yaml converter (#3991)
Updated travis to build tools as well.

Thanks to @aleos89 for this help.
2019-03-01 00:41:20 +01:00
Lemongrass3110
7c271d7edc
Disabled iterator sanity checks on VS (#3760)
Fixes #3750

Thanks to @teededung and @aleos89
2018-12-18 18:51:56 +01:00
Lemongrass3110
c0793a8072
Adding LGTM to CI tools (#3636)
Thanks to @aleos89 for his help.
2018-10-29 21:25:36 +01:00
Aleos
a5af358bf7
Updated mapcache tool (#3406)
* Fixes #3046.
* Mapcache tool now reads the import directory.
Thanks to @secretdataz suggestion!
2018-08-27 14:16:08 -04:00
Aleos
11b42569fc
Synchronized source file headers (#3212)
* Alphabetically sorted includes.
* Updated copyright and license text to match across all files.
* Removed pragma once define in header files in lieu of ifdef guards.
2018-06-20 18:08:30 -04:00
Lemongrass3110
801d3ed942
Moved common, config and mapcache to C++ (#3200)
Dropped BETA_THREAD_TEST and everything around it
Dropped mt19937
Replaced msinttypes with cinttypes
Removed IRC link and updated README name
2018-06-14 21:51:58 +02:00
Sader Fawall
eb8f33e40f Corrected mapcache build (#2715)
* Removed the hyphen from the name in the Windows build.
Thanks to @sader1992!
2017-12-20 10:02:52 -05:00
Lemongrass3110
a2e8d02752 Respect the default platform toolset (#2609)
With this you will not have to upgrade your solution everytime you clone a fresh copy of rAthena and the problem with having to stash between branch switches should also be gone.
If you want to compile it for another toolset you simply have to set the target toolset by yourself.
2017-11-19 12:19:36 -05:00
Lemongrass3110
caf31521d0 Fixed an import issue in mapindex (#2512)
* Fixes #2511.
Thanks to @Daegaladh for his input!
2017-10-19 14:11:56 -04:00
Lemongrass3110
76786e2977 Cleaned up visual studio project minicore (#2166)
Cleaned up leftover defines(PCRE_SUPPORT and FD_SETSIZE) in the projects
2017-06-20 22:25:24 +02:00
Lemongrass3110
07b2ef28a0 Added Visual Studio x64 support
Removed the .dll files for the libraries from the root directory.
They are now copied from the 3rdparty folder when your build finishes and the project requires them.
If you clean your project they will also automatically be removed from the root directory again.

Updated libraries:
MySQL 5.0.20 -> 6.1.9
PCRE 8.30 -> 8.33.0.1 UTF8

Both Win32 and x64 are now supported. Remember to clean and build when you switch the target platform, otherwise you will end up with the wrong .dll files at runtime.
2017-04-28 13:40:08 +02:00
Lemongrass3110
31cd394d1d Follow up to 4cfaa18
Removed the duplicated lines
Also removed project dependencies for libconfig and mt19937ar from common-minicore
2017-04-27 11:06:59 +02:00
Jittapan Pluemsumran
4cfaa1817b
Removed unneccessary library includes 2017-04-27 15:05:08 +07:00
Lemongrass3110
4348ef3b89 Added a -D equivalent for msbuild
Fixes appveyor not building in pre-renewal mode
See original commit 15b4050
2017-04-26 03:44:37 +02:00
Lemongrass3110
bfeb697933 Redirected build output into the .vs folder 2017-04-26 03:38:08 +02:00
Lemongrass3110
448e5e893f Moved the bat scripts into the tools folder
Added post build copies and post cleanup deletions for the required bat scripts for each project
2017-04-26 02:58:39 +02:00
Jittapan Pluemsumran
fcba7b7213
Added missing EOL in project files 2017-04-25 23:11:58 +07:00
Florian Wilkemeyer
4f47f1fab0 Added Visual Studio 2013 Solution && Clean Project Files with proper dependencies
- x64/AMD64 Support prepared (will be added in a followup commit, it needs some changes in 3rdpary libs)
2016-04-25 12:49:35 +02:00
Lemongrass3110
be3376f470 Fixed some addtional cppcheck warnings
int8 is not readable with scanf though
2015-05-13 14:48:37 -04:00
Lighta
d1eeda3466 Fix 'make tools' target for ./configure
Fix update.pl wasn't able to recompile due to path error.
2015-03-15 04:24:58 -04:00
aleos89
2d2991a1fd TXT reference removal from emulator.
- Removed any remaining TXT and SQL references from files.
- The 'make sql' command is now replaced by 'make server'.
- Removed account.engine feature as it is no longer needed.
- Moved login and IP ban configs to inter_athena.conf.
- Cleaned up cmake files.
- Miscellaneous clean ups.
2014-09-03 17:44:35 -04:00
lighta
b124498263 Fix -WShadow definition warning
Cleanup some leftover
2014-06-27 06:07:50 -04:00
Lighta
55134d1ae1 Fix ARM compilation.
-Upd configure (merge with Hercule configure.in)
-upd nullpo.c and atomic.h to allow arm compilation, testedon Epiphany parallela.
2014-06-22 17:06:02 -04:00
lighta
82a1c702dc Upd Makefile
Fix small typo in intif.h, ifndef was being unused.
Upd Makefile to simplify libconfig inclusion
2014-05-03 03:05:58 -04:00
brianluau
a2bdc47daf - Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 02:53:33 +00:00
greenboxal2
a7c32653f7 Applied AStyle code formating as discussed on tid:74602.
Removed /SAFESEH option from MSVC11 projects.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25 21:20:43 +00:00
glighta
0743650416 -Apply mkdu95 fix for bugreport:5145 preventing clone if player dead, (for slave and evil clone)
-Fix old fread, fgets warnings, displaying a msg errors when failed now
-Cleaning checkweight debug showinfo


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16952 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 05:53:29 +00:00
momacabu
f21454e1db - Fixed dumb warning (follow up to r16950) -_-
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16951 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 04:34:12 +00:00
momacabu
96c2cf57d3 - There will now be a warning regarding to map name length limitation (part of bugreport:1688).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-23 04:19:16 +00:00
shennetsind
1016106fc7 Follow up r16884 fixed a typo =X
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16885 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-09 02:45:20 +00:00
shennetsind
dc9a5da1c6 Fixed bugreport:6209 / Follow up r16867 : updated mapcache to write onto its proper map_cache.dat depending on the instance's #RENEWAL
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16884 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-09 02:27:33 +00:00
blacksirius
b3b21e6e8c Fixed bugreport:5990 OSX compiling error / warnings
Bug in Detail:
 - Misplaced LDFLAGS uage in some Makefile templates (by passing them to the compiler not to the linker.)
 - Wrong usage of volatile (a functions return value couldnt be declared to return volatile :D )
 - Unsupported Inline ASM using lock xchg operation on llvm-gcc .. (apple loves this ..)

Fixed by:
 - Removed unnecessary LDFLAGS 
 - Removed unnecessary volatile declarator
 - Replaced InterlockedExchange and InterlockedExchange64 with gcc intrinsics. 



git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16270 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-11 23:31:19 +00:00
blacksirius
d1746e052d feature merge bs-coreoptimize->trunk: Build Output Cleanup, Makefile Common Dependency Handling
- "Optimized" the build Output using Makefiles - to Kernel style build output.
- Changed dependency handling to common (core), by generating one lib file (ar) and link against that
	instead of assigning all deps individually in every subproject
- Changed header dependency handling in Subproject makefiles - requiring all common/ headers. 



git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16198 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01 10:46:02 +00:00
eathenabot
2f87c4dd0b - Full revert of r16105 and r16106.
* Merged changes up to eAthena 15094.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16110 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-13 17:14:43 +00:00
eathenabot
0769329223 * Merged changes up to eAthena 15095.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16105 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 20:14:01 +00:00
shennetsind
8761ef9d54 Fixed 2 buildbot warnings throughout multiple operating systems.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16037 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-02 03:28:56 +00:00
flaviojs
083ff3d160 - Fixed CMake compilation (libconfig integrated into common_base).
- Chanced libconfig.h include directives to double-quoted form (never use the system version of libconfig.h).
- Removed ShowError/ShowNotice from sig plugin (showmsg.c depends on core.c).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15737 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-20 16:59:07 +00:00
gepard1984
e314187787 Updated CMakeLists (follow-up to r15572, r15586) (patch provided by Saithis, pid:82588).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15651 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-02 19:57:29 +00:00
gepard1984
4113c9de4a - Removed outdated version number handling (follow-up to r11503).
- Fixed mapcache compilation issues in Linux.
- Added some missing `svn:ignore` properties.
- Moved `BLOCK_SIZE` definition from header to source file.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15586 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-16 17:09:43 +00:00
gepard1984
22f0714c07 - Added libconfig (configuration file library: http://www.hyperrealm.com/libconfig/):
- Updated VS9/10 project files.
   - Updated `configure` & `Makefile`s.
 - New GM, Commands & Permissions system:
   - '''This is a backwards compatibility breaking update''', please read tid:58877
   - Replaced GM levels with Player Groups.
   - Commands permissions & other privileges now depend on group, not GM level.
 - `@help` command improvements: requires "commandname" param and shows more detailed info about commands.
 - Modified GM whisper system to deliver messages basing on permissions, not GM level.
 - Remote trade request is now possible only if player is allowed to use `@trade` command as well.
 - Added a proper permission to use `/changemaptype` command.
 - `clif_displaymessage` is now capable of displaying multiline messages.
 - All `ACMD_FUNC`s are static now, and the only way to invoke them is with `is_atcommand()`; all client commands (starting with `/`) are now translated into corresponding atcommands (with exception of `/kick` used on monster, as there is no atcommand to kill single monster).
 - Removed nonsense "bot check" triggering when player blocked (`/ex`) Server.
 - Merged `@monster`, `@monsterbig` and `@monstersmall`.
 - Improved flow of atcommand execution to avoid revealing info about online players or existing commands to non-privileged players.
 - Merged `atcommand` and `charcommand` script functions (`charcommand` is aliased to `atcommand`).
   - Fixed `atcommand` script function reading unknown memory area (possible access violation).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15572 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-13 01:19:04 +00:00
eathenabot
45f0261147 * Merged changes up to eAthena 15014.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15063 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-11 20:43:49 +00:00
flaviojs
9703374f8a * Fix C++ compilation issues.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-09-08 19:47:26 +00:00
flaviojs
a39699098f * CMake: Added options BUILD_TXT_SERVERS, BUILD_SQL_SERVERS, BUILD_MAPCACHE.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14921 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-22 14:54:37 +00:00
flaviojs
bdfa11d86e * CMake: Only install template files if they don't already exist.
* CMake: Added plugin targets.
* CMake: Added options BUILD_* to build the converters and individual plugins. (default=OFF)
* CMake: Added option WITH_CPACK for package creation. (default=ON)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14918 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-21 06:47:12 +00:00
flaviojs
9535126f93 * CMake: set project language to C, added module FindFunctionLibrary, added search for dl library. (tested with debian-wheezy-i386)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14902 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-12 06:39:46 +00:00
flaviojs
334afd6cf6 * CMake: added txt-converter targets, added warning for 64bit, added list of available targets.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14900 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 23:46:51 +00:00
flaviojs
31cbbf1917 * CMake: added search for math library, made CPack existence optional, updated the search for mysqlclient and corrected misspelled variables (tested with FreeBSD-8.2-i386)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14893 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-09 07:39:27 +00:00