cinderweb

Untitled

Sep 18th, 2013
221
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.96 KB | None | 0 0
  1. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git log
  2. commit 4fb35861efa05c83d5c8e32cad58268ec1674302
  3. Author: tux9th <[email protected]>
  4. Date: Wed Sep 11 09:22:23 2013 +0200
  5.  
  6. Update submodule pointer.
  7.  
  8. commit 8dda2d8aeead5d48b811cf45cde19a20a4646db9
  9. Author: tux9th <[email protected]>
  10. Date: Sun Sep 8 09:55:54 2013 +0200
  11.  
  12. Fix Waric: replace root with dark crystal.
  13.  
  14. commit 4ae88dad9aa894d95701be6d9da904c85d7de2cb
  15. Author: tux9th <[email protected]>
  16. Date: Sat Sep 7 20:08:04 2013 +0200
  17.  
  18. Update submodule pointer.
  19.  
  20. commit cfddd0dbebec30add7fce9106233a44276658c7e
  21. Author: Jessica Tölke <[email protected]>
  22. Date: Sat Sep 7 17:17:41 2013 +0200
  23.  
  24. Addition to Orum's dialog: make easy minigame more clear
  25.  
  26. commit a7cad76b1032e3dde32c8d88ff2df45d3377c407
  27. Author: tux9th <[email protected]>
  28. Date: Fri Sep 6 15:43:09 2013 +0200
  29.  
  30. Waric: fix explanation of spell
  31.  
  32. commit c2768de2ba55756e3eddfcc562ceaf1f472e82cc
  33. Author: tux9th <[email protected]>
  34. Date: Thu Sep 5 16:25:08 2013 +0200
  35.  
  36. Waric: fix freeze issue at Quest State 18
  37.  
  38. http://forums.themanaworld.org/viewtopic.php?p=137508#p137508
  39.  
  40. commit 586f2c115fe3fcdb1e5e05b25d7b61812aab4b28
  41. Author: tux9th <[email protected]>
  42. Date: Wed Sep 4 15:15:29 2013 +0200
  43.  
  44. Add news entry for the upcoming release.
  45.  
  46. commit e38924484ee4116af13711cdb512e232884343ba
  47. Author: tux9th <[email protected]>
  48. Date: Tue Sep 3 19:25:02 2013 +0200
  49.  
  50. Update submodule pointer.
  51.  
  52. commit a10c0d5161cb9542e3e47d7787eba1e78feea2ac
  53. Author: tux9th <[email protected]>
  54. Date: Fri Aug 30 18:48:34 2013 +0200
  55.  
  56. Dark Magic - Quests:
  57.  
  58. * Adjusting Debug-NPC.
  59. * added Quests for 3 Spells, QuestStates are documented in the NPC scrip
  60. * proofread by melkior.
  61.  
  62. commit d951f8d36752830872c73970c57d0aa86ad5199a
  63. Author: tux9th <[email protected]>
  64. Date: Fri Aug 30 18:47:38 2013 +0200
  65.  
  66. Dark Magic:
  67.  
  68. * Adding Dark Magic Skill.
  69. * Adding spells made by MisterGrey.
  70. * Balancing MrGrey's spells.
  71. * Adding an AoE spell.
  72. * nerfed light magic for Dark Mages.
  73. * Dark Magic spells are queststate dependend.
  74. * Commented out spells which will be released at a later date.
  75.  
  76. commit 41babcda744f8d68de6c9d51e9b06dad77c3af4b
  77. Author: Vincent Petithory <[email protected]>
  78. Date: Sat Aug 31 21:32:23 2013 +0200
  79.  
  80. item_db: lower sell prices of lazurite{shard,crystal} and heart of lazurite
  81.  
  82. commit 69ee8feaf7be74f004ca4bac005e2b29c5c31ad1
  83. Author: Ben Longbons <[email protected]>
  84. Date: Fri Aug 30 09:21:50 2013 -0700
  85.  
  86. Expand tabs in magic.conf.template
  87.  
  88. commit 2694eaa5e74a68794a215fe280fd240873b94413
  89. Merge: 715daeb 1ba16e7
  90. Author: tux9th <[email protected]>
  91. Date: Thu Aug 29 10:33:39 2013 -0700
  92.  
  93. Merge pull request #27 from cinderweb/master
  94.  
  95. I changed the miners.txt file to make a daily for level 40.
  96.  
  97. commit 1ba16e740ea84aa662b374cfcf10db006c487e0f
  98. Author: cinderweb <[email protected]>
  99. Date: Thu Aug 29 11:22:38 2013 -0500
  100.  
  101. I changed the miners.txt file to make a daily for level 40.
  102.  
  103. commit 715daeb50afd6c0d6f822bf8bd2821677e3c41a5
  104. Merge: 848ebd1 2f522ca
  105. Author: Vincent Petithory <[email protected]>
  106. Date: Thu Aug 29 06:35:41 2013 -0700
  107.  
  108. Merge pull request #26 from DinoPaskvan/master
  109.  
  110. Small indentation fix on NPC Jack
  111.  
  112. commit 2f522ca18450f9dbaded273cc92ff6e78ca6fda7
  113. Author: Dino Paskvan <[email protected]>
  114. Date: Thu Aug 29 15:03:22 2013 +0200
  115.  
  116. Small indentation fix on NPC Jack
  117.  
  118. commit 848ebd19528918fba26f506468894ffa49b30dbd
  119. Author: Ben Longbons <[email protected]>
  120. Date: Tue Aug 27 11:17:39 2013 -0700
  121.  
  122. Pad names with _ instead of = to make it easier to detect merge conflicts
  123.  
  124. commit 373c6f13b1deed7e245e7447a4fc77f2fa75429f
  125. Author: wushin <[email protected]>
  126. Date: Mon Aug 26 17:35:24 2013 -0500
  127.  
  128. fixed item_db.txt for HEAD of TMWA
  129.  
  130. Removed first line
  131. sed %s/\ ,\ /0,\ /g to fix empty values by ,
  132.  
  133. commit 24b2886d9a20f85e972e4e12c28cb2667675a474
  134. Author: Vincent Petithory <[email protected]>
  135. Date: Mon Aug 26 23:30:41 2013 +0200
  136.  
  137. Illia: adjust the alloted times after completing each step
  138.  
  139. commit dbdf7c4ddad4c69c5c8f55786cfe23ad233fc056
  140. Author: tux9th <[email protected]>
  141. Date: Mon Aug 26 16:28:24 2013 +0200
  142.  
  143. Updated submodule pointer.
  144.  
  145. commit 803b7fd5e4224276e5db57e8fa3d351d6529e80f
  146. Merge: 36c6803 b3fc5b7
  147. Author: Jessica Tölke <[email protected]>
  148. Date: Sun Aug 25 18:01:05 2013 +0200
  149.  
  150. Merge remote-tracking branch 'origin/master' into waric
  151.  
  152. Conflicts:
  153. world/map/db/item_db.txt
  154.  
  155. commit b3fc5b76efb0031277ad039d3f332b7c2b874d1c
  156. Author: tux9th <[email protected]>
  157. Date: Thu Aug 22 23:02:51 2013 +0200
  158.  
  159. run 'make maps' for client-data changes.
  160.  
  161. update submodule pointer.
  162.  
  163. commit 79a6488356ef522fb2e37ff224f4b7c6194ca9e9
  164. Author: Ben Longbons <[email protected]>
  165. Date: Tue Aug 20 09:39:17 2013 -0700
  166.  
  167. Put Cindy messages in an array and use announcement formatting
  168.  
  169. commit ae194001586f5cc7dc680f56a1aed5c453c7e72d
  170. Author: Ben Longbons <[email protected]>
  171. Date: Mon Aug 19 20:06:30 2013 -0700
  172.  
  173. Give every NPC a unique name
  174.  
  175. commit e12af34ecdedca9a83e5bf8100e4bf721ec85697
  176. Author: Ben Longbons <[email protected]>
  177. Date: Mon Aug 19 09:06:13 2013 -0700
  178.  
  179. Move storage option to top of banker
  180.  
  181. As suggested by Dyna.
  182.  
  183. commit e50a6c456829953f02ad68dd6e6a473c4a121dde
  184. Author: Ben Longbons <[email protected]>
  185. Date: Mon Aug 19 09:04:09 2013 -0700
  186.  
  187. Trivial removal of some trailing whitespace that snuck in
  188.  
  189. commit 89884ca46cf7d1def4fd19e97a846442fafdb38b
  190. Author: tux9th <[email protected]>
  191. Date: Sun Aug 18 22:48:24 2013 +0200
  192.  
  193. update submodule pointer.
  194.  
  195. commit 449c103ad4550c222edd3465cd83f9d1611a3310
  196. Author: tux9th <[email protected]>
  197. Date: Sat Aug 17 11:52:49 2013 +0200
  198.  
  199. update submodule pointer.
  200.  
  201. commit 4950c09bbaecc834357247f583aabeccda0f5ee2
  202. Merge: 858d071 322f4c3
  203. Author: Jared Adams <[email protected]>
  204. :
Advertisement
Add Comment
Please, Sign In to add comment