Commit Graph

28 Commits

Author SHA1 Message Date
bf5c8466a0 Merge branch 'main' into main 2024-11-13 12:39:13 +00:00
7719761959 pinchos(trampa)(color rojo) 2024-11-13 13:26:41 +01:00
e46a25c9b1 Merge pull request 'cambio color skull' (#2) from daviddiazruiz/JuegoClaseJulian:main into main
Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/2
2024-11-12 11:46:10 +00:00
6da000a5f2 cambio color skull 2024-11-12 12:42:38 +01:00
261526c8da movido el personaje Player 2024-11-07 17:50:30 +01:00
fbcc0cdb7e ultimo 2024-11-07 17:49:30 +01:00
f8195aa74d Desde iMac al git mio 2024-11-07 17:48:30 +01:00
06bc11f4ba Ultimo desde iMac 2024-11-07 17:42:42 +01:00
f4d17b640e Merge pull request 'Actualizar Personajes/EnemigoCerdito/enemigo_cerdito.gd' (#1) from cambios into main
Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/1
2024-11-07 10:33:30 +00:00
1da7b2461c Actualizar Personajes/EnemigoCerdito/enemigo_cerdito.gd 2024-11-07 10:32:22 +00:00
ade
38e9098ef3 tres 2024-11-07 11:18:41 +01:00
ade
72d6a38c08 dues 2024-11-07 11:12:54 +01:00
ade
1f848edd66 dos archivos 2024-11-07 11:04:54 +01:00
89d0f11b01
Merge pull request #5 from daviddiazruiz/main
cambio de colores al personaje principal
2024-11-06 14:19:03 +01:00
ad1e6595ae cambio de colores al personaje principal 2024-11-06 14:10:33 +01:00
af6c04e780 et5t5 2024-11-05 11:54:27 +01:00
40d27dee26 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-11-02 15:05:01 +01:00
fda3fed005 Personaje 2024-11-01 20:52:00 +01:00
65f8284dd9 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-10-27 11:02:14 +01:00
Julianlozafermin
58016d68ba
Merge pull request #3 from Julianlozafermin/NuevaRama
Nueva rama
2024-10-27 10:39:14 +01:00
0a4623f83d Merge branch 'NuevaRama' of https://github.com/Julianlozafermin/JuegoClase into NuevaRama 2024-10-27 10:38:12 +01:00
Julianlozafermin
bcf6d637b1 nuevaramar 2024-10-27 10:36:59 +01:00
Julianlozafermin
86d5f41153
Merge pull request #2 from Julianlozafermin/NuevaRama
nuevaramar
2024-10-27 10:34:22 +01:00
Julianlozafermin
b1b084fc44 nuevaramar 2024-10-27 10:33:08 +01:00
fa7be86966 Modificado gitignore 2024-10-26 14:06:19 +02:00
Julianlozafermin
fe569c1d85
Merge pull request #1 from julianloza/main
Create README.md
2024-10-26 11:01:54 +02:00
Julián
74b21e3253
Create README.md
creado desde julianloza
2024-10-26 10:59:38 +02:00
712c80ab41 Primer commit 2024-10-26 07:47:55 +02:00