Merge branch 'tmj-dev' into milek-dev

2026-07-21 20:39:18 +02:00 · 2019-03-16 01:37:38 +01:00
parent 8a5ca4e05a 8d67338950
commit 4bc90cdd19
35 changed files with 2328 additions and 1740 deletions
--- a/scene.h
+++ b/scene.h
@@ -52,6 +52,7 @@ struct scratch_data {
        std::vector<int> couplings;
        TDynamicObject * driver { nullptr };
        bool is_open { false };
+        std::unordered_map<std::string, std::string> assignment;
    } trainset;

    std::string name;