Commit Graph

24 Commits

Author SHA1 Message Date
Vladimir 25d3483577 Fix 2020-10-01 17:31:43 +05:00
AndreyCrusader e1ff6cb120 Merge branch 'developer' into modellers 2020-10-01 17:14:35 +05:00
AndreyCrusader 7853fa504a fix merge 2020-10-01 16:58:26 +05:00
Vladimir 3014887427 Skrew 2020-09-30 19:54:38 +05:00
Vladimir 24100b1db4 Merge remote-tracking branch 'origin/developer' into modellers 2020-09-30 19:41:42 +05:00
AndreyCrusader 26da72bad6 add rotation blades 2020-09-30 19:33:25 +05:00
AndreyCrusader 5503537c99 Merge branch 'modellers' into developer 2020-09-30 16:01:29 +05:00
AndreyCrusader bfb03b2902 Merge remote-tracking branch 'origin/modellers' into modellers 2020-09-30 16:00:32 +05:00
AndreyCrusader 8323af75d8 Merge branch 'modellers' into developer 2020-09-30 15:49:55 +05:00
AndreyCrusader e8aa1208f0 Merge branch 'developer' into modellers 2020-09-30 15:49:04 +05:00
AndreyCrusader 10f35d5623 add cpp clas 2020-09-30 15:47:23 +05:00
Vladimir c0782a1f35 Separation of moving parts 2020-09-30 14:29:29 +05:00
Vladimir 5a610cffcb Merge remote-tracking branch 'origin/developer' into modellers 2020-09-29 20:29:35 +05:00
AndreyCrusader c4ca5ee755 add water 2020-09-29 20:20:46 +05:00
AndreyCrusader c03d2ced42 Merge branch 'modellers' into developer 2020-09-29 19:17:34 +05:00
AndreyCrusader 6db161aa71 add mewshes to project 2020-09-29 19:10:42 +05:00
Vladimir be6c590bea NewShip 2020-09-29 18:46:11 +05:00
AndreyCrusader 3d4ef7e622 delet test 2020-09-29 18:19:10 +05:00
AndreyCrusader 944a448922 test 2020-09-29 18:18:19 +05:00
AndreyCrusader e369bb5efe Merge branch 'master' into developer 2020-09-29 18:01:08 +05:00
AndreyCrusader 4e9ebdbfdb Merge branch 'master' into modellers 2020-09-29 18:00:24 +05:00
AndreyCrusader 92d7c51b53 add new map and settings 2020-09-29 17:59:46 +05:00
AndreyCrusader c4bad82a37 add project 2020-09-29 17:34:16 +05:00
AndreyCrusader 944018975d Initial commit 2020-09-29 15:46:42 +05:00