Do not
Merge branch 'master' into FernandoC
Merge pull request #28 from cptcaveman/dovlu

manager meta files
manager metas
Merge branch 'master' into saltymccloud
Merge pull request #29 from cptcaveman/dovlu

adding real prefabs with correction information
Merge branch 'master' into saltymccloud
Metronome is geared to attempt looping
Merge branch 'Metronome' into Peter
Merge pull request #30 from cptcaveman/Peter

Peter
Commiting updated enemy prefab and prefab meta
Merge pull request #32 from cptcaveman/gcyoshi13

Commiting updated enemy prefab and prefab meta
Tiles are now instantiated using the parser
fixed merge errors with DJGoneRogueGame.prefab
Merge pull request #33 from cptcaveman/FernandoC

Fernando c
Fixed some more prefab errors that I found
Merge pull request #34 from cptcaveman/FernandoC

Fixed some more prefab errors that I found
committing movement/hopping. an entity with the movement script attached to it should hop now as soon as the direction field of the Movement component is set to anything but DJ_Dir.NONE. updating input to reflect those changes. Updating Util class to fix snapping issue as well as DJ_Point for the same issue. Adding camera class/prefab and cameramanager class/prefab. updating player manager with static accessors - Wyatt S.
Merge branch 'master' into saltymccloud
Merge pull request #35 from cptcaveman/saltymccloud

Saltymccloud