rsninja722
|
9d88a6bf65
|
object definitions
|
2022-04-03 21:56:23 -04:00 |
|
rsninja722
|
39721968f3
|
Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map
|
2022-04-03 19:20:30 -04:00 |
|
rsninja722
|
35342997cd
|
map with new tiles
|
2022-04-03 19:20:21 -04:00 |
|
|
|
3d7285e51f
|
market roof and interior with different colour varients
|
2022-04-03 18:32:48 -04:00 |
|
rsninja722
|
fee66753bc
|
Merge remote-tracking branch 'origin/demilurii/harmony_export_test' into rsninja722/nice_map
|
2022-04-03 18:20:38 -04:00 |
|
rsninja722
|
abc65254eb
|
Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map
|
2022-04-03 18:19:30 -04:00 |
|
|
|
b4ab6aa74e
|
Merge pull request #39 from Ewpratten/rsninja722/collisions
added collision detection and resolution
|
2022-04-03 18:11:45 -04:00 |
|
rsninja722
|
0bfc5d8468
|
Merge remote-tracking branch 'origin/master' into rsninja722/collisions
|
2022-04-03 18:05:49 -04:00 |
|
rsninja722
|
d6db37ca93
|
collisions with objects
|
2022-04-03 18:05:44 -04:00 |
|
|
|
7ae286b093
|
Merge pull request #38 from Ewpratten/SNOWZ7Z/pause_button_menu
Snowz7z/pause button menu
|
2022-04-03 17:57:49 -04:00 |
|
rsninja722
|
ba26cbe9dd
|
Merge remote-tracking branch 'origin/master' into rsninja722/collisions
|
2022-04-03 17:57:08 -04:00 |
|
rsninja722
|
ba2343b09f
|
collisions (colliding)
|
2022-04-03 17:56:58 -04:00 |
|
|
|
62c8c6e2a0
|
Invert collider Y
|
2022-04-03 17:55:32 -04:00 |
|
Marcelo Geldres
|
2056ca16a3
|
Return to Game button
|
2022-04-03 17:53:47 -04:00 |
|
Marcelo Geldres
|
fa7aa4d7ff
|
Return to Main menu
and color varaibles too
|
2022-04-03 17:27:17 -04:00 |
|
|
|
8cd2ae6354
|
Merge pull request #37 from Ewpratten/ewpratten/better_sampling
Add cutscene support to the game
|
2022-04-03 17:13:17 -04:00 |
|
|
|
21e4dc7daa
|
Add cutscene support to the game
|
2022-04-03 17:12:51 -04:00 |
|
rsninja722
|
637750a689
|
Merge remote-tracking branch 'origin/master' into rsninja722/collisions
|
2022-04-03 17:11:44 -04:00 |
|
rsninja722
|
de9aa00986
|
collisions (not colliding)
|
2022-04-03 17:11:32 -04:00 |
|
|
|
76aede470b
|
Merge pull request #36 from Ewpratten/ewpratten/better_sampling
F3 for DEBUG
|
2022-04-03 16:45:43 -04:00 |
|
|
|
5e29a94b60
|
Only render lines in debug mode
|
2022-04-03 16:45:14 -04:00 |
|
|
|
4d6974d70f
|
Debug info for menus
|
2022-04-03 16:41:51 -04:00 |
|
|
|
5ca4bb022f
|
Merge pull request #35 from Ewpratten/ewpratten/better_sampling
Implement a pause menu
|
2022-04-03 16:37:49 -04:00 |
|
|
|
8d26ea38c8
|
Implement a pause menu
|
2022-04-03 16:37:12 -04:00 |
|
|
|
4f159579ab
|
Fix size issue
|
2022-04-03 15:18:00 -04:00 |
|
|
|
ad7fa3914c
|
inner corner tile pieces completed
|
2022-04-03 15:17:49 -04:00 |
|
|
|
bc215249a4
|
Merge pull request #34 from Ewpratten/ewpratten/asset_defs
Add chairs
|
2022-04-03 15:11:38 -04:00 |
|
|
|
d0a704d05e
|
Add chairs
|
2022-04-03 15:11:24 -04:00 |
|
|
|
c06059949f
|
Merge pull request #33 from Ewpratten/demilurii/art2
beach chair object sprites
|
2022-04-03 15:05:58 -04:00 |
|
|
|
710454b54c
|
Merge pull request #32 from Ewpratten/ewpratten/asset_defs
Towel defs
|
2022-04-03 15:04:11 -04:00 |
|
|
|
1f2e32a607
|
Towel defs
|
2022-04-03 15:03:43 -04:00 |
|
|
|
84cbf04428
|
Merge pull request #31 from Ewpratten/ewpratten/asset_defs
Add umbrella definitions
|
2022-04-03 14:54:39 -04:00 |
|
|
|
2b4a5ce087
|
Umbrella defs
|
2022-04-03 14:54:08 -04:00 |
|
|
|
cf645c1d1b
|
Added red umbrella
|
2022-04-03 14:38:51 -04:00 |
|
|
|
3dc8b66498
|
beach chair object sprites
|
2022-04-03 14:37:04 -04:00 |
|
|
|
aa47d0b548
|
Merge pull request #30 from Ewpratten/ewpratten/better_footprints
Fix some footprinting bugs
|
2022-04-03 14:35:18 -04:00 |
|
|
|
0145c42a51
|
idk anymore. I think I fixed something?
|
2022-04-03 14:31:03 -04:00 |
|
|
|
8bbb0619a9
|
Merge branch 'master' into ewpratten/better_footprints
|
2022-04-03 14:01:59 -04:00 |
|
|
|
b483f91913
|
Merge branch 'demilurii/art2'
|
2022-04-03 14:01:53 -04:00 |
|
|
|
76bf5396c9
|
Bring in towels
|
2022-04-03 13:59:37 -04:00 |
|
|
|
32190cb4c5
|
Revert "seperated beach towels"
This reverts commit fbd1835921c8528d35c3420efff897581d0e26d9.
|
2022-04-03 13:59:17 -04:00 |
|
|
|
4e511ed395
|
Working on umbrella rendering
|
2022-04-03 13:55:50 -04:00 |
|
|
|
fbd1835921
|
seperated beach towels
|
2022-04-03 13:50:31 -04:00 |
|
|
|
614822d464
|
Merge pull request #29 from Ewpratten/ewpratten/colliders_api
Bring in a colissions API
|
2022-04-03 13:22:27 -04:00 |
|
|
|
731a1acf2f
|
World colission querying
|
2022-04-03 13:22:03 -04:00 |
|
|
|
abe1c06f73
|
Merge pull request #28 from Ewpratten/demilurii/art2
Pull in some miwu art
|
2022-04-03 13:18:47 -04:00 |
|
|
|
3a37d7b715
|
Merge branch 'master' into ewpratten/colliders_api
|
2022-04-03 11:52:44 -04:00 |
|
|
|
2b2c276dc8
|
Merge pull request #27 from Ewpratten/main_main_menu_menu
Volume Button implementation
|
2022-04-03 11:35:26 -04:00 |
|
|
|
49c8222e26
|
Persistent game volume settings
|
2022-04-03 11:35:11 -04:00 |
|
|
|
0cc0401b66
|
Let buttons play a clicking noise when pressed
|
2022-04-03 11:27:58 -04:00 |
|
