diff options
author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-05 20:51:58 +0000 |
---|---|---|
committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-05 20:51:58 +0000 |
commit | ce9b9e74f648f3dd52e4161d3183612ecd002f80 (patch) | |
tree | b6069d2b4687cd979685c6d803ec93a5e54d0590 /vcproj-9 | |
parent | d9a43b19b761c9d1726fc971044634cd3fa917b8 (diff) | |
download | hercules-ce9b9e74f648f3dd52e4161d3183612ecd002f80.tar.gz hercules-ce9b9e74f648f3dd52e4161d3183612ecd002f80.tar.bz2 hercules-ce9b9e74f648f3dd52e4161d3183612ecd002f80.tar.xz hercules-ce9b9e74f648f3dd52e4161d3183612ecd002f80.zip |
Merging RREmu into rAthena -- quite a few stuff yet to be renamed, but we'll get it sorted.
Some of the stuff included in RREmu that is now part of rAthena:
- RE Drop Rate Modifier
- RE Experience Rate Modifier
- RE Weapon MATK
- RE Shield ASPD job-specific penalty
- RE Cast Time
- Renewal-specific item DEF
- 3.1 classes.
- All-New Mounts
- Official Magical Reflection
- And other perks, such as fully-functional @mapflag
also merged eAthena 15006 into rAthena.
For Bugs, Comments and Suggestions: http://rathena.org/board/tracker/
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15009 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'vcproj-9')
-rw-r--r-- | vcproj-9/char-server_sql.vcproj | 2 | ||||
-rw-r--r-- | vcproj-9/char-server_txt.vcproj | 2 | ||||
-rw-r--r-- | vcproj-9/login-server_sql.vcproj | 2 | ||||
-rw-r--r-- | vcproj-9/login-server_txt.vcproj | 2 | ||||
-rw-r--r-- | vcproj-9/map-server_sql.vcproj | 70 | ||||
-rw-r--r-- | vcproj-9/map-server_txt.vcproj | 28 | ||||
-rw-r--r-- | vcproj-9/mapcache.vcproj | 4 | ||||
-rw-r--r-- | vcproj-9/plugin-console.vcproj | 2 | ||||
-rw-r--r-- | vcproj-9/plugin-pid.vcproj | 2 | ||||
-rw-r--r-- | vcproj-9/txt-converter-char.vcproj | 2 | ||||
-rw-r--r-- | vcproj-9/txt-converter-login.vcproj | 2 |
11 files changed, 87 insertions, 31 deletions
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj index 64fdf9bac..759fd4f83 100644 --- a/vcproj-9/char-server_sql.vcproj +++ b/vcproj-9/char-server_sql.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="char-server_sql" ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}" RootNamespace="char-server_sql" diff --git a/vcproj-9/char-server_txt.vcproj b/vcproj-9/char-server_txt.vcproj index a6e83d887..690607970 100644 --- a/vcproj-9/char-server_txt.vcproj +++ b/vcproj-9/char-server_txt.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="char-server_txt" ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}" RootNamespace="char-server_txt" diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj index 7a725fc36..f962b88fa 100644 --- a/vcproj-9/login-server_sql.vcproj +++ b/vcproj-9/login-server_sql.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="login-server_sql" ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}" RootNamespace="login-server_sql" diff --git a/vcproj-9/login-server_txt.vcproj b/vcproj-9/login-server_txt.vcproj index bb2820edb..7bc8b7d56 100644 --- a/vcproj-9/login-server_txt.vcproj +++ b/vcproj-9/login-server_txt.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="login-server_txt" ProjectGUID="{D356871D-58E1-450B-967A-E2E9646175AF}" RootNamespace="login-server_txt" diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj index 8cb57ef3b..7f4bac76f 100644 --- a/vcproj-9/map-server_sql.vcproj +++ b/vcproj-9/map-server_sql.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="map-server_sql" ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}" RootNamespace="map-server_sql" @@ -388,19 +388,19 @@ > </File> <File - RelativePath="..\src\map\battleground.h" + RelativePath="..\src\map\battleground.c" > </File> <File - RelativePath="..\src\map\battleground.c" + RelativePath="..\src\map\battleground.h" > </File> <File - RelativePath="..\src\map\buyingstore.h" + RelativePath="..\src\map\buyingstore.c" > </File> <File - RelativePath="..\src\map\buyingstore.c" + RelativePath="..\src\map\buyingstore.h" > </File> <File @@ -452,67 +452,67 @@ > </File> <File - RelativePath="..\src\map\intif.c" + RelativePath="..\src\map\homunculus.c" > </File> <File - RelativePath="..\src\map\intif.h" + RelativePath="..\src\map\homunculus.h" > </File> <File - RelativePath="..\src\map\itemdb.c" + RelativePath="..\src\map\instance.c" > </File> <File - RelativePath="..\src\map\itemdb.h" + RelativePath="..\src\map\instance.h" > </File> <File - RelativePath="..\src\map\log.c" + RelativePath="..\src\map\intif.c" > </File> <File - RelativePath="..\src\map\log.h" + RelativePath="..\src\map\intif.h" > </File> <File - RelativePath="..\src\map\mail.c" + RelativePath="..\src\map\itemdb.c" > </File> <File - RelativePath="..\src\map\mail.h" + RelativePath="..\src\map\itemdb.h" > </File> <File - RelativePath="..\src\map\map.c" + RelativePath="..\src\map\log.c" > </File> <File - RelativePath="..\src\map\map.h" + RelativePath="..\src\map\log.h" > </File> <File - RelativePath="..\src\map\mapreg.h" + RelativePath="..\src\map\mail.c" > </File> <File - RelativePath="..\src\map\mapreg_sql.c" + RelativePath="..\src\map\mail.h" > </File> <File - RelativePath="..\src\map\homunculus.c" + RelativePath="..\src\map\map.c" > </File> <File - RelativePath="..\src\map\homunculus.h" + RelativePath="..\src\map\map.h" > </File> <File - RelativePath="..\src\map\instance.c" + RelativePath="..\src\map\mapreg.h" > </File> <File - RelativePath="..\src\map\instance.h" + RelativePath="..\src\map\mapreg_sql.c" > </File> <File @@ -584,6 +584,34 @@ > </File> <File + RelativePath="..\src\map\RRConfig\Core.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Renewal.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Secure.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Data\Const.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Skills\General.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Skills\Mage_Classes.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Skills\Swordsman_Classes.h" + > + </File> + <File RelativePath="..\src\map\script.c" > </File> diff --git a/vcproj-9/map-server_txt.vcproj b/vcproj-9/map-server_txt.vcproj index 2b983df98..d4cc1b13b 100644 --- a/vcproj-9/map-server_txt.vcproj +++ b/vcproj-9/map-server_txt.vcproj @@ -415,6 +415,34 @@ > </File> <File + RelativePath="..\src\map\RRConfig\Core.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Renewal.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Secure.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Data\Const.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Skills\General.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Skills\Mage_Classes.h" + > + </File> + <File + RelativePath="..\src\map\RRConfig\Skills\Swordsman_Classes.h" + > + </File> + <File RelativePath="..\src\map\script.c" > </File> diff --git a/vcproj-9/mapcache.vcproj b/vcproj-9/mapcache.vcproj index 54c2756ff..2fb78f198 100644 --- a/vcproj-9/mapcache.vcproj +++ b/vcproj-9/mapcache.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="mapcache" ProjectGUID="{D356871D-58E1-450B-967A-E7E9646175AF}" RootNamespace="mapcache" @@ -209,7 +209,7 @@ > </File> <File - RelativePath="..\src\common\core.h" + RelativePath="..\src\common\des.h" > </File> <File diff --git a/vcproj-9/plugin-console.vcproj b/vcproj-9/plugin-console.vcproj index 9e7289c59..30337a0c1 100644 --- a/vcproj-9/plugin-console.vcproj +++ b/vcproj-9/plugin-console.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="windows-1250"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="console" ProjectGUID="{73E1101A-310C-4453-8F45-FD2795ABEF15}" TargetFrameworkVersion="0" diff --git a/vcproj-9/plugin-pid.vcproj b/vcproj-9/plugin-pid.vcproj index b9e6b3b7c..caa9a91df 100644 --- a/vcproj-9/plugin-pid.vcproj +++ b/vcproj-9/plugin-pid.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="windows-1250"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="pid" ProjectGUID="{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}" TargetFrameworkVersion="0" diff --git a/vcproj-9/txt-converter-char.vcproj b/vcproj-9/txt-converter-char.vcproj index 83bd5d6d2..6d9b6a846 100644 --- a/vcproj-9/txt-converter-char.vcproj +++ b/vcproj-9/txt-converter-char.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="txt-converter-char" ProjectGUID="{D356871D-58E1-450B-967A-EAE9646175AF}" RootNamespace="txt-converter-char" diff --git a/vcproj-9/txt-converter-login.vcproj b/vcproj-9/txt-converter-login.vcproj index 148009113..e69a7c20c 100644 --- a/vcproj-9/txt-converter-login.vcproj +++ b/vcproj-9/txt-converter-login.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="txt-converter-login" ProjectGUID="{D356871D-58E1-450B-967A-E9E9646175AF}" RootNamespace="txt-converter-login" |