Commit Graph

Select branches

Hide Pull Requests

SNOWZ7Z/pause_button_menu

camera-movement

demilurii/art

demilurii/art2

demilurii/harmony_export_test

ewpratten/anim_rendering

ewpratten/asset_defs

ewpratten/audio

ewpratten/better_footprints

ewpratten/better_sampling

ewpratten/ci_docs

ewpratten/colliders

ewpratten/colliders_api

ewpratten/core

ewpratten/cutscene

ewpratten/main_menu_signaling

ewpratten/map_rendering

ewpratten/object_defs

ewpratten/rendering_basics

ewpratten/rust_project_layout

ewpratten/save_state

ewpratten/the_end

ewpratten/tile_metadata

gh-pages

main_main_menu_menu

map_assets

master

melting

player-movement

rsninja/fixes

rsninja722/collisions

rsninja722/nice_map

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#49

#5

#9

Mono Color

• 70150a01fd
  Pretty good meltin melting Silas Bartha 2022-04-04 16:05:44 -04:00
• 6dabc51f03 deploy: 4f8f03a3dcd0dcd7d6ae22ad927b1ce303ff1347 gh-pages Ewpratten 2022-04-04 04:52:56 +00:00
• 4f8f03a3dc
  Merge pull request #48 from Ewpratten/rsninja/fixes master Evan Pratten 2022-04-04 00:50:26 -04:00
• b72051ebbe Merge remote-tracking branch 'origin/master' into rsninja/fixes rsninja/fixes rsninja722 2022-04-04 00:47:25 -04:00
• 14d8a73c02 fixes rsninja722 2022-04-04 00:47:18 -04:00
• 5e62baac94
  kind of almost temperature Silas Bartha 2022-04-04 00:46:21 -04:00
• a05e2f686e deploy: c44b9191f3b37e2f4d83c7c7cc3027a0973f0ee5 Ewpratten 2022-04-04 04:22:03 +00:00
• c44b9191f3 Discord RPC Evan Pratten 2022-04-04 00:19:24 -04:00
• ed97362781 deploy: 1b32c57447a33279d2c16c05a49cc9e7867c4efd Ewpratten 2022-04-04 04:14:13 +00:00
• e1b6311025 Give the game a name Evan Pratten 2022-04-04 00:13:55 -04:00
• 1b32c57447 Possibly fix volume Evan Pratten 2022-04-04 00:11:43 -04:00
• bd45c41749 deploy: 7ef95458e36192055feb91d1d56d0144aea1265b Ewpratten 2022-04-04 04:09:56 +00:00
• 7ef95458e3
  Merge pull request #47 from Ewpratten/ewpratten/cutscene Evan Pratten 2022-04-04 00:07:35 -04:00
• ab82ec626d Arty art ewpratten/cutscene Evan Pratten 2022-04-04 00:07:07 -04:00
• 5a4729c78d
  Merge pull request #46 from Ewpratten/demilurii/art2 Evan Pratten 2022-04-03 23:49:48 -04:00
• 3b1b9c79ce intro cutscene comic demilurii/art2 Emilia Frias 2022-04-03 23:47:40 -04:00
• b532c558af deploy: f2007d1d2bbf3a7fb2a41169f078825dcb5025e3 Ewpratten 2022-04-04 03:41:27 +00:00
• f2007d1d2b
  Merge pull request #45 from Ewpratten/melting Evan Pratten 2022-04-03 23:39:03 -04:00
• 51aee9b90c deploy: f1d8ff3408b572f2ba6f8e9fd06456598f8461ed Ewpratten 2022-04-04 03:36:43 +00:00
• f1d8ff3408 Pre-render footprints Evan Pratten 2022-04-03 23:33:42 -04:00
• 064d14f97e
  funny Silas Bartha 2022-04-03 23:26:19 -04:00
• 3f247d11a4 deploy: 00fa6edb20beeb2875551a39ba217e92dcda18bc Ewpratten 2022-04-04 03:06:35 +00:00
• 00fa6edb20 Fix render order Evan Pratten 2022-04-03 23:03:44 -04:00
• cd5bb81f23
  Merge branch 'master' into melting Silas Bartha 2022-04-03 23:02:58 -04:00
• bd713c3e75
  Merge Stash Silas Bartha 2022-04-03 22:59:51 -04:00
• 2d3e05f6f7
  Merge branch 'melting' of github.com:Ewpratten/ludum-dare-50 into melting Silas Bartha 2022-04-03 22:57:46 -04:00
• 46830e0f93
  Load textures Evan Pratten 2022-04-03 14:43:37 -04:00
• a79f0e7c90 move market Evan Pratten 2022-04-03 22:55:33 -04:00
• f48e5c11b9
  Shrinkage Silas Bartha 2022-04-03 14:39:14 -04:00
• f1886ef07f Mm Evan Pratten 2022-04-03 22:52:39 -04:00
• 079b01aaab deploy: 88018f698d14ec549006dc253354db81de84180a Ewpratten 2022-04-04 02:52:29 +00:00
• 22f50bbd03
  Load textures Evan Pratten 2022-04-03 14:43:37 -04:00
• c955f2370b
  Shrinkage Silas Bartha 2022-04-03 14:39:14 -04:00
• 88018f698d
  Merge pull request #44 from Ewpratten/rsninja722/nice_map Evan Pratten 2022-04-03 22:50:11 -04:00
• 7ff54e78af Merge remote-tracking branch 'origin/master' into rsninja722/nice_map rsninja722/nice_map rsninja722 2022-04-03 22:43:57 -04:00
• 2e50aafde3 temapuratures rsninja722 2022-04-03 22:43:50 -04:00
• 548d09a2bf
  Merge pull request #43 from Ewpratten/rsninja722/nice_map Evan Pratten 2022-04-03 22:16:16 -04:00
• e20423b74f deploy: fea13f549c11bebee7aa82bda06c97986938ab0f Ewpratten 2022-04-04 02:09:02 +00:00
• fea13f549c
  Merge pull request #42 from Ewpratten/SNOWZ7Z/pause_button_menu Evan Pratten 2022-04-03 22:06:46 -04:00
• 522bf8c759 Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map rsninja722 2022-04-03 21:56:42 -04:00
• 9d88a6bf65 object definitions rsninja722 2022-04-03 21:56:23 -04:00
• 62430b3dca Styling to the Labels SNOWZ7Z/pause_button_menu Marcelo Geldres 2022-04-03 21:39:52 -04:00
• db4d2e3c62 you melted ending screen edit Emilia Frias 2022-04-03 21:18:51 -04:00
• 1f2f11fc57 you melted ending screen added Emilia Frias 2022-04-03 21:16:22 -04:00
• d8bc49a671 deploy: 61a9f757e660390aedc32be11e9767b4af02632d Ewpratten 2022-04-04 00:49:36 +00:00
• 61a9f757e6
  Merge pull request #41 from Ewpratten/ewpratten/the_end Evan Pratten 2022-04-03 20:46:56 -04:00
• 805ae65b8c Cup pointer ewpratten/the_end Evan Pratten 2022-04-03 20:46:06 -04:00
• 95eb21bdb1
  Merge branch 'melting' of github.com:Ewpratten/ludum-dare-50 into melting Silas Bartha 2022-04-03 19:58:17 -04:00
• 486a148614
  Load textures Evan Pratten 2022-04-03 14:43:37 -04:00
• 75c6c22a63
  Shrinkage Silas Bartha 2022-04-03 14:39:14 -04:00
• 0a42b0d9a2 car and truck varient objects Emilia Frias 2022-04-03 19:50:56 -04:00
• b63db758ee deploy: 7ebc76450b43b540a1aa017498cef3c12d88059f Ewpratten 2022-04-03 23:38:04 +00:00
• 7ebc76450b
  Merge pull request #40 from Ewpratten/ewpratten/the_end Evan Pratten 2022-04-03 19:35:35 -04:00
• 13fbc9f8db Winning the game is a thing Evan Pratten 2022-04-03 19:35:24 -04:00
• 39721968f3 Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map rsninja722 2022-04-03 19:20:30 -04:00
• 35342997cd map with new tiles rsninja722 2022-04-03 19:20:21 -04:00
• 3d7285e51f market roof and interior with different colour varients Emilia Frias 2022-04-03 18:32:48 -04:00
• fee66753bc Merge remote-tracking branch 'origin/demilurii/harmony_export_test' into rsninja722/nice_map rsninja722 2022-04-03 18:20:38 -04:00
• abc65254eb Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map rsninja722 2022-04-03 18:19:30 -04:00
• 9623dc5830 deploy: b4ab6aa74ea53ea0aa8d70df2ad511e813f916bc Ewpratten 2022-04-03 22:14:29 +00:00
• b4ab6aa74e
  Merge pull request #39 from Ewpratten/rsninja722/collisions Evan Pratten 2022-04-03 18:11:45 -04:00
• 0bfc5d8468 Merge remote-tracking branch 'origin/master' into rsninja722/collisions rsninja722/collisions rsninja722 2022-04-03 18:05:49 -04:00
• d6db37ca93 collisions with objects rsninja722 2022-04-03 18:05:44 -04:00
• 7f8cfd16c9 deploy: 7ae286b093ef3e45887d2e94abdc3106cba24a9f Ewpratten 2022-04-03 22:00:39 +00:00
• 8296a25f13 deploy: 62c8c6e2a034453cc30aca2d79f2823fbcdffab7 Ewpratten 2022-04-03 21:57:59 +00:00
• 7ae286b093
  Merge pull request #38 from Ewpratten/SNOWZ7Z/pause_button_menu Evan Pratten 2022-04-03 17:57:49 -04:00
• ba26cbe9dd Merge remote-tracking branch 'origin/master' into rsninja722/collisions rsninja722 2022-04-03 17:57:08 -04:00
• ba2343b09f collisions (colliding) rsninja722 2022-04-03 17:56:58 -04:00
• 62c8c6e2a0 Invert collider Y Evan Pratten 2022-04-03 17:55:32 -04:00
• 2056ca16a3 Return to Game button Marcelo Geldres 2022-04-03 17:53:47 -04:00
• fa7aa4d7ff Return to Main menu Marcelo Geldres 2022-04-03 17:27:17 -04:00
• 949bc45d30 deploy: 8cd2ae6354c74e77b9f8c37235f19439f45acad3 Ewpratten 2022-04-03 21:15:43 +00:00
• 8cd2ae6354
  Merge pull request #37 from Ewpratten/ewpratten/better_sampling Evan Pratten 2022-04-03 17:13:17 -04:00
• 21e4dc7daa Add cutscene support to the game ewpratten/better_sampling Evan Pratten 2022-04-03 17:12:51 -04:00
• 637750a689 Merge remote-tracking branch 'origin/master' into rsninja722/collisions rsninja722 2022-04-03 17:11:44 -04:00
• de9aa00986 collisions (not colliding) rsninja722 2022-04-03 17:11:32 -04:00
• b2817efae0 deploy: 76aede470bcf85a1906db2ac7d2e5acc84c4d210 Ewpratten 2022-04-03 20:48:58 +00:00
• 76aede470b
  Merge pull request #36 from Ewpratten/ewpratten/better_sampling Evan Pratten 2022-04-03 16:45:43 -04:00
• 5e29a94b60 Only render lines in debug mode Evan Pratten 2022-04-03 16:45:14 -04:00
• 4d6974d70f Debug info for menus Evan Pratten 2022-04-03 16:41:51 -04:00
• 096a33139f deploy: 5ca4bb022fe10218dbfcd8dc478e8ae459cba997 Ewpratten 2022-04-03 20:40:57 +00:00
• 5ca4bb022f
  Merge pull request #35 from Ewpratten/ewpratten/better_sampling Evan Pratten 2022-04-03 16:37:49 -04:00
• 8d26ea38c8 Implement a pause menu Evan Pratten 2022-04-03 16:37:12 -04:00
• f40210f6f6 deploy: 4f159579ab07cc3a313f580d05e384b7bc5c2e63 Ewpratten 2022-04-03 19:20:20 +00:00
• 4f159579ab Fix size issue Evan Pratten 2022-04-03 15:18:00 -04:00
• ad7fa3914c inner corner tile pieces completed Emilia Frias 2022-04-03 15:17:49 -04:00
• bc215249a4
  Merge pull request #34 from Ewpratten/ewpratten/asset_defs Evan Pratten 2022-04-03 15:11:38 -04:00
• d0a704d05e Add chairs ewpratten/asset_defs Evan Pratten 2022-04-03 15:11:24 -04:00
• c06059949f
  Merge pull request #33 from Ewpratten/demilurii/art2 Evan Pratten 2022-04-03 15:05:58 -04:00
• 710454b54c
  Merge pull request #32 from Ewpratten/ewpratten/asset_defs Evan Pratten 2022-04-03 15:04:11 -04:00
• 1f2e32a607 Towel defs Evan Pratten 2022-04-03 15:03:43 -04:00
• 84cbf04428
  Merge pull request #31 from Ewpratten/ewpratten/asset_defs Evan Pratten 2022-04-03 14:54:39 -04:00
• 2b4a5ce087 Umbrella defs Evan Pratten 2022-04-03 14:54:08 -04:00
• c024ee78dd Load textures Evan Pratten 2022-04-03 14:43:37 -04:00
• 3ed57a17e7
  Shrinkage Silas Bartha 2022-04-03 14:39:14 -04:00
• cf645c1d1b Added red umbrella Evan Pratten 2022-04-03 14:38:51 -04:00
• 009bb83bd7 deploy: aa47d0b548a6b790f9700f9c8ef36e9d71510c57 Ewpratten 2022-04-03 18:38:11 +00:00
• 3dc8b66498 beach chair object sprites Emilia Frias 2022-04-03 14:37:04 -04:00
• aa47d0b548
  Merge pull request #30 from Ewpratten/ewpratten/better_footprints Evan Pratten 2022-04-03 14:35:18 -04:00
• 0145c42a51 idk anymore. I think I fixed something? ewpratten/better_footprints Evan Pratten 2022-04-03 14:31:03 -04:00