34 Commits

Author SHA1 Message Date
brianluau
638642450a - Added svn:eol-style=native property on some recently added text files.
- Fixed a typo in script_commands.txt (bugreport:5998)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16278 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-12 15:33:46 +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
c83a410390 * Merged changes ONLY eAthena 15107.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 05:06:05 +00:00
eathenabot
d254bb1fb9 * Merged changes up to eAthena 15105.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16171 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 05:02:00 +00:00
eathenabot
b1c851fe59 * Merged changes ONLY eAthena 15104.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16170 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 04:32:31 +00:00
eathenabot
397538e535 * Merged changes ONLY eAthena 15101.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16169 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 04:27:27 +00:00
eathenabot
e648c0ed79 * Merged changes ONLY eAthena 15100.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16168 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 04:24:46 +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
1798cf32c4 * Merged changes up to eAthena 15096.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16106 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 20:31:55 +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
eathenabot
cc095606bf * Merged changes up to eAthena 15094.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-11 02:37:53 +00:00
shennetsind
a80b8bad6c Clearing a few dozen buildbot warnings. MAKE THE TREE GREEN! <3PEKKLE
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16036 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-02 03:26:26 +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
shennetsind
08059c9f61 Fixed gcc warnings on libconfig.c
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15591 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-17 15:57:41 +00:00
gepard1984
a2424f2c92 Fixed libconfig compiling issues in CentOS 5 (follow-up to r15572) (pid:78747).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15584 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-15 16:14:06 +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
brianluau
00367cd7b7 - Removed more trailing tabs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 20:17:55 +00:00
eathenabot
1810f2efcc * Merged changes up to eAthena 15032.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15065 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-11 21:06:25 +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
d725299ad1 * CMake: added search for ws2_32 library. (tested with MinGW/MSYS)
* Added missing pcre library for MinGW.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14904 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-13 01:58:32 +00:00
flaviojs
13a4063735 * CMake: added search for math.h, added search for socket/nsl library. (tested with Solaris-201011-x86)
* Added missing include to socket.c.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-12 22:01:45 +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
e3dc463655 * CMake: lowered required version to 2.8.3 and moved custom cmake modules to 3rdparty/cmake.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14897 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 15:29:57 +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
flaviojs
7e4a0b3266 * CMake: normalized variable names, added ability to create a package/installer.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14890 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-07 03:21:42 +00:00
flaviojs
9be2d9dbbd * CMake: src/common builds static libraries common_base/common_sql, that are used as dependencies by the other targets.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14889 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-06 20:40:38 +00:00
flaviojs
0a7528681e * CMake: marked executables as different components and other miscellaneous changes. [FlavioJS]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14877 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-01 15:43:58 +00:00
flaviojs
27799f566d * Added experimental support for CMake. (for now: basic build, no extras, only tested with VS10 and cygwin)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14872 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-29 12:26:51 +00:00
flaviojs
f4d8ec2ff0 * Added common/random and 3rdparty/mt19937ar to project files, makefiles and configure script.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14870 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-27 01:47:06 +00:00
flaviojs
161a499c76 * Added Mersenne Twister MT19937 as a random number generator.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14865 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-25 22:09:35 +00:00
ai4rei
e82c68b8bc * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14478 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-21 13:44:10 +00:00
ultramage
106b44c1e7 Merged the /loginmerge branch (topic:192754)
* the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13000 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 20:45:57 +00:00