Skip to content

Commit 95fed7e

Browse files
gonguzgonguz
committed
Batalla con test funcionando
1 parent 427554c commit 95fed7e

File tree

2 files changed

+161
-301
lines changed

2 files changed

+161
-301
lines changed

‎c‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
commit 427554ca47a3381e5ff68a4afd25e9e48ce4d673
2+
Author: Gonzalo Guzman <[email protected]>
3+
Date: Thu Nov 17 15:56:56 2016 +0100
4+
5+
Batalla con tests pasando
6+
7+
commit 8867ab8a5c0537a5f28c43756cf68b68c55af707
8+
Author: Gonzalo Guzman <[email protected]>
9+
Date: Wed Nov 16 23:48:13 2016 +0100
10+
11+
Parte batalla conseguida
12+
13+
commit 69f648e3a1cefdbe1f9b5cc61adf53286ceb9435
14+
Author: Gonzalo Guzman <[email protected]>
15+
Date: Wed Nov 16 23:46:25 2016 +0100
16+
17+
Parte batalla conseguida
18+
19+
commit f0bfcd5cf647b2b94a895b353ef7c7ae7f74173c
20+
Author: Gonzalo Guzman <[email protected]>
21+
Date: Wed Nov 16 12:33:08 2016 +0100
22+
23+
Borrada linea innecesaria
24+
25+
commit 677d4e2353f7fec4320ec1402aee65064636700f
26+
Author: Gonzalo Guzman <[email protected]>
27+
Date: Wed Nov 16 12:26:52 2016 +0100
28+
29+
battle con parte de tests pasando
30+
31+
commit f37ba1859e6cb176edb91ff68baf1420621bb28f
32+
Author: Gonzalo Guzman <[email protected]>
33+
Date: Wed Nov 16 00:20:10 2016 +0100
34+
35+
Primera parte de battle pasando y turnlist modificado
36+
37+
commit 1aaadcebed1d7a0a18e746d8c83c010b1ae87df3
38+
Author: Gonzalo Guzman <[email protected]>
39+
Date: Mon Nov 14 17:49:01 2016 +0100
40+
41+
turnList corregido y batalla comienza
42+
43+
commit 1d6a9954312e53b6b5bcc7af9b7a3f49c6d95335
44+
Merge: b4e783a c976ec0
45+
Author: Gonzalo Guzman <[email protected]>
46+
Date: Mon Nov 14 13:23:55 2016 +0100
47+
48+
Merge branch 'optionsStack'
49+
50+
commit c976ec0ed10509c39cfcd14f3fccfa5cf47cfadf
51+
Author: Gonzalo Guzman <[email protected]>
52+
Date: Mon Nov 14 13:23:05 2016 +0100
53+
54+
optionsStack realizado, test funcionando
55+
56+
commit b4e783abe4a1dec9a45575c832e293197bf3fadb
57+
Merge: 4c49cd8 c4eec4b
58+
Author: Gonzalo Guzman <[email protected]>
59+
Date: Mon Nov 14 13:11:58 2016 +0100
60+
61+
Merge branch 'optionsGroup'
62+
63+
commit c4eec4b599198c8bf06fb98e0666ff2799afd708
64+
Author: Gonzalo Guzman <[email protected]>
65+
Date: Mon Nov 14 13:10:18 2016 +0100
66+
67+
Options group, test correctos
68+
69+
commit 4c49cd863130a9697e04c3deb6e96671fd412d62
70+
Author: Gonzalo Guzman <[email protected]>
71+
Date: Fri Nov 11 17:34:00 2016 +0100
72+
73+
CharactersView completado con test aptos
74+
75+
commit 68854618df6e361f826ea9315aa6acc52d37347d
76+
Merge: a8e856d eab5ffd
77+
Author: Gonzalo Guzman <[email protected]>
78+
Date: Mon Nov 7 00:27:18 2016 +0100
79+
80+
Merge branch 'turnList'
81+
82+
commit eab5ffd54816aea946f2b941f0dea48dce745fb9
83+
Author: Gonzalo Guzman <[email protected]>
84+
Date: Mon Nov 7 00:26:17 2016 +0100
85+
86+
Ejercicio 2 terminado, revisarlo.
87+
88+
commit a8e856d2c2e544627e80647d6c0fcce8ad19cfe5
89+
Merge: 0c704d9 7859074
90+
Author: Gonzalo Guzman <[email protected]>
91+
Date: Sun Nov 6 18:17:09 2016 +0100
92+
93+
Merge branch 'dataModel'
94+
95+
commit 78590746f3b98b96791c0257e95fe410fcb5478e
96+
Author: Gonzalo Guzman <[email protected]>
97+
Date: Sun Nov 6 18:13:13 2016 +0100
98+
99+
Test activado
100+
101+
commit 0c704d9c2ac19d28ef5cebd7a8ecaf8d3885460e
102+
Merge: 1c6f45d 48ccaf3
103+
Author: Gonzalo Guzman <[email protected]>
104+
Date: Sun Nov 6 18:08:36 2016 +0100
105+
106+
Merge branch 'dataModel'
107+
108+
commit 48ccaf3f8333faf721cb5a81ae727b1d4415600a
109+
Author: Gonzalo Guzman <[email protected]>
110+
Date: Sun Nov 6 18:08:00 2016 +0100
111+
112+
Ejer 1 completo
113+
114+
commit 1c6f45dfaa8c8e9d4930898642f82a274341ea89
115+
Merge: 9f7b76b 9c8e1d0
116+
Author: Gonzalo Guzman <[email protected]>
117+
Date: Sun Nov 6 17:39:04 2016 +0100
118+
119+
Merge branch 'dataModel'
120+
121+
commit 9c8e1d01bd3fd172d347ec21910042815c223f0a
122+
Author: Gonzalo Guzman <[email protected]>
123+
Date: Sun Nov 6 17:37:39 2016 +0100
124+
125+
Ejercicio 1 terminado
126+
127+
commit 6d2127390ec0296a9c678ca21004536cf0180350
128+
Author: Gonzalo Guzman <[email protected]>
129+
Date: Fri Nov 4 02:02:34 2016 +0100
130+
131+
Ejer 1 casi terminado
132+
133+
commit a123f4640c87a8107372201723866f386947199a
134+
Author: Gonzalo Guzman <[email protected]>
135+
Date: Fri Nov 4 00:08:19 2016 +0100
136+
137+
Carpeta temporal src borrada
138+
139+
commit 21b3989c86fe3f9966774dd6aace352ec02593a1
140+
Author: Gonzalo Guzman <[email protected]>
141+
Date: Fri Nov 4 00:06:19 2016 +0100
142+
143+
Mitad 1er ejercicio, linea gulp.js comentada. Mas adelante descomentar
144+
145+
commit 1fa886f88e9c175bcaed5c3c8d95cd051199c883
146+
Author: Gonzalo Guzman <[email protected]>
147+
Date: Thu Nov 3 20:33:06 2016 +0100
148+
149+
Cambios en items.js
150+
151+
commit 9f7b76b84b8e32c8a6131e75cf53d56b5ef98d59
152+
Author: Gonzalo Guzman <[email protected]>
153+
Date: Thu Nov 3 20:19:25 2016 +0100
154+
155+
Borrado archivo e incluido gitignore
156+
157+
commit 5f4538f7404ab83a397273c987d0096c6a6cec3b
158+
Author: Gonzalo Guzman <[email protected]>
159+
Date: Thu Nov 3 20:16:24 2016 +0100
160+
161+
Primera subida archivos

0 commit comments

Comments
 (0)