Commit Graph

300 Commits

Author SHA1 Message Date
Martin HART dad43a7e77 Merge branch 'fix-name' into 'master'
Change .create_map() to .create(), and turn* to set*

See merge request mhart/DancingDroids!25
2020-10-20 21:56:42 +02:00
Martin HART bb58983b6c Change .create_map() to .create(), and turn* to set* 2020-10-20 21:39:45 +02:00
Viala axel 288a1278b4 Merge branch 'change-date-if-work' into 'master'
A merger si tout le monde a push des choses avant dimanche ;)

See merge request paris8-rust/DancingDroids!7
2020-10-20 20:00:24 +02:00
Martin HART 73674d26de Merge branch 'test-world' into 'master'
test of World methods

See merge request mhart/DancingDroids!24
2020-10-20 17:38:16 +02:00
Volodymyr Patuta 2603fb5751 test of World methods 2020-10-20 17:33:57 +02:00
Martin HART 08557961a1 Merge branch 'queues' into 'master'
Queues

See merge request mhart/DancingDroids!23
2020-10-20 17:01:09 +02:00
Martin HART 67c292b9e2 Add empty_position() 2020-10-20 16:57:51 +02:00
Martin HART 569a6eaf94 Change to_ to turn_ 2020-10-20 16:00:26 +02:00
Martin HART 2dba5a9721 add queues to Robot 2020-10-20 15:38:03 +02:00
Martin HART 7ad8268c9f Add queues to dependencies 2020-10-20 15:15:56 +02:00
Martin HART 419d9ce414 Merge branch 'fix-arrow' into 'master'
fix arrow type

See merge request mhart/DancingDroids!22
2020-10-20 14:12:30 +02:00
Volodymyr Patuta ea4e5bad6d fix arrow type 2020-10-20 14:10:47 +02:00
Martin HART 0f3ea996b0 Merge branch 'comment' into 'master'
add somme comments

See merge request mhart/DancingDroids!21
2020-10-20 14:07:11 +02:00
Martin HART f1f052bdde add somme comments 2020-10-20 14:06:10 +02:00
Martin HART bd9681ad86 Merge branch 'set-robot' into 'master'
set robot on the map

See merge request mhart/DancingDroids!20
2020-10-20 13:59:26 +02:00
Volodymyr Patuta f639fa3d63 set robot on the map 2020-10-20 13:57:23 +02:00
Martin HART 3d686c7770 Merge branch 'world' into 'master'
Create a new world O_o

See merge request mhart/DancingDroids!19
2020-10-20 13:45:45 +02:00
Martin HART 6c19f303fa Add create_map() 2020-10-20 13:42:32 +02:00
Martin HART 26a25d7e79 Merge branch 'fix-main' into 'master'
unwrap() to unwrap_or()

See merge request mhart/DancingDroids!18
2020-10-20 13:20:05 +02:00
Volodymyr Patuta 7d89451fef we don't want to panic! 2020-10-20 13:17:50 +02:00
Volodymyr Patuta 3045d43cd8 Merge branch 'master' of framagit.org:mhart/DancingDroids into volodymyr-dev 2020-10-20 13:08:29 +02:00
Martin HART 1061282246 Merge branch 'fix-main' into 'master'
open_file takes value of arg

See merge request mhart/DancingDroids!17
2020-10-20 13:08:11 +02:00
Volodymyr Patuta be2e955f36 open_file takes value of arg 2020-10-20 13:06:08 +02:00
Volodymyr Patuta 0966268c85 open_file takes value of arg 2020-10-20 13:03:53 +02:00
Martin HART 37f8df35ea Merge branch 'flag-handling' into 'master'
Flag handling

See merge request mhart/DancingDroids!16
2020-10-20 12:51:20 +02:00
Martin HART 857bd2c091 Add the lib Clap 2.33.3 to dependencies 2020-10-20 12:50:05 +02:00
Martin HART 861001a2e1 Add flags 2020-10-20 12:48:28 +02:00
Martin HART 1bd216c50b Merge branch 'volodymyr-dev' into 'master'
implement orientation change and instructions to the robot

See merge request mhart/DancingDroids!15
2020-10-20 12:15:59 +02:00
Volodymyr Patuta e58313d76c implement orientation change and instructions to the robot 2020-10-20 11:53:53 +02:00
Martin HART 659c79ae04 Merge branch 'fix-main' into 'master'
error handling in main

See merge request mhart/DancingDroids!14
2020-10-19 12:52:31 +02:00
Volodymyr Patuta 015a8a33ae error handling in main 2020-10-19 12:50:48 +02:00
Martin HART ec01c0c1d4 Merge branch 'add-world' into 'master'
Add world struct

See merge request mhart/DancingDroids!13
2020-10-19 12:33:08 +02:00
Volodymyr Patuta 22cf314f4d add map 2020-10-19 12:32:14 +02:00
Volodymyr Patuta b2b00d0d62 added struct World 2020-10-19 12:23:38 +02:00
Martin HART c95797d4cf Merge branch 'martin-dev' into 'master'
Add documentation to main.rs

See merge request mhart/DancingDroids!12
2020-10-18 15:00:53 +02:00
mhart a55a4935ac Rename conf to raw_conf, conf will be the parsed configuration String 2020-10-17 21:17:36 +02:00
mhart bd89bfa744 Add Vec<Robot> to store all the robots 2020-10-17 21:05:06 +02:00
mhart 8508c53bef Add documentation to main.rs 2020-10-17 18:16:40 +02:00
Martin HART 5ea2024e31 Merge branch 'robot-struct' into 'master'
position and robot structs

See merge request mhart/DancingDroids!11
2020-10-16 13:00:45 +02:00
Volodymyr Patuta a688c11d4b Changed position to u32 and added ID. 2020-10-16 12:59:40 +02:00
Volodymyr Patuta 918334a3cb position and robot structs 2020-10-16 09:11:28 +02:00
mhart cff39f9dad Merge branch 'master' of https://framagit.org/paris8-rust/DancingDroids into master
Sync teacher change
2020-10-14 22:09:21 +02:00
Angelique Delevingne 888e8904eb Fix d'une erreur dans l'execution donné en exemple. 2020-10-14 22:07:45 +02:00
Viala axel b470fb6c0d Dual licencing like Rust Apache/mit 2020-10-14 00:06:11 +02:00
mhart 3c1a7f6fe4 Merge branch 'master' of https://framagit.org/paris8-rust/DancingDroids into master
Sync teacher changes
2020-10-13 22:18:36 +02:00
Viala axel 0561d43f0e Merge branch 'fix-typo' into 'master'
Correction d'un typo dans le paragraphe sur les collisions.

See merge request paris8-rust/DancingDroids!9
2020-10-13 22:13:30 +02:00
Viala axel 19c0465c0f Add licence apache 2020-10-13 22:03:05 +02:00
mhart 4e224acefb Merge branch 'master' of https://framagit.org/paris8-rust/DancingDroids into master
Sync teacher changes
2020-10-13 20:34:15 +02:00
Claire 48f6677a98 Correction d'un typo dans le paragraphe sur les collisions. 2020-10-13 18:18:44 +02:00
Axel Viala 0faee29855 Simplification et formatage sur les Instructions. 2020-10-13 17:49:58 +02:00