cinderweb

Untitled

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