summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-09-12 13:52:11 -0300
committerJesusaves <cpntb1@ymail.com>2020-09-12 13:52:11 -0300
commit0edc2addfb059d4d6855da5ab62e0b78db7172b7 (patch)
tree4e28c43384a027665445ffe79b3ca63b293fae12
parent37ce754e0cd0af74ea4c2a971f35bf9f81815120 (diff)
downloadserverdata-0edc2addfb059d4d6855da5ab62e0b78db7172b7.tar.gz
serverdata-0edc2addfb059d4d6855da5ab62e0b78db7172b7.tar.bz2
serverdata-0edc2addfb059d4d6855da5ab62e0b78db7172b7.tar.xz
serverdata-0edc2addfb059d4d6855da5ab62e0b78db7172b7.zip
This is Hercules v2019.10.20
-rw-r--r--.tools/reapply.patch441
1 files changed, 3 insertions, 38 deletions
diff --git a/.tools/reapply.patch4 b/.tools/reapply.patch4
index d4efce5ac..bc0f6122f 100644
--- a/.tools/reapply.patch4
+++ b/.tools/reapply.patch4
@@ -2,44 +2,9 @@
# HOWTO:
# git log v2019.08.25.. --pretty=short
-############
-## v2019.08.25
-
-## Convert sc_config to use libconfig
-7c88915931bd0ff80bba2db07848519cce92d514
-6ea8e59e52e8046c5ea8d3a42f3a67d06564e1f7
-
-## Convert item combo db to use libconfig
-ad7ebbedf81c54fdb43f4b4e41aed9fd48543e47
-e66f69797332dcaa0ca948287f4f58aad48f66f9
-548aa1263b69c2c5551d2c5f3d501ebc82d1e067
-
-## Add at command for change char sex (@changecharsex)
-c2445e45345967a7a80202e794f680e31b1e9b0d
-
-## Useless packets but needed for diffs
-#425f6c399653c2d9bcf156b818240fcb97a08940
-
-## FIXME Extract code for really gain homun exp to separate function
-#79c2a4b11f5f05eed9ae5535395205236f73b1e4
-
-## FIXME Use enum battle_dmg_type in related functions
-#008706f9bd90c207f3df46bc920f5295c89124a1
-#e59f8b1ecf8eb09287efe840a25141a737312225
-
-## Send clan name in name packet in position name field
-#523f76a74a48374416065ca02520554eac4ba198
-
-## Rewrite of itemdb_searchname_array and sub to be more readable
-e22d44e708d37923dcb57fd382e38b12bbc10a75
-
-## Implement new script fields for items triggered on rentral status changes
-#5d7c8d9857f096abfc4f205c8771b0b4c91fab2c
-#5d8e006fb85df2b3bbc32f2348bbcaad950546ba
-#ad19056bfcc1e98129bf25e14b58dcd0d438f9f9
-
-############
-## v2019.09.22
+# TODO: Instructions on how to update our hercules repo
+# git diff v2019.09.22 v2019.10.20 > ../tmw2/server-code/x.diff
+# git apply --ignore-whitespace --exclude=doc/ --exclude=tools/ --exclude=db/ --exclude=npc/ --exclude=conf/ --reject x.diff ; git checkout -- .gitlab-ci.yml
############
## v2019.10.20