Advertisement
Guest User

all the shit piled up by ormael since the last good commit

a guest
Jan 20th, 2016
147
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.45 KB | None | 0 0
  1. commit 2dfebc8a425b5fbd47390d34ae1a5305b8ba4e70
  2. Merge: 7a6f4af b41f7f7
  3. Author: Kitteh6660 <Kitteh6660@users.noreply.github.com>
  4. Date: Sat Jan 9 20:22:42 2016 -0500
  5.  
  6. Merge pull request #160 from Ormael/master
  7.  
  8. Stone mining ants + missing point for shark score
  9.  
  10. commit b41f7f7901e1b3cf29ea641bdeb16cb54742e7a3
  11. Author: Ormael <ormael@gmail.com>
  12. Date: Sat Jan 9 16:44:06 2016 +0100
  13.  
  14. Typoception: let go deeper ^^
  15.  
  16. commit 589c4b70b3c3e80bfb0b4eb06d310886fbd6c9d7
  17. Author: Ormael <ormael@gmail.com>
  18. Date: Sat Jan 9 16:43:55 2016 +0100
  19.  
  20. Typoception: let go deeper ^^
  21.  
  22. commit b3e5f29f956392e61c6f01319b793034e830a4e4
  23. Author: Ormael <ormael@gmail.com>
  24. Date: Sat Jan 9 16:43:42 2016 +0100
  25.  
  26. Typoception: let go deeper ^^
  27.  
  28. commit 766d39891dbc953aecae2cda9587f94acdba7a97
  29. Author: Ormael <ormael@gmail.com>
  30. Date: Sat Jan 9 13:52:19 2016 +0100
  31.  
  32. Dungeon related achievs
  33.  
  34. commit d3918d0300b18880ffef59596af0717dfe4338c8
  35. Author: Ormael <ormael@gmail.com>
  36. Date: Sat Jan 9 13:52:16 2016 +0100
  37.  
  38. Dungeon related achievs
  39.  
  40. commit 53a8828de55ba2ebf0d6c628d88b258d13eb523c
  41. Author: Ormael <ormael@gmail.com>
  42. Date: Sat Jan 9 13:52:01 2016 +0100
  43.  
  44. Dungeon related achievs
  45.  
  46. commit 32dd3e8f04892011749d3c8b909a98855f0a1134
  47. Author: Ormael <ormael@gmail.com>
  48. Date: Sat Jan 9 09:54:00 2016 +0100
  49.  
  50. Fixception -_-'
  51.  
  52. commit 2393c41c1e21ec8c3dba4318f9f7843dd010c978
  53. Author: Ormael <ormael@gmail.com>
  54. Date: Sat Jan 9 09:50:44 2016 +0100
  55.  
  56. chidren typos and value checks fix
  57.  
  58. commit 61380fe3560520bd048e112105190627b322c11b
  59. Author: Ormael <ormael@gmail.com>
  60. Date: Fri Jan 8 23:03:02 2016 +0100
  61.  
  62. Minor fix
  63.  
  64. commit de6175ee86e1dd276e989748068ddd9fceacba78
  65. Author: Ormael <ormael@gmail.com>
  66. Date: Fri Jan 8 21:15:46 2016 +0100
  67.  
  68. Missing point for shark-moprh score
  69.  
  70. commit cce67fc3b7f19dd240b3d193dcec88bf1c83a0e7
  71. Author: Ormael <ormael@gmail.com>
  72. Date: Fri Jan 8 20:47:47 2016 +0100
  73.  
  74. Few more new camp desc pieces
  75.  
  76. Small additions to camp description depending on the amount of ant children PC have.
  77.  
  78. commit 4a0831ed18beb640349531ae2079cfa0678d15ad
  79. Author: Ormael <ormael@gmail.com>
  80. Date: Fri Jan 8 20:12:55 2016 +0100
  81.  
  82. Ants digs Stones part 2
  83.  
  84. commit f68591b920e81c1094e7f2eef5425937e26a059c
  85. Author: Ormael <ormael@gmail.com>
  86. Date: Fri Jan 8 20:12:38 2016 +0100
  87.  
  88. Ants digs Stones part 2
  89.  
  90. commit 7a6f4af10754282614ac12448a1e342591d2e7dc
  91. Merge: c0dfc99 786ed2c
  92. Author: Kitteh6660 <Kitteh6660@users.noreply.github.com>
  93. Date: Thu Jan 7 20:30:06 2016 -0500
  94.  
  95. Merge pull request #159 from Ormael/master
  96.  
  97. New perks, achievs and other small changes
  98.  
  99. commit 786ed2c4b98549169116413feed0b50af73e72dd
  100. Author: Ormael <ormael@gmail.com>
  101. Date: Thu Jan 7 22:58:03 2016 +0100
  102.  
  103. Fixing typo
  104.  
  105. commit 45313685d3301cfa7664b02fe7101b09f7804757
  106. Author: Ormael <ormael@gmail.com>
  107. Date: Thu Jan 7 22:12:24 2016 +0100
  108.  
  109. Changes to Carpentry shop part 2
  110.  
  111. Now PC got a lots of stones for no reason at all *Jinx pun intended till part 3 ;)*
  112.  
  113. commit 74b56681a3b1780d1c15a631be48cd9573991b2b
  114. Author: Ormael <ormael@gmail.com>
  115. Date: Thu Jan 7 22:10:37 2016 +0100
  116.  
  117. Zebra-morphs codex
  118.  
  119. commit b999a35b2936ae16cfef5098de22a83094bb4e59
  120. Author: Ormael <ormael@gmail.com>
  121. Date: Thu Jan 7 21:39:07 2016 +0100
  122.  
  123. Zebra-morphs
  124.  
  125. commit 6fbb2449a3e715b2ff1e3f08b5fa794ca6c2ccee
  126. Author: Ormael <ormael@gmail.com>
  127. Date: Thu Jan 7 20:38:22 2016 +0100
  128.  
  129. Stones Stones everywhere...
  130.  
  131. commit 60c9ff7b025c213d07feffa3cd27bc7b6e75309a
  132. Author: Ormael <ormael@gmail.com>
  133. Date: Thu Jan 7 20:28:18 2016 +0100
  134.  
  135. Stone related achiev
  136.  
  137. commit 8bcdff60c7308c0f0ab65140cbf17433e73ba65a
  138. Author: Ormael <ormael@gmail.com>
  139. Date: Thu Jan 7 20:24:46 2016 +0100
  140.  
  141. Fixing typo
  142.  
  143. commit 7769e110594cf30989e4c6a4f9fb2c0230c921ea
  144. Author: Ormael <ormael@gmail.com>
  145. Date: Thu Jan 7 20:05:44 2016 +0100
  146.  
  147. Stone related achiev
  148.  
  149. commit c3df09ea1ca8930d776abf59048b648937fa337b
  150. Author: Ormael <ormael@gmail.com>
  151. Date: Thu Jan 7 20:03:59 2016 +0100
  152.  
  153. Stone related achiev
  154.  
  155. commit 93c2f3724dcd7b82e536e8c718ff8d75e392d7ff
  156. Author: Ormael <ormael@gmail.com>
  157. Date: Thu Jan 7 20:02:25 2016 +0100
  158.  
  159. Stone related achiev
  160.  
  161. commit be1c8dc4e511c3e5a0a94aa5dff3b9eea673f540
  162. Author: Ormael <ormael@gmail.com>
  163. Date: Thu Jan 7 18:30:26 2016 +0100
  164.  
  165. Ants digs Stones part 1
  166.  
  167. commit 6058bbc1066545de3d1884a9e4fd4f0fc5fd8c79
  168. Author: Ormael <ormael@gmail.com>
  169. Date: Thu Jan 7 17:58:39 2016 +0100
  170.  
  171. Juggernaut perk part 3
  172.  
  173. commit 99ac72410d03ce4b37bbbfe328d538b0e6c3c7eb
  174. Author: Ormael <ormael@gmail.com>
  175. Date: Thu Jan 7 17:58:35 2016 +0100
  176.  
  177. Juggernaut perk part 3
  178.  
  179. commit 70ba00961bf9980d56474eda2b35f6116c2f9e0c
  180. Author: Ormael <ormael@gmail.com>
  181. Date: Thu Jan 7 17:58:28 2016 +0100
  182.  
  183. Juggernaut perk part 3
  184.  
  185. commit 07d3982547b67aaca06e050a75ff1ee00787194a
  186. Author: Ormael <ormael@gmail.com>
  187. Date: Thu Jan 7 17:58:21 2016 +0100
  188.  
  189. Juggernaut perk part 3
  190.  
  191. commit 4677162edf13e72f6f5f052e2a305b6bcb2e9c00
  192. Author: Ormael <ormael@gmail.com>
  193. Date: Thu Jan 7 17:58:15 2016 +0100
  194.  
  195. Juggernaut perk part 3
  196.  
  197. commit ee59f4dd113cff9158e665109c8bf780aba64bc0
  198. Author: Ormael <ormael@gmail.com>
  199. Date: Thu Jan 7 13:13:04 2016 +0100
  200.  
  201. Demon-morph bonus +maxLust
  202.  
  203. commit 2f6171abd38b0f8e20c604e913575f402db6e91f
  204. Author: Ormael <ormael@gmail.com>
  205. Date: Thu Jan 7 13:09:31 2016 +0100
  206.  
  207. Siren and Demon morphs max stat altering
  208.  
  209. commit 7ae6bd1b889d4b00347a74eff5d9875b9d8d7bb1
  210. Author: Ormael <ormael@gmail.com>
  211. Date: Thu Jan 7 13:03:24 2016 +0100
  212.  
  213. Shield Rack and Ascension
  214.  
  215. Weirdly enough shield rack never stayed with PC during Ascension.
  216.  
  217. commit 07f170dba1a176f143feae12e592fd9d13ee7284
  218. Author: Ormael <ormael@gmail.com>
  219. Date: Thu Jan 7 11:51:51 2016 +0100
  220.  
  221. You Bastard achiev
  222.  
  223. commit 8d1d06d1e30781f463a808110e9f409a1f4dfe39
  224. Author: Ormael <ormael@gmail.com>
  225. Date: Thu Jan 7 11:51:29 2016 +0100
  226.  
  227. You Bastard achiev
  228.  
  229. commit 19acf0ae99c50211fc7f77973d49f66ffe6afd6f
  230. Author: Ormael <ormael@gmail.com>
  231. Date: Wed Jan 6 23:30:52 2016 +0100
  232.  
  233. Juggernaut perk part 2
  234.  
  235. commit 9ce4db04cf53680507514d2e13792437d2ba9230
  236. Author: Ormael <ormael@gmail.com>
  237. Date: Wed Jan 6 22:54:35 2016 +0100
  238.  
  239. Update PerkLib.as
  240.  
  241. commit 942ec5f47bc71385b12f7d3d282ca9292e220062
  242. Author: Ormael <ormael@gmail.com>
  243. Date: Wed Jan 6 22:50:13 2016 +0100
  244.  
  245. Juggernaut perk part 1
  246.  
  247. commit 018877b2f379f848d45d8a8b00c501a66cb49492
  248. Author: Ormael <ormael@gmail.com>
  249. Date: Wed Jan 6 22:49:55 2016 +0100
  250.  
  251. Juggernaut perk part 1
  252.  
  253. commit 75bf3767113acadcb712edaf3042817edb6f3915
  254. Author: Ormael <ormael@gmail.com>
  255. Date: Wed Jan 6 15:16:35 2016 +0100
  256.  
  257. Changes to Carpentry shop part 1
  258.  
  259. Reorganizing shop menu with preparing for adding more options in the future, stubs for rest of the new options.
  260.  
  261. commit 845aae347dd1188c8c5f70a424cacc01ab341c45
  262. Author: Ormael <ormael@gmail.com>
  263. Date: Wed Jan 6 15:11:04 2016 +0100
  264.  
  265. Stone material flag
  266.  
  267. for future expansion to the camp upgrades list.
  268.  
  269. commit 5ad868b5e28f01d35d4f4be8996e74df4c5a5baf
  270. Author: Ormael <ormael@gmail.com>
  271. Date: Wed Jan 6 14:34:46 2016 +0100
  272.  
  273. Update Camp.as
  274.  
  275. Stub for future camp upgrades not connected to cabin or walls.
  276.  
  277. commit 7ce7acf86d20daaaaf18e3537f4a2e4c41e0286a
  278. Author: Ormael <ormael@gmail.com>
  279. Date: Wed Jan 6 13:23:17 2016 +0100
  280.  
  281. Multi-rank lvl-up perk
  282.  
  283. commit 4a9529bb6b67ba29d0b6de16e546b2a7da4c3eeb
  284. Author: Ormael <ormael@gmail.com>
  285. Date: Wed Jan 6 13:23:00 2016 +0100
  286.  
  287. Mutli-rank lvl-up perk
  288.  
  289. commit 493725665db69b91833fac3c7bde6fa80c342ae0
  290. Author: Ormael <ormael@gmail.com>
  291. Date: Wed Jan 6 13:22:44 2016 +0100
  292.  
  293. Mutli-rank lvl-up perk
  294.  
  295. commit b291e0667611c255d420ea9f240f06037181775d
  296. Author: Ormael <ormael@gmail.com>
  297. Date: Wed Jan 6 00:16:56 2016 +0100
  298.  
  299. Update Regeneration2Perk.as
  300.  
  301. commit 533fdfac4018e62781bbd8bac44f89ab16bd3d5b
  302. Author: Ormael <ormael@gmail.com>
  303. Date: Wed Jan 6 00:16:49 2016 +0100
  304.  
  305. Update RegenerationPerk.as
  306.  
  307. commit eb50a25b1abd6fe05ee8ac7e61d859224dca2282
  308. Author: Ormael <ormael@gmail.com>
  309. Date: Tue Jan 5 20:27:45 2016 +0100
  310.  
  311. Adding shield to Valkyrie drop table
  312.  
  313. commit ca65b74c48f54f49931d0761d8628f7d5af13095
  314. Author: Ormael <ormael@gmail.com>
  315. Date: Tue Jan 5 19:45:13 2016 +0100
  316.  
  317. Population achievements changes
  318.  
  319. commit 999df44013040e2c3ccce10fed20ab9d7cf1b4e5
  320. Author: Ormael <ormael@gmail.com>
  321. Date: Tue Jan 5 19:43:50 2016 +0100
  322.  
  323. Update Achievements.as
  324.  
  325. commit 10d16f9dc5ec9ac15937a140302e74ef3d885f1a
  326. Author: Ormael <ormael@gmail.com>
  327. Date: Tue Jan 5 19:43:04 2016 +0100
  328.  
  329. Population achievements changes
  330.  
  331. commit 14a3e7b695a5f66b80af4cfb66bd924a40c93414
  332. Author: Ormael <ormael@gmail.com>
  333. Date: Tue Jan 5 19:42:47 2016 +0100
  334.  
  335. Population achievements changes
  336.  
  337. 1 changed and 4 more added
  338.  
  339. commit ca3e192bd88d69983712413e5c9f3937a74613de
  340. Author: Ormael <ormael@gmail.com>
  341. Date: Tue Jan 5 15:06:08 2016 +0100
  342.  
  343. Update MaraeArmor.as
  344.  
  345. It's armor made of piece of the godess yet it isn't outstanding in compare to the other endgame armors so....buff time for it ^^
  346.  
  347. commit a14d3a8be095af1d1f75d67ddc150c525480f977
  348. Author: Ormael <ormael@gmail.com>
  349. Date: Tue Jan 5 15:05:48 2016 +0100
  350.  
  351. Update PureMaraeArmor.as
  352.  
  353. It's armor made of piece of the godess yet it isn't outstanding in compare to the other endgame armors so....buff time for it ^^
  354.  
  355. commit ad7fada6458c8c7932159c0fa228860068332383
  356. Author: Ormael <ormael@gmail.com>
  357. Date: Tue Jan 5 13:43:19 2016 +0100
  358.  
  359. Update PlayerEvents.as
  360.  
  361. commit bd6094767c85e8ec0abeb3e3a4a2322ead755f44
  362. Author: Ormael <ormael@gmail.com>
  363. Date: Tue Jan 5 13:39:56 2016 +0100
  364.  
  365. Update combat.as
  366.  
  367. commit ea5589d516f25048787d03a746c093b505f9c0b7
  368. Author: Ormael <ormael@gmail.com>
  369. Date: Mon Jan 4 23:25:14 2016 +0100
  370.  
  371. Update engineCore.as
  372.  
  373. commit 0302b5c8dab43e16c295d44a2881bc0636af0861
  374. Author: Ormael <ormael@gmail.com>
  375. Date: Mon Jan 4 23:24:14 2016 +0100
  376.  
  377. Update Player.as
  378.  
  379. commit cc729c26f1cc3930aa9bdffa1f0638a92f24a45b
  380. Author: Ormael <ormael@gmail.com>
  381. Date: Mon Jan 4 23:20:34 2016 +0100
  382.  
  383. Update PerkLib.as
  384.  
  385. commit c0dfc995b2ea9352bd23634f8106b6a7fde004e1
  386. Author: Kitteh6660 <sylvainkittens@gmail.com>
  387. Date: Sat Jan 2 01:07:27 2016 -0500
  388.  
  389. Mod update 1.3.7
  390.  
  391. More refactors and bug fixes.
  392.  
  393. Christmas achievements are now earnable.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement