diff options
| author |  cel <cel@blos.sm> | 2022-07-16 22:49:16 +0100 |
|---|---|---|
| committer | cel <cel@blos.sm> | 2022-07-16 22:49:16 +0100 |
| commit | c5bacb265a477f1f80be6a9fbdabc072fc074a59 (patch) | |
| tree | 96274e9b60682415f31b266bc57ccf0d5bc34bfe /rust/src/lib.rs | |
| parent | 373b0d66678a349d39146262d5b288b39c5cb1e1 (diff) | |
| parent | fdbba87b346c6020d7349d0c2cb3793fcdab25f3 (diff) | |
| download | 2022-c5bacb265a477f1f80be6a9fbdabc072fc074a59.tar.gz 2022-c5bacb265a477f1f80be6a9fbdabc072fc074a59.tar.bz2 2022-c5bacb265a477f1f80be6a9fbdabc072fc074a59.zip | |
merged menu branch
Diffstat (limited to 'rust/src/lib.rs')
| -rw-r--r-- | rust/src/lib.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 1be319a..c8afc06 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -1,22 +1,26 @@ -mod game; -mod spinning_cube; mod buff_bounce; mod buff_phase; mod buff_trait; mod buff_ball; mod buff_extra; +<<<<<<< HEAD pub mod goal_trigger; mod test; +======= +>>>>>>> menu mod basic_die; use gdnative::prelude::{godot_init, InitHandle}; // Function that registers all exposed classes to Godot fn init(handle: InitHandle) { +<<<<<<< HEAD handle.add_class::<game::Game>(); handle.add_class::<spinning_cube::SpinningCube>(); handle.add_class::<goal_trigger::GoalTriggerZone>(); handle.add_class::<test::SpinningCubeReverse>(); +======= +>>>>>>> menu handle.add_class::<basic_die::BasicDie>(); } |