|
|
5ae8fb3f27
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-22 13:15:27 +01:00 |
|
|
|
72500a520c
|
fix error orange talking
|
2015-01-22 13:13:27 +01:00 |
|
anselme16
|
c049afa696
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-22 13:09:11 +01:00 |
|
anselme16
|
0a75bce02f
|
changed some things on default window size
|
2015-01-22 13:08:07 +01:00 |
|
|
|
0d3143773d
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-22 08:22:37 +01:00 |
|
|
|
cc9e8538dd
|
bug with com_data->flag
|
2015-01-22 08:22:16 +01:00 |
|
Anselme
|
5e3bb43576
|
implemented most of missing features, debugging is still in progress
|
2015-01-20 00:31:00 +01:00 |
|
anselme16
|
f69fece27a
|
half-implemented figthts
|
2015-01-19 16:56:41 +01:00 |
|
|
|
9b6cbe6aad
|
rename function in orange with prefix
|
2015-01-19 15:54:52 +01:00 |
|
|
|
0bda0053a9
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-19 09:04:47 +01:00 |
|
|
|
d646f13d30
|
fix bug generator
|
2015-01-19 09:04:17 +01:00 |
|
anselme16
|
5c6c1f947e
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-19 09:00:19 +01:00 |
|
anselme16
|
f17e21258c
|
implemented communicate (not debugged)
|
2015-01-19 08:56:21 +01:00 |
|
|
|
b1f928028d
|
avoid merge conflict
|
2015-01-19 08:20:38 +01:00 |
|
|
|
f61e4c63e4
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-19 08:06:50 +01:00 |
|
|
|
efca69674b
|
put the north at the north
|
2015-01-19 08:04:43 +01:00 |
|
anselme16
|
daa95448ea
|
added getInfo
|
2015-01-19 08:01:47 +01:00 |
|
|
|
b1ed0df54a
|
fix compil error in orange.c
|
2015-01-17 12:03:13 +01:00 |
|
|
|
dd480fe352
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
Conflicts:
orange.c
|
2015-01-17 10:57:18 +01:00 |
|
|
|
7f196ac60f
|
start AI orange
|
2015-01-17 10:54:05 +01:00 |
|
Anselme
|
7d4ff9021e
|
made some changes
|
2015-01-17 01:14:56 +01:00 |
|
Anselme
|
695f9e79a0
|
fixed memory issue ith more than 50 dudes
|
2015-01-15 22:40:47 +01:00 |
|
Anselme
|
858a9f6201
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-15 20:03:08 +01:00 |
|
Anselme
|
9deee8f0cf
|
forgot a little thing
|
2015-01-15 20:01:37 +01:00 |
|
Anselme
|
4a29cad6cc
|
fixed purple IA problems and found bug in spawn food handling
|
2015-01-15 19:59:55 +01:00 |
|
|
|
c69877bab4
|
fix erreur color spawn in generator
|
2015-01-15 19:58:48 +01:00 |
|
anselme16
|
cb02ca1330
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-15 17:43:04 +01:00 |
|
anselme16
|
242cb0eec8
|
debugged put
|
2015-01-15 17:42:59 +01:00 |
|
|
|
2a85123171
|
line duplication when zooming fixed
|
2015-01-15 17:16:43 +01:00 |
|
|
|
944fc66665
|
add limit for x/y offset
|
2015-01-15 09:25:21 +01:00 |
|
|
|
79bc7066b0
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-15 00:31:15 +01:00 |
|
|
|
9e6a988def
|
heightmap generated in generator_bis.c
|
2015-01-15 00:30:59 +01:00 |
|
Anselme
|
0bc1604747
|
implemented pick/put test algorith for purple, but it is bugged
|
2015-01-14 22:57:58 +01:00 |
|
anselme16
|
b3a6964493
|
added possibility to pause, move the camera, and zoom
|
2015-01-14 17:04:48 +01:00 |
|
anselme16
|
6697095a87
|
implemented work, pick, put (not debugged yet)
|
2015-01-14 11:57:27 +01:00 |
|
|
|
f6016843ed
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-14 10:22:38 +01:00 |
|
|
|
e440d92591
|
generator okay (worked but can be improved)
|
2015-01-14 10:16:10 +01:00 |
|
Anselme
|
fc3a09036b
|
made some changes in the input
|
2015-01-14 00:29:25 +01:00 |
|
|
|
c6174a62db
|
fix bug spawn in generator.c
|
2015-01-13 23:52:36 +01:00 |
|
|
|
6822bb8cbb
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-13 23:38:00 +01:00 |
|
|
|
c745c0746f
|
temporary version of generator
|
2015-01-13 23:37:37 +01:00 |
|
Anselme
|
af2321fe71
|
debugged move action, and some other render problems
|
2015-01-13 23:35:48 +01:00 |
|
anselme16
|
ade7d5d38b
|
worked on move action
|
2015-01-13 17:44:10 +01:00 |
|
Anselme
|
839eebe5d4
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-13 09:54:47 +01:00 |
|
Anselme
|
957f41517f
|
added alternative map generator, for testing purposes, type 'make anselme' to use it
|
2015-01-13 09:54:27 +01:00 |
|
|
|
2af846ecdf
|
fixed bug (divzero) in generator, still problem with proba
|
2015-01-13 09:22:45 +01:00 |
|
|
|
4b3f5e659a
|
Merge branch 'master' of https://git.tagachop.fr/epicsparrow/PixelWars
|
2015-01-13 00:19:52 +01:00 |
|
|
|
bacc20acb5
|
fix generator, not completed
|
2015-01-13 00:19:26 +01:00 |
|
Anselme
|
85cdeaf4d3
|
changed the color palette
|
2015-01-13 00:12:03 +01:00 |
|
Anselme
|
41ba6b25c7
|
debugger main and generator
|
2015-01-12 23:32:49 +01:00 |
|
