Implemented Finite State Machine by gregormaclaine · Pull Request #3 · underscore-engine/engine

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine · 2022-02-05T02:12:05Z

This feature branch creates a FSM framework for the program that will make it much easier to have different views that can be switched between such as the menu and the game. This also involved clearing up the code for the menu and modularising some of the features in it like the button.

The most recent commits in main have been merged into it, meaning it includes the new additions of player health and the background.

This version is also fully functional on macOS amd64, so it needs testing on windows before mergining into the main branch.

This commit technically does not work because for some reason at the start of the program the framerate acts a bit weird. It causes everything effected by gravity (player and enemies) to fall directly through the platforms and therefore go beneath the screen. This then immediately fixes itself as the framerate stabalises. I am not going to try to fix this because when there is a menu beforehand, it will allow time before the players and enemies are placed, meaning that issue should never occur.

# Conflicts: # src/main.cpp

This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

egorvert

Code is good and functional on Mac. It would be appreciated if you could add comments to your code to explain what it does so the rest of the team doesn't have to spend their precious time on figuring out what the hell you're doing.

Some bugs I noticed:

Hitboxes are always shown and control / command B does not turn them off
Resizing a window causes the character to fly off the screen

Tl;Dr
★★★★☆
Good feature rich commit but with little annotation and a few bugs. Also needs testing on Windows.

gregormaclaine · 2022-02-07T17:11:58Z

Woops closed it by accident. Also I see the bug with resizing the window, but the hitbox outlines work perfectly find for me? They don't show up to begin with and toggle visibility with Ctrl-B.

…ough ground on gamestart

gregormaclaine · 2022-02-12T17:44:04Z

All bugs and changes requested by Egor have been implemented.
Branch is now ready for merge

std::vector is dynamic so it can be freely added to, which will be important later on. It's also much easier to iterate through. I needed the vectors to be of the class pointers as sometimes (by that I mean all the time) the textures of the sprites would unload since the vector would keep trying to move the memory around which would break the reference between the texture and the sprite causing it to show a tan rectangle instead of the actual picture.

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

gregormaclaine added 14 commits November 17, 2021 16:30

Added sprite class and new enemy image
ba8a30d

Implemented sprite class in player and staticsprite
f023e3f

Added third platform
af50464

Merge branch 'main' into sprite-class-again
4eea575
# Conflicts: # src/main.cpp

Added control-r to also reset enemies positions
3364cb0

Merge branch 'main' into sprite-class
1a88d13
# Conflicts: # src/main.cpp

TEMP: states
7b0abe9

Edits for Mac installation
dc2de67

Added update function to sprite class
01f025c

Updates to vscode settings
9acd164

TMP: Added main functionality of menu buttons and finite state machine
c420b68
This is a temporary commit, as currently the user stays in the menu stage and can't progress to the game due to the buttons not being fully functional.

Moved game logic to Game class and finished FSM
023f51a

Merge branch 'main' into finite-state-machine
e8c0c15
# Conflicts: # src/Enemy.cpp # src/Enemy.hpp # src/Menu.cpp # src/Menu.hpp # src/Player.cpp # src/Player.hpp # src/main.cpp

gregormaclaine requested a review from egorvert February 5, 2022 02:12

gregormaclaine self-assigned this Feb 5, 2022

gregormaclaine requested review from AdamHeal, JaneM443 and egorvert and removed request for JaneM443 and egorvert February 5, 2022 02:12

egorvert requested changes Feb 7, 2022
View reviewed changes

gregormaclaine closed this Feb 7, 2022

gregormaclaine reopened this Feb 7, 2022

gregormaclaine added 2 commits February 7, 2022 18:03

Added a lot of comments
e557119

Added some docs on the FSM
5eaf888

Alan Xuand others added 5 commits February 9, 2022 15:58

Fixed bugs to work on windows
16f4c26

Fixed hitbox always showing bug on windows
62a2750

Sprites now don't clip through platforms during window resize
c5f1c48

Separated deltatime checker into separate file
497b1c0

Increased certainty of deltatime anomaly & fixed enemies clipping thr…
3ca3c02
…ough ground on gamestart

gregormaclaine force-pushed the finite-state-machine branch from 73b8f8c to 3ca3c02Compare February 12, 2022 17:41

gregormaclaine added 2 commits February 13, 2022 00:18

Hopefully fixed warning in vscode settings from deprecated key
ed00e4e

Uh oh!

Conversation

gregormaclaine commented Feb 5, 2022

Uh oh!

egorvert left a comment

Choose a reason for hiding this comment

Uh oh!

gregormaclaine commented Feb 7, 2022

Uh oh!

gregormaclaine commented Feb 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

gregormaclaine commented Feb 5, 2022

Uh oh!

egorvert left a comment

Choose a reason for hiding this comment

Uh oh!

gregormaclaine commented Feb 7, 2022

Uh oh!

gregormaclaine commented Feb 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

gregormaclaine commented Feb 5, 2022

Uh oh!

egorvert left a comment

Choose a reason for hiding this comment

Uh oh!

gregormaclaine commented Feb 7, 2022

Uh oh!

gregormaclaine commented Feb 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

gregormaclaine commented Feb 5, 2022

Uh oh!

egorvert left a comment

Choose a reason for hiding this comment

Uh oh!

gregormaclaine commented Feb 7, 2022

Uh oh!

gregormaclaine commented Feb 12, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

gregormaclaine commented Feb 5, 2022

Uh oh!