Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge branch 'develop' into feature/cleanup

Browse Source 
# Conflicts:
#	src/godot.cpp
#	src/player/Player.cpp
This commit is contained in:
Chris Cromer
2022-08-28 00:38:08 -04:00
parent c102c2ad3f 1f4d2b1b72
commit 156d3ddcae
33 changed files with 1197 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/godot.cpp
View File

@@ -1,14 +1,21 @@
#include <Godot.hpp>
#include "CameraLimit.h"
#include "Main.h"
#include "state_machine/State.h"
#include "Event.h"
#include "state_machine/StateMachine.h"
#include "state_machine/State.h"
#include "Main.h"
#include "CameraLimit.h"
#include "player/Player.h"
#include "player/states/PlayerIdle.h"
#include "player/states/PlayerMove.h"
#include "player/states/PlayerJump.h"
#include "player/states/PlayerFall.h"
#include "coin/CoinNotCollected.h"
#include "coin/CoinCollected.h"
#include "coin/CoinCounter.h"
#include "goal/GoalReached.h"
#include "goal/GoalNotReached.h"
#include "gui/game_over/GameOverScreen.h"
/**
* @brief This function connects the gdnative init function.
@@ -39,6 +46,7 @@ extern "C" void GDN_EXPORT godot_nativescript_init(void *handle)
{
godot::Godot::nativescript_init(handle);
godot::register_class<alai::Event>();
godot::register_class<alai::StateMachine>();
godot::register_class<alai::State>();
godot::register_class<alai::Main>();
@@ -48,4 +56,10 @@ extern "C" void GDN_EXPORT godot_nativescript_init(void *handle)
godot::register_class<alai::player::PlayerMove>();
godot::register_class<alai::player::PlayerJump>();
godot::register_class<alai::player::PlayerFall>();
godot::register_class<godot::CoinNotCollected>();
godot::register_class<godot::CoinCollected>();
godot::register_class<godot::CoinCounter>();
godot::register_class<godot::GoalReached>();
godot::register_class<godot::GoalNotReached>();
godot::register_class<godot::GameOverScreen>();
}