Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'group1/develop' of https://github.com/maxfindel/gameworks into group1/develop
comments for map edition classes
Merge branch 'group1/master' of https://github.com/maxfindel/gameworks into group1/develop
merge with all branches
merge with master branch
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
merge without src. in path for packages
fixing merge conflict
merging game.java
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
Merge branch 'master' of https://github.com/maxfindel/gameworks into group1/develop
res image to res images
singleton en mapEditionFrame
singleton on frames
adding attributes to list on character edition
Cambiado el EventManager por un historyManager, el cual se comunica con RestrictionManager y EventManager, para eliminar la carga de Dios del EventManager. Tambien agregados los metodos genericos para ser sobreescritos a Result y Restriction
Se agrega clase abstracta behaviour y se crean hunter y custom