API tools faq
paste
Kulgan_Starkk

Commits for COMP 352 by me

Kulgan_Starkk
Nov 14th, 2016
182
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 32.85 KB | None | 0 0
raw download clone embed print report
  1. Started the timer, gotta stash it somewhere, need to create a build
  2. --------------------------------------------------------------------------------
  3. Merged in Ilya (pull request #18)
  4.  
  5. Attached cursor images
  6. --------------------------------------------------------------------------------
  7. Implemented the upper-limit of spell upgrade ranks
  8. --------------------------------------------------------------------------------
  9. Merge branch 'pulls/17'
  10. --------------------------------------------------------------------------------
  11. Merged the pull request and fixed the level bugs
  12. --------------------------------------------------------------------------------
  13. Blood effect
  14. --------------------------------------------------------------------------------
  15. Fixed the spell slot selection limit (again)
  16. --------------------------------------------------------------------------------
  17. Merge remote-tracking branch 'origin/PaintingSpells'
  18. --------------------------------------------------------------------------------
  19. Merged in Sora'sChanges (pull request #16)
  20.  
  21. New maps!
  22. --------------------------------------------------------------------------------
  23. Fixed things, not spells
  24. --------------------------------------------------------------------------------
  25. Merge remote-tracking branch 'origin/master' into PaintingSpells
  26. --------------------------------------------------------------------------------
  27. Merge remote-tracking branch 'origin/Sora'sChanges'
  28.  
  29. # Conflicts:
  30. # Assets/Scenes/Level 1.unity
  31.  
  32. Used 'Master' and overwrote all sora-side changes
  33. --------------------------------------------------------------------------------
  34. Fixed the tutorial being added to all the levels by breaking it out of the prefab and into it's own canvas.
  35. --------------------------------------------------------------------------------
  36. Merged in Ilya (pull request #14)
  37.  
  38. Updated spell sprites
  39. --------------------------------------------------------------------------------
  40. Added lizard creature animation and sprites, firing animation no longer plays if player doesnt have sufficient mana (reverted from commit 875a1e3e93813b6786fc1fff9a0692ba6aa7cdb2)
  41.  
  42. Cut out the Changes made to the Level 1 scene because they didn't do anything and caused a conflict
  43. --------------------------------------------------------------------------------
  44. Started implementing spell painting by fiddling with the Push Spell
  45. --------------------------------------------------------------------------------
  46. Fixed the Ice Spell to properly scale it's percentage with the rank
  47. --------------------------------------------------------------------------------
  48. Fixed the fixed trap colliders
  49. --------------------------------------------------------------------------------
  50. Fixed the traps to have better colliders
  51. --------------------------------------------------------------------------------
  52. Renamed all the spell slot titles on the upgrade screen to have a more appropriate number.
  53.  
  54. Changed the part of the playercontroller that was breaking the save/load function of the upgrade screen (resetting to default values every time).
  55.  
  56. Fixed a bunch of other aspects of the spell upgrade screen that makes it a far more useful feature.
  57. --------------------------------------------------------------------------------
  58. Linked the tutorial scene from the Main Menu
  59.  
  60. Hard-coded the default available spells (untested).
  61. --------------------------------------------------------------------------------
  62. Fixed the push cursor bug, moved cursor images over to the spell prefab, reset the player's default health, fiddled with the player's default spells, fixed the spell upgrade screen allowing changes to go negative,
  63. --------------------------------------------------------------------------------
  64. IT FUCKING WORKS NOW CHRIST
  65. --------------------------------------------------------------------------------
  66. Merge remote-tracking branch 'origin/master' into ItWasWorkingHere
  67.  
  68. # Conflicts:
  69. # Assets/Prefabs/LevelStuff/LevelUIPrefab.prefab
  70. # Assets/Prefabs/Player.prefab
  71. # Assets/Scenes/Level 1.unity
  72. # Assets/Scripts/PlayerController.cs
  73.  
  74. Resolved hopefully properly, but have to sort the UI Prefab Manually
  75. --------------------------------------------------------------------------------
  76. Fixed UI Scaling for Upgrade Screen
  77. --------------------------------------------------------------------------------
  78. Fixed stuff that had broken because Git
  79. --------------------------------------------------------------------------------
  80. Merged in Ilya (pull request #12)
  81.  
  82. Updated boom sprite
  83. --------------------------------------------------------------------------------
  84. Merge remote-tracking branch 'origin/master' into ProgressionAndUpgrades
  85.  
  86. # Conflicts:
  87. # Assets/Prefabs/LevelStuff/LevelUIPrefab.prefab
  88. # Assets/Scenes/Level 1.unity
  89.  
  90. Still lost the player follower object, going to need to get it back somehow
  91. --------------------------------------------------------------------------------
  92. Trying to separate gameobjects so they don't overwrite each other because Git doesn't understand Unity Objects
  93. --------------------------------------------------------------------------------
  94. Renamed the player thing for readability
  95. --------------------------------------------------------------------------------
  96. Trying to fix merge conflicts
  97. --------------------------------------------------------------------------------
  98. Merge remote-tracking branch 'origin/master' into ProgressionAndUpgrades
  99.  
  100. # Conflicts:
  101. # Assets/Prefabs/LevelStuff/LevelUIPrefab.prefab
  102. # Assets/Prefabs/Player.prefab
  103. # Assets/Scenes/Level 1.unity
  104. # Assets/Scripts/PlayerController.cs
  105.  
  106. Mostly took theirs except when I knew better (reverted from commit 71c54d7cfabe120b7ee24d977e79fc62d98a3418)
  107.  
  108. Reverted a bunch of stuff because I'm an idiot and overrode the Upgrade Screen
  109. --------------------------------------------------------------------------------
  110. Merge remote-tracking branch 'origin/master' into ProgressionAndUpgrades
  111.  
  112. # Conflicts:
  113. # Assets/Prefabs/LevelStuff/LevelUIPrefab.prefab
  114. # Assets/Prefabs/Player.prefab
  115. # Assets/Scenes/Level 1.unity
  116. # Assets/Scripts/PlayerController.cs
  117.  
  118. Mostly took theirs except when I knew better (reverted from commit 71c54d7cfabe120b7ee24d977e79fc62d98a3418)
  119. --------------------------------------------------------------------------------
  120. Merge remote-tracking branch 'origin/master' into ProgressionAndUpgrades
  121.  
  122. # Conflicts:
  123. # Assets/Prefabs/LevelStuff/LevelUIPrefab.prefab
  124. # Assets/Prefabs/Player.prefab
  125. # Assets/Scenes/Level 1.unity
  126. # Assets/Scripts/PlayerController.cs
  127.  
  128. Mostly took theirs except when I knew better
  129. --------------------------------------------------------------------------------
  130. Converted the canvas to operate in world. Helps with explicit rendering.
  131. --------------------------------------------------------------------------------
  132. Merge remote-tracking branch 'origin/master' into PushSpellOverhaul
  133.  
  134. # Conflicts:
  135. # Assets/Scenes/Level 1.unity
  136.  
  137. Resolved with 'Theirs'
  138. --------------------------------------------------------------------------------
  139. Made spell cooldown timers attached to the spells (mostly), also implemented the timer for the experimental push as a result.
  140. --------------------------------------------------------------------------------
  141. Applying the rank to a bunch of spell-based mechanics to attempt to justify putting points into it. Still need to tweak mana cost updating though as it needs to happen directly to the prefab rather than in start for all the rest of the code to still work.
  142. --------------------------------------------------------------------------------
  143. Added a possible fix for the jittering which occasionally enables collisions but mostly keeps them disabled.
  144.  
  145. Also removed legacy trap pictures which were still kicking around for some reason even though I could swear I deleted them
  146. --------------------------------------------------------------------------------
  147. Added a rotating selection type majigger to make the player's position more obvious
  148. --------------------------------------------------------------------------------
  149. Added the Health and Mana bars that follow the player
  150. --------------------------------------------------------------------------------
  151. Finally got spells and their ranks synchronised across scenes (and as a happy coincidence, across games).
  152.  
  153. Also managed to get the player spells synchronised (needs more testing) with the upgrade screen's spell selection mechanic.
  154. --------------------------------------------------------------------------------
  155. Attempting to create a cross-scene data saving mechanic which as a happy coincidence will also be the way I overwrite the player's spells with the values they selected in the upgrade screen.
  156. --------------------------------------------------------------------------------
  157. Started implementing the 'select spells for slots' mechanic.
  158.  
  159. Dropdown exists which shows 'None' followed by a list of spells which are 'unlocked'.
  160.  
  161. Also made the Escape Key toggle the menu.
  162. --------------------------------------------------------------------------------
  163. Finally got the upgrade gui working properly, and it no-longer interferes with gameplay...
  164.  
  165. Still doesn't actually affect the spells in any way though, yet.
  166. --------------------------------------------------------------------------------
  167. Switched over the spell colours to reside within the spell script.
  168.  
  169. Added a bunch of GUI related stuff which currently breaks the game.
  170. --------------------------------------------------------------------------------
  171. Removed the previously committed structure because there's a better way (static variables)
  172. --------------------------------------------------------------------------------
  173. Initial commit, structure is in place for script to be viable cross-scene.
  174. --------------------------------------------------------------------------------
  175. Merged in Ilya (pull request #10)
  176.  
  177. Added player legs and leg animation, added leg script,
  178. --------------------------------------------------------------------------------
  179. AlsoTest
  180. --------------------------------------------------------------------------------
  181. Test
  182. --------------------------------------------------------------------------------
  183. Merged in Ilya (pull request #8)
  184.  
  185. Health
  186. --------------------------------------------------------------------------------
  187. Sorta fixed spiders to animate hits noticeably.
  188.  
  189. Tried to fix camera clamping with teleport, didn't succeed yet, but optimised slightly nonetheless.
  190. --------------------------------------------------------------------------------
  191. Merged in Sora'sChanges (pull request #7)
  192.  
  193. NEW TRAPS! See if I broke anything... HawHaw
  194. --------------------------------------------------------------------------------
  195. Fixed enemies spawning outside world boundary (probably)
  196. --------------------------------------------------------------------------------
  197. Merge remote-tracking branch 'origin/PushSpellOverhaul'
  198. --------------------------------------------------------------------------------
  199. Initial additions to the push spell overhaul.
  200.  
  201. Fiddled with animations as well.
  202. --------------------------------------------------------------------------------
  203. Implemented the advanced push spell, needs testing on somewhere with an actual mouse.
  204. --------------------------------------------------------------------------------
  205. Initial additions to the push spell overhaul.
  206.  
  207. Fiddled with animations as well.
  208. --------------------------------------------------------------------------------
  209. Implemented the slowdown trap.
  210.  
  211. Moved the prefabs into their own categorised folders
  212. --------------------------------------------------------------------------------
  213. FINALLY fixed the flashing animation not playing when the death animation does...
  214. --------------------------------------------------------------------------------
  215. Implemented Enemy Movement randomisation
  216. Implemented Enemy flashing when damage taken
  217. --------------------------------------------------------------------------------
  218. Fixed the testing-level of mana
  219. --------------------------------------------------------------------------------
  220. Fixed the bloody weird positioning bug on the lightning... Turns out it was the animation hard-setting the value the whole time
  221. --------------------------------------------------------------------------------
  222. Went through and added comments to pretty much everything code-wise, and deleted an animator that wasn't necessary.
  223.  
  224. Discovered that the lightning spell is not working properly but can't yet track down why.
  225. --------------------------------------------------------------------------------
  226. Fix the teleport freeze to allow spell selection while still disallowing spell firing
  227. --------------------------------------------------------------------------------
  228. Ice Spell works, is reasonably balanced except for cost.
  229. --------------------------------------------------------------------------------
  230. Added EnemyController Code to properly apply DoT
  231. --------------------------------------------------------------------------------
  232. Added in the Ice/Slowdown Spell... Does slowdown and DoT, but needs EnemyController Fiddling.
  233. --------------------------------------------------------------------------------
  234. Removed debug message I accidentally left in
  235. --------------------------------------------------------------------------------
  236. Really Fixed Build Settings
  237. --------------------------------------------------------------------------------
  238. Added the teleport spell, optimised some other spell animations to have nicer (animated) colliders. Fixed the build settings (again)
  239. --------------------------------------------------------------------------------
  240. Implemented Camera Clamping to within world boundary.
  241. --------------------------------------------------------------------------------
  242. Added a new barrier sprite that I took off the internets (it's terrible, which is a good quality for a placeholder :P)
  243.  
  244. Also made the player re-collide with the barrier and tweaked their collider.
  245. --------------------------------------------------------------------------------
  246. Added the ability for the colour of the health/mana bars to darken when the current amount is higher than the 'total', as well as allowed the amount to actually increase above the total.
  247.  
  248. Added a background for the Health, Mana and Kills Bars in preparation for them having an actual container, and also for ease of reading.
  249.  
  250. Limited the length of the bar to be as long as it ever should be, regardless of overflow of the actual amount.
  251. --------------------------------------------------------------------------------
  252. On master: SmartGit: automatic stash on Merge.
  253. --------------------------------------------------------------------------------
  254. index on master: 3aa1178 Added back the ability to die, death animation works properly, fun stuff!
  255. --------------------------------------------------------------------------------
  256. Made the UI bars change length according to game state
  257. --------------------------------------------------------------------------------
  258. Fixed width of enemies to take up more space
  259. --------------------------------------------------------------------------------
  260. Fixed the enemy count being artificially increased by spell effects affecting dead enemies.
  261. --------------------------------------------------------------------------------
  262. Moved the rest of the spells into their folders
  263. --------------------------------------------------------------------------------
  264. Implemented scroll wheel spell selection
  265. --------------------------------------------------------------------------------
  266. Explosion spell works as expected. Probably needs balancing :P
  267. --------------------------------------------------------------------------------
  268. Made a tonne of changes.
  269.  
  270. Replaced the 'copy paste' from scene to scene format with prefabs, so now we can synchronise certain things across all our game levels (UI, and such).
  271.  
  272. Fixed some animation stuff that had broken again... Hopefully it commits properly.
  273.  
  274. Renamed the 'LightningContainer' tag to 'SpellContainer' and implemented it as the parent object of all spells, not just lightning related ones.
  275.  
  276. Added some stuff for the Boom Spell... Currently isn't booming, but soon:tm:
  277.  
  278. Removed and moved a bunch of files.
  279. --------------------------------------------------------------------------------
  280. Added back the ability to die, death animation works properly, fun stuff!
  281. --------------------------------------------------------------------------------
  282. Theoretically successfully merged Ilya's Branch into master. Will test and merge properly if successful.
  283. --------------------------------------------------------------------------------
  284. Fixed the main menu scaling too
  285. --------------------------------------------------------------------------------
  286. Fixed the UI to be scaling to the screen again
  287. --------------------------------------------------------------------------------
  288. Fixed Spell layering
  289. --------------------------------------------------------------------------------
  290. Merge branch 'BeamSpell'
  291.  
  292. # Conflicts:
  293. # Assets/Scenes/Level 1.unity
  294.  
  295. Merged the Beam spell into the Main branch, and fixed a bunch of errors that arose as a result. Should work fine.
  296. --------------------------------------------------------------------------------
  297. Implemented Beam Spell with new Beam Animation. Animation is slightly hinky but is relatively easily fixed.
  298. --------------------------------------------------------------------------------
  299. Merge remote-tracking branch 'origin/Sora'sChanges' into BeamSpell
  300. --------------------------------------------------------------------------------
  301. Made the Beam spell work pretty much correctly, takes away mana, goes to the cursor, deals DoT, etc.
  302. --------------------------------------------------------------------------------
  303. Added the Spell Script and Prefab, now I've gotta get the 'holding it down means it keeps firing' mechanic working.
  304. --------------------------------------------------------------------------------
  305. Renamed the Ass4 scene to Level 1.
  306.  
  307. Reworked the Buttons script to work relatively rather than absolutely. (Same script for all the next-level/replay buttons)
  308.  
  309. Fixed the 'Mana' object so that it can now be detected via scripting. No need to drag and drop for each level, long as they're named the same.
  310. --------------------------------------------------------------------------------
  311. Fixed dead sprites rendering on top of living ones.
  312. --------------------------------------------------------------------------------
  313. Fixed most of the warnings, left the camera one for the pickups because it'll probably be necessary to render the GUI pointer
  314. --------------------------------------------------------------------------------
  315. Added colour-based indicator of whether the spell can be afforded.
  316. --------------------------------------------------------------------------------
  317. Made player always render on top of alive enemies, which always render on top of dead enemies.
  318.  
  319. Disabled physical collision between player and enemies.
  320.  
  321. Increased physical collision range of enemies with themselves
  322. --------------------------------------------------------------------------------
  323. Merged in Sora'sChanges (pull request #5)
  324.  
  325. New Enemy
  326. --------------------------------------------------------------------------------
  327. Made enemies a tad faster by default to force use of push to remain alive.
  328. Added a small physical collider to them so they don't overlap
  329. --------------------------------------------------------------------------------
  330. Hopefully made the lightning spell more reliable
  331. --------------------------------------------------------------------------------
  332. Fixed (hopefully) the reset problem with enemy spawning.
  333. Also fixed the push spell not working on enemies that are too close.
  334. --------------------------------------------------------------------------------
  335. Added container for lighting prefab spawning (implemented Lightning Container and Enemy COntainer on both levels).
  336.  
  337. Fixed enemy deaths by deleting their rigidbodies.
  338.  
  339. Implemented semaphore locking on contagion ranges to hopefully make the spread more reliable when enemies are already inside when it spawns.
  340.  
  341. Did a little balancing of the fireball and the lightning.
  342. --------------------------------------------------------------------------------
  343. Made the enemies slower so that it's no-longer impossible to survive.
  344. Fixed the enemies having their script delete itself (so lightning broke), as well as enabling the fix across all the other files that reference it (sigh).
  345.  
  346. Limited the number of contagion ranges that can spawn at any one time... Might need to be upped to a decent number, but seems fine so far (plus no more crashes!)
  347. --------------------------------------------------------------------------------
  348. Fixed the damage over time only working when the player is moving.
  349. --------------------------------------------------------------------------------
  350. Spammed in a bunch of comments, not finished by a long shot, but they're there.
  351.  
  352. Implemented the Player as a Prefab so that we can carry it across scenes.
  353.  
  354. Implemented Enemy Spawning within a container to prevent Hierarchy Spam, will probably do something similar for spells and areas eventually.
  355.  
  356. Made the Enemy Rotation base itself off having no health rather than not moving to prevent it activating when stopping at the player.
  357.  
  358. Added a start delay to the enemyspawner script to allow for greater control and variety with enemy spawning.
  359.  
  360. Started referencing Static Class Variables properly, and moved the totalVisibleEnemies count to the player to allow it to apply globally over all instances of enemyspawner.
  361. --------------------------------------------------------------------------------
  362. Merged in Ilya (pull request #4)
  363.  
  364. SpiderSprite Death and rotation animation
  365. --------------------------------------------------------------------------------
  366. Removed the Death Sprite from the Scene
  367. --------------------------------------------------------------------------------
  368. Fixed the main menu.
  369. --------------------------------------------------------------------------------
  370. Fixed the cursor not re-filling when swapping during cooldown
  371. --------------------------------------------------------------------------------
  372. Re-wrote cursors to be animatable, added Cursor Animation (both passive rotation and radial fill for the cooldown timer).
  373. --------------------------------------------------------------------------------
  374. Added cursor rotation and filling of the timer based on the time until the spell cooldown resets
  375. --------------------------------------------------------------------------------
  376. Re-wrote Cursors, implemented animated timer, but not animating properly
  377. --------------------------------------------------------------------------------
  378. Started re-writing the cursors, currently everything is broken
  379. --------------------------------------------------------------------------------
  380. Replaced MouseLook with a couple of lines in PlayerController to resolve duplicate code issues.
  381. --------------------------------------------------------------------------------
  382. Changed the spell speeds to be less crappy
  383. --------------------------------------------------------------------------------
  384. Implemented proper kill count win condition scale-able to multiple enemy spawners, also adding a bunch of random image assets that aren't tracked for some reason!
  385. --------------------------------------------------------------------------------
  386. Made lightning not infinitely exponentially overpowered.
  387. Made trap cooldowns specific to traps not global.
  388. --------------------------------------------------------------------------------
  389. Merged in Ilya (pull request #2)
  390.  
  391. New sprites
  392. --------------------------------------------------------------------------------
  393. Next stage of lightning contagion complete, all that's left now is to make it's propogation limited
  394. --------------------------------------------------------------------------------
  395. Merged in Sora'sChanges (pull request #1)
  396.  
  397. Sprites Changes
  398. --------------------------------------------------------------------------------
  399. Second stage of lightning spell completed
  400. --------------------------------------------------------------------------------
  401. Added the script back to the traps after renaming it so now they work again
  402. --------------------------------------------------------------------------------
  403. Renamed NegativeTrigger to TrapScript for clarity
  404. --------------------------------------------------------------------------------
  405. Implemented the first stage of lightning spells, currently don't propogate.
  406. Refactored Spell code to work based off inheritance.
  407. --------------------------------------------------------------------------------
  408. Adding Lightning Spell and re-working spells to use inheritance
  409. --------------------------------------------------------------------------------
  410. Quadrupled enemy spawn rate
  411. --------------------------------------------------------------------------------
  412. Made the traps smaller, kinda makes it more fun, but still need movement incentive
  413. --------------------------------------------------------------------------------
  414. Made the push spell work better
  415. Made the spells faster
  416. Made the hitbox appropriately sized
  417. Made enemies not die till you've seen them (ish)
  418. Removed a deprecation warning
  419. --------------------------------------------------------------------------------
  420. Fixed the Enemy Animations after they broke for some reason.
  421. --------------------------------------------------------------------------------
  422. Moved the project 1 folder higher to try to get it to work properly with the cloud build.
  423. --------------------------------------------------------------------------------
  424. Removed the broken animations we were testing as well as a bunch of superfluous sprites.
  425.  
  426. Also fixed the deprecated application.loadlevel calls by switching to the new function
  427. --------------------------------------------------------------------------------
  428. Removed mana drops from spell kills, changed enemy sprite back to small one, and such
  429. --------------------------------------------------------------------------------
  430. Added Ant as Enemy
  431. --------------------------------------------------------------------------------
  432. Implemented pausing and switched from Time.timeScale == 0 to playerController.paused
  433. --------------------------------------------------------------------------------
  434. Implemented mana cost, set default costs for existing spells.
  435. --------------------------------------------------------------------------------
  436. Removed deprecated level load and switched to scene loading.
  437. Added the scenes to the build settings so the buttons actually work.
  438. Fixed the background music not stopping when you win.
  439. --------------------------------------------------------------------------------
  440. Disabled spell firing and spell selection while paused (and possibly other inputs as well)
  441. --------------------------------------------------------------------------------
  442. Fixed up the event system so now the playerController is the one that decides on the state of the game.
  443.  
  444. Implemented Pause and properly applying sounds to all events.
  445. --------------------------------------------------------------------------------
  446. Merge remote-tracking branch 'origin/MessingUp'
  447. --------------------------------------------------------------------------------
  448. Removed some commented code that was not needed anymore, re-fixed the selected spell colour box thing.
  449. --------------------------------------------------------------------------------
  450. Fixed the errors I was having.
  451.  
  452. Spells are essentially infinitely expandable.
  453. Far less traps on the level, much more exciting gameplay!
  454. --------------------------------------------------------------------------------
  455. Reverted the changes from the previous two commits, will try to fix those in a separate branch
  456. --------------------------------------------------------------------------------
  457. Saving current work
  458. Broken dunno why
  459. --------------------------------------------------------------------------------
  460. Stuff definitely broke, gotta commit and push to do a diff to figure out what/how
  461. --------------------------------------------------------------------------------
  462. Saving current work
  463. --------------------------------------------------------------------------------
  464. Implemented the Damage over Time mechanic, but to do so I had to convert health and damage to floats, which messes up the UI a little bit, though I'm not sure why.
  465. --------------------------------------------------------------------------------
  466. Added a push spell animation, is loads of fun but needs a cooldown to make it more antsy
  467. --------------------------------------------------------------------------------
  468. Push spell added, number keys switch between spells
  469.  
  470. I reckon the push spell might be the funnest thing ever!
  471. --------------------------------------------------------------------------------
  472. Converted player to take health damage instead of lose lives based on trap AND enemy collision.
  473. Damage over time is not implemented yet though.
  474.  
  475. Spells can be set as piercing, but default to deleting themselves when they hit a single enemy
  476. --------------------------------------------------------------------------------
  477. Fixed the enemies taking damage when hit by spell, and fixed spells deleting themselves when they exit the play area.
  478. --------------------------------------------------------------------------------
  479. Implemented spells firing at mouse position.
  480.  
  481. TO-DO: Need to destroy them when they go outside the boundary (which should be working, but isn't).
  482.  
  483. TO-DO: Have enemies take damage on contact (also should work).
  484. --------------------------------------------------------------------------------
  485. Fixed up the level so all the traps are tagged properly with 'Trap'.
  486.  
  487. Tidied up some code inside the EnemyController to take damage according to the value set on the trap, and only check if it's died during the damage-taking.
  488.  
  489. Changed the Enemy Prefab back to having the collider as a trigger, so now enemies are actually hurt by traps instead testing to see if they're an obstacle.
  490.  
  491. Enemies now rather amusingly spawn immediately on top of and are killed by traps... Will probably need to significantly reduce the amount of traps in the levels from what we have now.
  492. --------------------------------------------------------------------------------
  493. Massive Massive Massive changes, threw everything into categorised folders, added some basic stuff to Ass4 Scene and various other housekeeping changes.
  494.  
  495. Also added rudimentary animated enemy as requested by Ilya.
  496. --------------------------------------------------------------------------------
  497. Quick fix to add the snippet that makes them rotate to face the way they're moving
  498. --------------------------------------------------------------------------------
  499. Enemy spawner script works (may not be very optimal).
  500. Attached a sample config for the script to the DefaultEnemy prefab for testing.
  501.  
  502. The spawner script requires attaching to a gameobject in the scene, and also requires a WorldBounds prefab with the Collider2D set to the area in which enemies can spawn.
  503. --------------------------------------------------------------------------------
  504. Implemented 'Enemy Seek Player' AI behaviour.
  505. Implemented 'Click Enemy to Delete it' behaviour.
  506.  
  507. Changed the Negative Trigger script to only hurt the player if the collision was with the player.
  508.  
  509. Added a DefaultEnemy prefab using the Medkit as the sprite and with a couple of basic settings enabled.
  510. --------------------------------------------------------------------------------
  511. Basic Basic structure of the Seek-Player Enemy AI (I've also included damage, health and position)
  512. --------------------------------------------------------------------------------
  513. Added the web player build folder to the repo exclusions
  514. --------------------------------------------------------------------------------
  515. Removed the item pickups from the scene. spread out the wreckage to not be the main obstacle.
  516. --------------------------------------------------------------------------------
  517. Removed the bob scenes and stuff, added in my COMP260 prototype as the basis off which we can build the prototype for Merlin.
  518.  
  519. The test scene is still in, but I'm not 'The Guy' for scenes, so they can modify it to be how it should be after we get something working!
  520. --------------------------------------------------------------------------------
  521. Changed serialisation of assets to be non-binary, should help with merge conflicts being easier to fix
  522. --------------------------------------------------------------------------------
  523. Added Bobby and put the cool new stages in testscene
  524. --------------------------------------------------------------------------------
  525. Another test scene
  526. --------------------------------------------------------------------------------
  527. Added Test Scene with prefab, and some 2D assets
  528. --------------------------------------------------------------------------------
  529. Base Unity Project stored in Git for fun and lulz.
  530. --------------------------------------------------------------------------------
  531. Adding gitignore file because windows sucks
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!