develop #30

Merged

cromer merged 55 commits from develop into master 2022-08-26 10:53:59 -04:00

Conversation 0 Commits 55 Files Changed 66 +1966 -10

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

Owner

Copy Link

No description provided.

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

add enemy scenes 7d62b37ffc

change collision layers and masks 4196f4d9e9

add enemies prototype level 9aafc64ba7

add enemies collision name to project 28f7af6c73

start monitor scene d79864c05d

Get monitor working and communicating with backend 9f3e78fa94

allow starting and stopping the monitor via signal f582a32124

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

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

remove player script 0d2b9cb67f

add pixel operator fonts 0d1613a7ef

add GUI to get player info 10bf1fd270

pause game when starting e4b91d2739

remove default text from text inputs 39d0804268

validate information and send it to the monitor ae40849c21

fix bug with RUT validation 84eb228a6c

Merge branch 'develop' into feature/enemies 31003a2863

add some enemy behavior prototypes 948f4ce911

undo accidental collision extents change edd24b6798

add comment to _on_player_touched d35993d072

add level 2 music 4f8c134bb7

GUI should not be visible until ready 1398f3d92c

make ui_accept press the button 71bf91fd2f

Merge branch 'develop' into feature/enemies 332ac5b028

fix error that happens after the GUI is freed 5c4106246c

Merge branch 'develop' into feature/enemies 8eabc38a91

gui focus changes and limits 6b86126127

Merge branch 'develop' into feature/enemies d50d5063b8

add sounds and adjust music 8cfa1d5cce

connect signals to the dreadteeth f9e70eae01

change dot vector check to be greater than 0 18a7cac068

Merge branch 'develop' into feature/enemies ... f8f1210e61

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

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

add CRT shader 457915a46a

Merge branch 'develop' into feature/enemies 09916a0598

make dreadtooth animation start automatically 89f1ac5303

add blightwing's behavior a72954b578

add blightwing prototype example 5ce3a2f37c

remove godot-cpp submodule d0ad886184

remove godot-cpp submodule c3986d34a4

add godot-cpp 3.5 submodule 0d0fb42698

Merge branch 'develop' into feature/enemies 7a3b29a419

use the Time singleton instead of OS singleton ... 0f85d5cfa3

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

Merge branch 'develop' into feature/enemies 81faf5d32e

fix text spacing eb22e8b883

Merge branch 'develop' into feature/enemies 5d1f634e08

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

Reviewed-on: #28

fix monitor bug where player info wasn't being sent 8e5c035675

add default player info for quicker development 0000cd114c

fix incorrect name in log e7fb9dff03

dynamically load monitor and crt shader 2a7b20ed54

refactor code to be more decoupled 563cdade00

submit form when enter is pressed bb0c4e302d

fix level not loading when monitor is disabled 0c8c3f6d1b

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

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.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

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

No description provided.