Commit Graph

Select branches

Hide Pull Requests

develop

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#7

#8

#9

1.0.0

1.1.0

Mono Color

• 2443caba88 Merge branch 'master' into develop #34 Chris Cromer 2022-08-28 01:13:17 -0400
• a57c4d420f Merge pull request 'feature/cleanup' (#33) from feature/cleanup into develop Chris Cromer 2022-08-28 01:09:29 -0400
• 39173cef21
  
  cleanup code #33 Chris Cromer 2022-08-28 01:08:04 -0400
• 3c8107ba9f
  
  disable monitor by default in development Chris Cromer 2022-08-28 01:04:47 -0400
• 156d3ddcae
  
  Merge branch 'develop' into feature/cleanup Chris Cromer 2022-08-28 00:38:08 -0400
• 1f4d2b1b72 Merge pull request 'feature/Coin' (#32) from feature/Coin into develop Chris Cromer 2022-08-27 22:39:00 -0400
• 3bcbde8161 Game over screen finished #32 Martin Araneda 2022-08-27 22:34:18 -0400
• 705ed4e897 Use event bus for coins Martin Araneda 2022-08-27 18:32:33 -0400
• 8b53f74929 Merge branch 'develop' into feature/Coin Martin Araneda 2022-08-27 18:17:58 -0400
• 195c7015af Merge pull request 'add event bus' (#31) from feature/event_bus into develop Chris Cromer 2022-08-27 18:16:28 -0400
• a27f968297 add gameover Martin Araneda 2022-08-27 18:14:21 -0400
• 3eb3d8765a
  
  add event bus #31 Chris Cromer 2022-08-27 18:10:36 -0400
• c102c2ad3f
  
  use empty PackedScene instead of nullptr Chris Cromer 2022-08-27 00:25:15 -0400
• 9e0d428ffa
  
  include forgotten header Chris Cromer 2022-08-26 23:57:12 -0400
• 1a2c5eab98
  
  improve default values Chris Cromer 2022-08-26 23:56:30 -0400
• ddb630ca3e
  
  change NULL to nullptr Chris Cromer 2022-08-26 21:43:09 -0400
• 3478127e86
  
  remove main namespace Chris Cromer 2022-08-26 21:02:40 -0400
• 0f4e77d4b7
  
  cleanup c++ code Chris Cromer 2022-08-26 19:27:57 -0400
• a9f26a8408
  
  Merge branch 'develop' into feature/Coin Chris Cromer 2022-08-26 13:54:25 -0400
• b74a8ce1aa
  
  fix function name and pointer usage Chris Cromer 2022-08-26 13:51:19 -0400
• ff600cd761
  
  fix spacing Chris Cromer 2022-08-26 13:48:59 -0400
• 7083f680ee
  
  ignore delta since we don't use it Chris Cromer 2022-08-26 13:48:39 -0400
• 2f3ae6e17c Merge pull request 'develop' (#30) from develop into master Chris Cromer 2022-08-26 10:53:58 -0400
• 8321c8a610 Merge pull request 'feature/fix_monitor' (#29) from feature/fix_monitor into develop #30 Chris Cromer 2022-08-26 10:53:09 -0400
• 0c8c3f6d1b
  
  fix level not loading when monitor is disabled #29 Chris Cromer 2022-08-26 10:51:16 -0400
• bb0c4e302d
  
  submit form when enter is pressed Chris Cromer 2022-08-25 10:11:46 -0400
• 563cdade00
  
  refactor code to be more decoupled Chris Cromer 2022-08-14 16:53:44 -0400
• 2a7b20ed54
  
  dynamically load monitor and crt shader Chris Cromer 2022-08-14 15:15:36 -0400
• e7fb9dff03
  
  fix incorrect name in log Chris Cromer 2022-08-14 13:18:09 -0400
• 0000cd114c
  
  add default player info for quicker development Chris Cromer 2022-08-14 12:43:25 -0400
• 8e5c035675
  
  fix monitor bug where player info wasn't being sent Chris Cromer 2022-08-14 12:42:49 -0400
• 64102a992a GameOverScreen .h/.cpp made. Godot scene completed Martin Araneda 2022-08-12 21:50:48 -0400
• 0ca95eacce Merge pull request 'feature/enemies' (#28) from feature/enemies into develop Chris Cromer 2022-08-07 18:54:14 -0400
• 5d1f634e08
  
  Merge branch 'develop' into feature/enemies #28 Chris Cromer 2022-08-06 16:49:30 -0400
• eb22e8b883
  
  fix text spacing #27 Chris Cromer 2022-08-06 16:47:23 -0400
• 81faf5d32e
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-08-05 13:57:21 -0400
• 0f85d5cfa3
  
  use the Time singleton instead of OS singleton #26 Chris Cromer 2022-08-05 13:23:45 -0400
• 7a3b29a419
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-08-05 12:16:52 -0400
• 0d0fb42698
  
  add godot-cpp 3.5 submodule #25 Chris Cromer 2022-08-05 12:06:45 -0400
• c3986d34a4
  
  remove godot-cpp submodule Chris Cromer 2022-08-05 12:04:22 -0400
• d0ad886184
  
  remove godot-cpp submodule Chris Cromer 2022-08-05 12:03:59 -0400
• 5ce3a2f37c
  
  add blightwing prototype example Chris Cromer 2022-08-04 00:59:48 -0400
• a72954b578
  
  add blightwing's behavior Chris Cromer 2022-08-04 00:59:10 -0400
• 89f1ac5303
  
  make dreadtooth animation start automatically Chris Cromer 2022-08-04 00:56:14 -0400
• 09916a0598
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-08-03 21:40:09 -0400
• 457915a46a
  
  add CRT shader #24 Chris Cromer 2022-08-03 21:38:13 -0400
• 4267332d70
  
  move the level instance to a level node so that pausing the game doesn't effect the main node #23 Chris Cromer 2022-08-03 21:25:19 -0400
• e54e3b0687 changes to coinHUD Martin Araneda 2022-08-01 15:05:09 -0400
• 2be22ceb68 Merge branch 'develop' into feature/Coin Martin Araneda 2022-08-01 14:17:05 -0400
• b24c9e8732 fix goal state Martin Araneda 2022-08-01 14:10:00 -0400
• f8f1210e61
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-07-27 00:08:25 -0400
• 18a7cac068
  
  change dot vector check to be greater than 0 Chris Cromer 2022-07-27 00:03:59 -0400
• f9e70eae01
  
  connect signals to the dreadteeth Chris Cromer 2022-07-27 00:03:18 -0400
• 8cfa1d5cce
  
  add sounds and adjust music #22 Chris Cromer 2022-07-26 23:14:21 -0400
• d50d5063b8
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-07-23 13:47:05 -0400
• 6b86126127
  
  gui focus changes and limits #21 Chris Cromer 2022-07-23 13:45:09 -0400
• 8eabc38a91
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-07-23 13:28:52 -0400
• 5c4106246c
  
  fix error that happens after the GUI is freed #20 Chris Cromer 2022-07-23 13:27:21 -0400
• 332ac5b028
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-07-23 13:07:55 -0400
• 71bf91fd2f make ui_accept press the button #19 Chris Cromer 2022-07-22 00:14:25 -0400
• 1398f3d92c GUI should not be visible until ready Chris Cromer 2022-07-21 00:14:14 -0400
• 4f8c134bb7
  
  add level 2 music #18 Chris Cromer 2022-07-22 00:10:08 -0400
• d35993d072
  
  add comment to _on_player_touched Chris Cromer 2022-07-21 20:54:06 -0400
• edd24b6798
  
  undo accidental collision extents change Chris Cromer 2022-07-21 00:17:12 -0400
• 948f4ce911
  
  add some enemy behavior prototypes Chris Cromer 2022-07-21 00:05:08 -0400
• 31003a2863
  
  Merge branch 'develop' into feature/enemies Chris Cromer 2022-07-19 22:11:53 -0400
• 84eb228a6c fix bug with RUT validation Chris Cromer 2022-07-19 21:41:52 -0400
• ae40849c21 validate information and send it to the monitor Chris Cromer 2022-07-13 21:14:30 -0400
• 39d0804268 remove default text from text inputs Chris Cromer 2022-07-08 00:59:44 -0400
• e4b91d2739 pause game when starting Chris Cromer 2022-07-08 00:58:12 -0400
• 10bf1fd270 add GUI to get player info Chris Cromer 2022-07-08 00:57:46 -0400
• 0d1613a7ef add pixel operator fonts Chris Cromer 2022-07-08 00:57:12 -0400
• 0d2b9cb67f remove player script Chris Cromer 2022-07-08 00:56:45 -0400
• 298298359b move code into the start monitor function instead of setting it during initialization Chris Cromer 2022-07-07 13:01:47 -0400
• cf20410bc8 add player node which will be used to capture their info from the HUD Chris Cromer 2022-07-04 11:13:11 -0400
• f582a32124 allow starting and stopping the monitor via signal Chris Cromer 2022-07-04 11:12:08 -0400
• 9f3e78fa94 Get monitor working and communicating with backend Chris Cromer 2022-06-29 13:29:11 -0400
• d79864c05d start monitor scene Chris Cromer 2022-06-17 16:20:57 -0400
• f893898605
  
  fix bug with RUT validation #17 Chris Cromer 2022-07-19 21:41:52 -0400
• d14cc627de Flag successfully placed on lvl, hitbox detected and working Martin Araneda 2022-07-17 21:51:11 -0400
• b9ff12dab3 Finished coin counter Martin Araneda 2022-07-16 18:36:38 -0400
• b25e1f040c minor changes Martin Araneda 2022-07-15 23:04:06 -0400
• 962c5ab6f9
  
  validate information and send it to the monitor Chris Cromer 2022-07-13 21:14:30 -0400
• f258dae2d5
  
  remove default text from text inputs Chris Cromer 2022-07-08 00:59:44 -0400
• 5bbf8c34ed
  
  pause game when starting Chris Cromer 2022-07-08 00:58:12 -0400
• 9b867c6652
  
  add GUI to get player info Chris Cromer 2022-07-08 00:57:46 -0400
• 8024e97b50
  
  add pixel operator fonts Chris Cromer 2022-07-08 00:57:12 -0400
• 30d4abce8b
  
  remove player script Chris Cromer 2022-07-08 00:56:45 -0400
• 8613d65578
  
  move code into the start monitor function instead of setting it during initialization Chris Cromer 2022-07-07 13:01:47 -0400
• ba673b88f1
  
  Merge branch 'develop' into feature/monitor Chris Cromer 2022-07-06 18:52:01 -0400
• 26cb0fb86f
  
  update tiled importer and fix camera bounds to work with it #16 #15 Chris Cromer 2022-07-06 18:03:25 -0400
• cbac026ebc
  
  add player node which will be used to capture their info from the HUD Chris Cromer 2022-07-04 11:13:11 -0400
• acccc36a4d
  
  allow starting and stopping the monitor via signal Chris Cromer 2022-07-04 11:12:08 -0400
• 2a4d9ae880
  
  Get monitor working and communicating with backend Chris Cromer 2022-06-29 13:29:11 -0400
• 3a58777773 coin counter method created Martin Araneda 2022-06-25 20:54:47 -0400
• a439748a34 On-screen coin counter state machine archives added Martin Araneda 2022-06-21 23:26:43 -0400
• 1d67722325
  
  start monitor scene Chris Cromer 2022-06-17 16:20:57 -0400
• 28f7af6c73
  
  add enemies collision name to project Chris Cromer 2022-06-17 11:35:56 -0400
• 9aafc64ba7
  
  add enemies prototype level Chris Cromer 2022-06-17 11:35:15 -0400
• 4196f4d9e9
  
  change collision layers and masks Chris Cromer 2022-06-17 11:33:58 -0400