develop #30

cromer · 2022-08-26T10:53:47-04:00

cromer commented

2022-08-26 10:53:47 -04:00

No description provided.

cromer added 55 commits 2022-08-26 10:53:47 -04:00

7d62b37ffc

add enemy scenes

4196f4d9e9

change collision layers and masks

9aafc64ba7

add enemies prototype level

28f7af6c73

add enemies collision name to project

d79864c05d start monitor scene

9f3e78fa94 Get monitor working and communicating with backend

f582a32124 allow starting and stopping the monitor via signal

cf20410bc8 add player node which will be used to capture their info from the HUD

298298359b move code into the start monitor function instead of setting it during initialization

0d2b9cb67f remove player script

0d1613a7ef add pixel operator fonts

10bf1fd270 add GUI to get player info

e4b91d2739 pause game when starting

39d0804268 remove default text from text inputs

ae40849c21 validate information and send it to the monitor

84eb228a6c fix bug with RUT validation

31003a2863

Merge branch 'develop' into feature/enemies

948f4ce911

add some enemy behavior prototypes

edd24b6798

undo accidental collision extents change

d35993d072

add comment to _on_player_touched

4f8c134bb7

add level 2 music

1398f3d92c GUI should not be visible until ready

71bf91fd2f make ui_accept press the button

332ac5b028

Merge branch 'develop' into feature/enemies

5c4106246c

fix error that happens after the GUI is freed

8eabc38a91

Merge branch 'develop' into feature/enemies

6b86126127

gui focus changes and limits

d50d5063b8

Merge branch 'develop' into feature/enemies

8cfa1d5cce

add sounds and adjust music

f9e70eae01

connect signals to the dreadteeth

18a7cac068

change dot vector check to be greater than 0

f8f1210e61

Merge branch 'develop' into feature/enemies

# Conflicts:
#	godot/characters/player/Player.tscn

4267332d70

move the level instance to a level node so that pausing the game doesn't effect the main node

457915a46a

add CRT shader

09916a0598

Merge branch 'develop' into feature/enemies

89f1ac5303

make dreadtooth animation start automatically

a72954b578

add blightwing's behavior

5ce3a2f37c

add blightwing prototype example

d0ad886184

remove godot-cpp submodule

c3986d34a4

remove godot-cpp submodule

0d0fb42698

add godot-cpp 3.5 submodule

7a3b29a419

Merge branch 'develop' into feature/enemies

0f85d5cfa3

use the Time singleton instead of OS singleton

time functions in OS are being deprecated and will be removed in gotod 4.0

81faf5d32e

Merge branch 'develop' into feature/enemies

eb22e8b883

fix text spacing

5d1f634e08

Merge branch 'develop' into feature/enemies

0ca95eacce Merge pull request 'feature/enemies' (#28 ) from feature/enemies into develop

Reviewed-on: #28

8e5c035675

fix monitor bug where player info wasn't being sent

0000cd114c

add default player info for quicker development

e7fb9dff03

fix incorrect name in log

2a7b20ed54

dynamically load monitor and crt shader

563cdade00

refactor code to be more decoupled

bb0c4e302d

submit form when enter is pressed

0c8c3f6d1b

fix level not loading when monitor is disabled

8321c8a610 Merge pull request 'feature/fix_monitor' (#29 ) from feature/fix_monitor into develop

Reviewed-on: #29

cromer merged commit 2f3ae6e17c into master

2022-08-26 10:53:59 -04:00

cromer referenced this issue from a commit

2022-08-26 10:53:59 -04:00

Merge pull request 'develop' (#30) from develop into master

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Proyecto-Titulo/alai#30