Revert "Refactor Damage to use Protoypes (#4262)"

This reverts commit 20bf5739a9.
This commit is contained in:
Silver
2021-08-24 00:50:39 -06:00
committed by Silver
parent 20bf5739a9
commit e708091518
121 changed files with 711 additions and 10237 deletions

View File

@@ -1853,8 +1853,6 @@ Entries:
type: Fix}
id: 330
time: '2021-08-21T17:20:18.0000000+00:00'
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
- author: metalgearsloth
changes:
- {message: Singulo slightly less janky., type: Fix}
@@ -1888,7 +1886,3 @@ Entries:
- {message: Add meteor swarm event., type: Add}
id: 336
time: '2021-08-23T03:28:48.0000000+00:00'
=======
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
>>>>>>> refactor-damageablecomponent