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

• 8bbb0619a9 Merge branch 'master' into ewpratten/better_footprints Evan Pratten 2022-04-03 14:01:59 -04:00
• b483f91913 Merge branch 'demilurii/art2' Evan Pratten 2022-04-03 14:01:53 -04:00
• 76bf5396c9 Bring in towels Evan Pratten 2022-04-03 13:59:37 -04:00
• 32190cb4c5 Revert "seperated beach towels" Emilia Frias 2022-04-03 13:50:31 -04:00
• 4e511ed395 Working on umbrella rendering Evan Pratten 2022-04-03 13:55:50 -04:00
• fbd1835921 seperated beach towels Emilia Frias 2022-04-03 13:50:31 -04:00
• 1ecab31aff deploy: 614822d464a89f439de8d8dc131444f5c9d2a74d Ewpratten 2022-04-03 17:25:18 +00:00
• 614822d464
  Merge pull request #29 from Ewpratten/ewpratten/colliders_api Evan Pratten 2022-04-03 13:22:27 -04:00
• 731a1acf2f World colission querying ewpratten/colliders_api Evan Pratten 2022-04-03 13:22:03 -04:00
• abe1c06f73
  Merge pull request #28 from Ewpratten/demilurii/art2 Evan Pratten 2022-04-03 13:18:47 -04:00
• 3a37d7b715 Merge branch 'master' into ewpratten/colliders_api Evan Pratten 2022-04-03 11:52:44 -04:00
• 2441893801 deploy: 2b2c276dc873d382dd39776a96c1955fe3cf28bd Ewpratten 2022-04-03 15:38:16 +00:00
• 2b2c276dc8
  Merge pull request #27 from Ewpratten/main_main_menu_menu Evan Pratten 2022-04-03 11:35:26 -04:00
• 49c8222e26 Persistent game volume settings main_main_menu_menu Evan Pratten 2022-04-03 11:35:11 -04:00
• 0cc0401b66 Let buttons play a clicking noise when pressed Evan Pratten 2022-04-03 11:27:58 -04:00
• 2cf2631a6a
  Merge branch 'master' into main_main_menu_menu Evan Pratten 2022-04-03 11:06:42 -04:00
• 287f66361d Volume Button implementation Marcelo Geldres 2022-04-02 23:00:41 -04:00
• 260aa83984 added the umbrella pole and towel varients Emilia Frias 2022-04-02 22:51:52 -04:00
• 72065011ff umbrella tiles and colour varients Emilia Frias 2022-04-02 22:36:10 -04:00
• 56ed7622ac kinda works? ewpratten/colliders Evan Pratten 2022-04-02 21:59:18 -04:00
• e6157067ed Can no longer run off the map Evan Pratten 2022-04-02 21:39:44 -04:00
• 85b2393ff9 melting animations for cubee Emilia Frias 2022-04-02 21:13:01 -04:00
• 109a2c23ae deploy: 64a59daf8b33708e95f3626a4d723ae64d688697 Ewpratten 2022-04-03 00:24:58 +00:00
• 100a54a7cd deploy: c80e0a7311716cbe05bdd870c5775f131441fca9 Ewpratten 2022-04-03 00:24:28 +00:00
• 64a59daf8b
  Merge pull request #25 from Ewpratten/camera-movement Evan Pratten 2022-04-02 20:22:07 -04:00
• c80e0a7311
  Merge pull request #26 from Ewpratten/ewpratten/tile_metadata Evan Pratten 2022-04-02 20:21:38 -04:00
• 801dde4c8e Allow people to use my magic code ewpratten/tile_metadata Evan Pratten 2022-04-02 20:21:04 -04:00
• 6429b68654 Allow friction and temperature sampling Evan Pratten 2022-04-02 20:13:31 -04:00
• 1891bd51aa
  Camera Follow Deadzone camera-movement Silas Bartha 2022-04-02 20:08:38 -04:00
• ff2bac5261 deploy: 76c34ad8dbef13ca6b869dfa74536229ea28a2bc Ewpratten 2022-04-02 23:44:28 +00:00
• a32b47c54b finished floor tiles demilurii/harmony_export_test Emilia Frias 2022-04-02 19:44:27 -04:00
• 76c34ad8db
  Merge pull request #24 from Ewpratten/ewpratten/audio Evan Pratten 2022-04-02 19:41:41 -04:00
• f0c625bf02
  Merge branch 'master' into ewpratten/audio ewpratten/audio Evan Pratten 2022-04-02 19:40:33 -04:00
• ae4085c6ca We have music! Evan Pratten 2022-04-02 19:37:07 -04:00
• 2699d97559 deploy: fb23e3773932bf67b034097113d25a6334c2b4d9 Ewpratten 2022-04-02 22:58:10 +00:00
• fb23e37739
  Merge pull request #23 from Ewpratten/ewpratten/object_defs Evan Pratten 2022-04-02 18:55:49 -04:00
• 93c869c53d Correctly merge together object code ewpratten/object_defs Evan Pratten 2022-04-02 18:50:39 -04:00
• 4d4dce4c02 deploy: 928dea652e9bf49fd80ad94dd8e2c1e2f651c8ba Ewpratten 2022-04-02 22:48:45 +00:00
• 6bfeb8ea60 Merge branch 'master' into ewpratten/object_defs Evan Pratten 2022-04-02 18:48:20 -04:00
• 928dea652e
  Merge pull request #22 from Ewpratten/camera-movement Evan Pratten 2022-04-02 18:46:12 -04:00
• 337a7450a4 deploy: 6ac265a466121700e1c86335e79d85bf447f2d8d Ewpratten 2022-04-02 22:42:45 +00:00
• 6ac265a466
  Merge pull request #21 from Ewpratten/main_main_menu_menu Evan Pratten 2022-04-02 18:40:01 -04:00
• 6f61eaf10c Fix mouse call Evan Pratten 2022-04-02 18:35:48 -04:00
• 2770fe4572 Forgot the exit button mb Marcelo Geldres 2022-04-02 18:33:06 -04:00
• 38f26d7330
  Center Plater Silas Bartha 2022-04-02 16:47:31 -04:00
• d65dc12299 Object rotation! Evan Pratten 2022-04-02 16:41:11 -04:00
• 8299169648
  Unregistered Hypercam 2 Silas Bartha 2022-04-02 16:40:50 -04:00
• 10fbc84252 Allow players to take shade Evan Pratten 2022-04-02 16:33:40 -04:00
• 57c5aaa714
  Poo Text Silas Bartha 2022-04-02 16:05:14 -04:00
• 133e71a78f Time to begin rendering Evan Pratten 2022-04-02 15:51:45 -04:00
• 2d944dc2f3 World object loading Evan Pratten 2022-04-02 15:43:42 -04:00
• beb9008c10 deploy: 1bff7f2bc4e376fa02547a3791dec62b0b861776 Ewpratten 2022-04-02 19:30:22 +00:00
• 1bff7f2bc4
  Merge pull request #20 from Ewpratten/map_assets Evan Pratten 2022-04-02 15:28:11 -04:00
• 74066c0189 wip objects Evan Pratten 2022-04-02 15:27:26 -04:00
• a49bd7c952 add map rendering to player scene map_assets rsninja722 2022-04-02 15:25:59 -04:00
• d0eb5c5358 Fully responsive layout Marcelo Geldres 2022-04-02 15:16:19 -04:00
• 8cddd12850 Merge branch 'player-movement' into map_assets rsninja722 2022-04-02 15:09:47 -04:00
• f5c63a5c55 Defining a test object Evan Pratten 2022-04-02 15:07:22 -04:00
• 270ecf1f71 Merge branch 'ewpratten/core' into ewpratten/object_defs Evan Pratten 2022-04-02 14:54:38 -04:00
• 03398a60d3
  Merge pull request #19 from Ewpratten/master Evan Pratten 2022-04-02 14:52:38 -04:00
• aea8233662 deploy: bc2c01592f9c52851b047e51507cebf56bf9dabb Ewpratten 2022-04-02 18:50:48 +00:00
• 4c708e4809 Merge remote-tracking branch 'origin/master' into map_assets rsninja722 2022-04-02 14:48:42 -04:00
• bc2c01592f resizable Evan Pratten 2022-04-02 14:47:59 -04:00
• c6ef86cb8f Merge branch 'master' into map_assets rsninja722 2022-04-02 14:46:47 -04:00
• bf93ef30f0 deploy: 0963e6da17dfff2fec59fbd247629ef90a701b71 Ewpratten 2022-04-02 18:43:54 +00:00
• 0963e6da17
  Merge pull request #18 from Ewpratten/ewpratten/map_rendering Evan Pratten 2022-04-02 14:41:34 -04:00
• 27307677f3 Merge branch 'master' into ewpratten/map_rendering ewpratten/map_rendering Evan Pratten 2022-04-02 14:40:45 -04:00
• e0fa16cc8f Map rendering! Evan Pratten 2022-04-02 14:39:12 -04:00
• e1297618d3 temporary assets and map rsninja722 2022-04-02 14:30:18 -04:00
• 2a785631f7
  Merge branch 'player-movement' of github.com:Ewpratten/ludum-dare-50 into player-movement player-movement Silas Bartha 2022-04-02 14:29:13 -04:00
• 9dad046ca0
  Phunny Fysics Silas Bartha 2022-04-02 14:24:40 -04:00
• fc1a3d5f29
  Funny slippery guyy Silas Bartha 2022-04-02 12:29:26 -04:00
• 166e83ad06
  Drawing a Box Silas Bartha 2022-04-02 00:06:46 -04:00
• 84633f00a0
  Phunny Fysics Silas Bartha 2022-04-02 14:24:40 -04:00
• 91c8f99260 deploy: 1cd46b32d11de2e7efed260be8ba94489425685d Ewpratten 2022-04-02 18:13:04 +00:00
• 1cd46b32d1
  Merge pull request #17 from Ewpratten/main_main_menu_menu Evan Pratten 2022-04-02 14:11:07 -04:00
• a34a62fd29 bump tiled Evan Pratten 2022-04-02 13:24:20 -04:00
• 2bb1fa7a66 wip tile caching Evan Pratten 2022-04-02 13:23:58 -04:00
• 73ead1e88d Main menu detailed 1 Marcelo Geldres 2022-04-02 13:22:22 -04:00
• 26863c0ac8 Load tiled Evan Pratten 2022-04-02 13:17:04 -04:00
• 0c99cbf2db tiled project Evan Pratten 2022-04-02 13:02:31 -04:00
• 27fc010ac6 Tilemap loading Evan Pratten 2022-04-02 13:01:49 -04:00
• 7065c24637 Working on getting tiles to load Evan Pratten 2022-04-02 12:52:02 -04:00
• e55b54a313
  Funny slippery guyy Silas Bartha 2022-04-02 12:29:26 -04:00
• 1c5d8d4d71 fix map paths Evan Pratten 2022-04-02 12:03:36 -04:00
• 38c4f37b4d Create a testing map Evan Pratten 2022-04-02 12:02:07 -04:00
• 06255e252c Crash Marcelo Geldres 2022-04-02 11:37:47 -04:00
• 424d64c75d
  Merge pull request #16 from Ewpratten/ewpratten/main_menu_signaling Evan Pratten 2022-04-02 11:33:02 -04:00
• bc7fb12564 Fix the rest of the merge issues ewpratten/main_menu_signaling Evan Pratten 2022-04-02 11:32:50 -04:00
• 36521d918a
  Merge branch 'main_main_menu_menu' into ewpratten/main_menu_signaling Evan Pratten 2022-04-02 11:31:22 -04:00
• 0d54f3118b Menu routing system Evan Pratten 2022-04-02 11:29:43 -04:00
• 760cd7206d Unsafe blocks fully removed Marcelo Geldres 2022-04-02 11:26:41 -04:00
• 3fca413dfd Unsafe usage Correction Marcelo Geldres 2022-04-02 10:52:39 -04:00
• fc8c9e8f02 Main Menu Initial Layout Marcelo Geldres 2022-04-02 09:18:56 -04:00
• e1eccd2f9e json backings ewpratten/core Evan Pratten 2022-04-02 00:07:03 -04:00
• 5787e539b2
  Drawing a Box Silas Bartha 2022-04-02 00:06:46 -04:00
• f7d231b6b3 Merge branch 'master' into ewpratten/core Evan Pratten 2022-04-01 23:53:34 -04:00
• 33e21f2759 Add main menu file Evan Pratten 2022-04-01 23:48:05 -04:00
• 2d7430a088 deploy: 18942b5db8b3e475fc4463e5dca24f39bb78ea01 Ewpratten 2022-04-02 03:44:41 +00:00
• 18942b5db8 Add project constants to all render code Evan Pratten 2022-04-01 23:42:40 -04:00