]>
Skullheadx's Git Forge - Pygame-Jam.git/log
lbcmk [Tue, 12 Jul 2022 13:37:08 +0000 (09:37 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Tue, 12 Jul 2022 13:36:46 +0000 (09:36 -0400)]
Changing the position of text on the main menu
lbcmk [Tue, 12 Jul 2022 13:36:27 +0000 (09:36 -0400)]
oops
Skullheadx [Tue, 12 Jul 2022 06:04:39 +0000 (02:04 -0400)]
collectable potions, combat done
Skullheadx [Tue, 12 Jul 2022 04:39:07 +0000 (00:39 -0400)]
More performance fixes
711215 [Tue, 12 Jul 2022 03:48:17 +0000 (23:48 -0400)]
landing sound added
711215 [Tue, 12 Jul 2022 03:43:08 +0000 (23:43 -0400)]
Add files via upload
711215 [Tue, 12 Jul 2022 03:40:15 +0000 (23:40 -0400)]
cave, sky & combat music assets
711215 [Tue, 12 Jul 2022 01:17:44 +0000 (21:17 -0400)]
overworld music asset
711215 [Tue, 12 Jul 2022 01:14:52 +0000 (21:14 -0400)]
menu music asset
Skullheadx [Tue, 12 Jul 2022 01:03:55 +0000 (21:03 -0400)]
quadrupled FPS
credit to Starbuck!
Skullheadx [Tue, 12 Jul 2022 00:53:04 +0000 (20:53 -0400)]
fixed bug where cant close window
Skullheadx [Tue, 12 Jul 2022 00:41:58 +0000 (20:41 -0400)]
particles
Skullheadx [Mon, 11 Jul 2022 21:06:35 +0000 (17:06 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Mon, 11 Jul 2022 21:05:58 +0000 (17:05 -0400)]
fixed more bugs + added anim for skele
lbcmk [Mon, 11 Jul 2022 19:59:07 +0000 (15:59 -0400)]
Added Levels
lbcmk [Mon, 11 Jul 2022 19:58:44 +0000 (15:58 -0400)]
Temporary CLOUD texture
lbcmk [Mon, 11 Jul 2022 19:58:18 +0000 (15:58 -0400)]
Changed match case
lbcmk [Mon, 11 Jul 2022 19:52:39 +0000 (15:52 -0400)]
Fixed merge
lbcmk [Mon, 11 Jul 2022 19:51:20 +0000 (15:51 -0400)]
Fixed DevLevelSelect
Skullheadx [Mon, 11 Jul 2022 19:49:56 +0000 (15:49 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Mon, 11 Jul 2022 19:49:50 +0000 (15:49 -0400)]
fixed collision bugs
711215 [Mon, 11 Jul 2022 19:46:22 +0000 (15:46 -0400)]
no running sound after jumping bug fix
711215 [Mon, 11 Jul 2022 19:01:04 +0000 (15:01 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
711215 [Mon, 11 Jul 2022 19:00:49 +0000 (15:00 -0400)]
sword swing sfx added
lbcmk [Mon, 11 Jul 2022 18:50:39 +0000 (14:50 -0400)]
Fixed Portal
lbcmk [Mon, 11 Jul 2022 18:37:41 +0000 (14:37 -0400)]
Fixed Merge Conflict
lbcmk [Mon, 11 Jul 2022 18:36:40 +0000 (14:36 -0400)]
a
Skullheadx [Mon, 11 Jul 2022 18:30:03 +0000 (14:30 -0400)]
new assets
lbcmk [Mon, 11 Jul 2022 17:53:57 +0000 (13:53 -0400)]
Dialogue Changes
lbcmk [Mon, 11 Jul 2022 17:50:09 +0000 (13:50 -0400)]
Made Dialogue easier to use
lbcmk [Mon, 11 Jul 2022 17:42:31 +0000 (13:42 -0400)]
added portal rect
lbcmk [Mon, 11 Jul 2022 17:38:38 +0000 (13:38 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Mon, 11 Jul 2022 17:38:18 +0000 (13:38 -0400)]
Portal now work with Level Maker
711215 [Mon, 11 Jul 2022 15:08:21 +0000 (11:08 -0400)]
(kinda buggy) added walking sound effect
Skullheadx [Mon, 11 Jul 2022 06:22:34 +0000 (02:22 -0400)]
player faces vel when run
Skullheadx [Mon, 11 Jul 2022 06:10:05 +0000 (02:10 -0400)]
added player run animation
lbcmk [Mon, 11 Jul 2022 03:19:41 +0000 (23:19 -0400)]
Fixed sky conflict
lbcmk [Mon, 11 Jul 2022 03:16:52 +0000 (23:16 -0400)]
Fixed merge conflict
lbcmk [Mon, 11 Jul 2022 03:15:18 +0000 (23:15 -0400)]
Created dialogue ui
lbcmk [Mon, 11 Jul 2022 03:14:58 +0000 (23:14 -0400)]
Changed init requirements
Skullheadx [Mon, 11 Jul 2022 02:34:41 +0000 (22:34 -0400)]
Fixed Textures + combat
lbcmk [Sun, 10 Jul 2022 23:28:42 +0000 (19:28 -0400)]
Completed Transition and Portals
lbcmk [Sun, 10 Jul 2022 18:11:28 +0000 (14:11 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Sun, 10 Jul 2022 18:11:25 +0000 (14:11 -0400)]
Changed TODO
lbcmk [Sun, 10 Jul 2022 18:06:14 +0000 (14:06 -0400)]
It can now check if the player is in front of the portal
711215 [Sun, 10 Jul 2022 16:29:28 +0000 (12:29 -0400)]
fade in/out classes
just uh initialize and update in a loop
711215 [Sun, 10 Jul 2022 14:56:19 +0000 (10:56 -0400)]
potion cd + potion ui
Skullheadx [Sun, 10 Jul 2022 04:54:21 +0000 (00:54 -0400)]
Fixed sword hitbox
Skullheadx [Sun, 10 Jul 2022 04:21:32 +0000 (00:21 -0400)]
added support for decor in editor
Skullheadx [Sun, 10 Jul 2022 03:03:11 +0000 (23:03 -0400)]
Merge branch 'combat'
Skullheadx [Sun, 10 Jul 2022 03:02:56 +0000 (23:02 -0400)]
sword animation
lbcmk [Sun, 10 Jul 2022 02:51:03 +0000 (22:51 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Sun, 10 Jul 2022 02:49:56 +0000 (22:49 -0400)]
Edited Imports
lbcmk [Sun, 10 Jul 2022 02:49:45 +0000 (22:49 -0400)]
Portal Object in game
Skullheadx [Sun, 10 Jul 2022 02:06:18 +0000 (22:06 -0400)]
Merge pull request #6 from Skullheadx/test
fixed
Skullheadx [Sun, 10 Jul 2022 02:05:56 +0000 (22:05 -0400)]
fixed
lbcmk [Sun, 10 Jul 2022 01:31:42 +0000 (21:31 -0400)]
fix
lbcmk [Sun, 10 Jul 2022 00:39:47 +0000 (20:39 -0400)]
Moved the healthbar into its own import file
lbcmk [Sun, 10 Jul 2022 00:22:14 +0000 (20:22 -0400)]
fix for if the autoload file doesn't exist
Skullheadx [Sat, 9 Jul 2022 20:33:33 +0000 (16:33 -0400)]
import level files and set initial pos for player and enemy
Skullheadx [Sat, 9 Jul 2022 19:19:22 +0000 (15:19 -0400)]
ability to import levels into game
lbcmk [Sat, 9 Jul 2022 08:13:12 +0000 (04:13 -0400)]
Fixed Autoload button so it can be toggled off
lbcmk [Sat, 9 Jul 2022 08:11:35 +0000 (04:11 -0400)]
Developer Level Select Menu
lbcmk [Sat, 9 Jul 2022 07:47:24 +0000 (03:47 -0400)]
Updated
lbcmk [Sat, 9 Jul 2022 07:46:57 +0000 (03:46 -0400)]
Updated TODO
lbcmk [Sat, 9 Jul 2022 07:46:42 +0000 (03:46 -0400)]
Updated the dash meter so it works when cooldown changes
lbcmk [Sat, 9 Jul 2022 07:28:25 +0000 (03:28 -0400)]
Added a Dash Meter
lbcmk [Sat, 9 Jul 2022 07:28:03 +0000 (03:28 -0400)]
Reverted main.py
lbcmk [Sat, 9 Jul 2022 07:26:27 +0000 (03:26 -0400)]
Completed end screen
lbcmk [Sat, 9 Jul 2022 07:26:15 +0000 (03:26 -0400)]
Changed self.level
lbcmk [Sat, 9 Jul 2022 07:25:59 +0000 (03:25 -0400)]
Changed text so it uses the createText function
Skullheadx [Sat, 9 Jul 2022 05:56:28 +0000 (01:56 -0400)]
Created level editor
Skullheadx [Sat, 9 Jul 2022 01:38:34 +0000 (21:38 -0400)]
Create STONEDIRT.png
Skullheadx [Fri, 8 Jul 2022 20:51:04 +0000 (16:51 -0400)]
added the world blocks & textures
Skullheadx [Fri, 8 Jul 2022 14:39:28 +0000 (10:39 -0400)]
Updated combat
Skullheadx [Fri, 8 Jul 2022 06:07:03 +0000 (02:07 -0400)]
added player animation and assets
Skullheadx [Fri, 8 Jul 2022 04:27:42 +0000 (00:27 -0400)]
fixed jump on head so it pushes u
Skullheadx [Fri, 8 Jul 2022 04:00:17 +0000 (00:00 -0400)]
add combat for player
its very fun so pull now.
Skullheadx [Fri, 8 Jul 2022 02:13:30 +0000 (22:13 -0400)]
Update TODO
Skullheadx [Fri, 8 Jul 2022 01:43:00 +0000 (21:43 -0400)]
player kb
no more no kb haxs. player gets launched away when enemy hits. Also player gets stunned when damaged
Skullheadx [Fri, 8 Jul 2022 01:26:59 +0000 (21:26 -0400)]
understood the physics bug
when an actor tries to cross axis lines, the move and collide method in Actors.py will not move as intended. its weird.
711215 [Thu, 7 Jul 2022 23:35:44 +0000 (19:35 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
711215 [Thu, 7 Jul 2022 23:32:56 +0000 (19:32 -0400)]
added potions
lbcmk [Thu, 7 Jul 2022 23:30:05 +0000 (19:30 -0400)]
Added a death screen
lbcmk [Thu, 7 Jul 2022 22:27:34 +0000 (18:27 -0400)]
Updated TODO
lbcmk [Thu, 7 Jul 2022 22:20:21 +0000 (18:20 -0400)]
TODO
lbcmk [Thu, 7 Jul 2022 22:15:48 +0000 (18:15 -0400)]
Fixed a double dash bug
lbcmk [Thu, 7 Jul 2022 22:05:28 +0000 (18:05 -0400)]
Small Fixes for the dash
lbcmk [Thu, 7 Jul 2022 22:02:43 +0000 (18:02 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Thu, 7 Jul 2022 22:02:39 +0000 (18:02 -0400)]
Deleting useless files
lbcmk [Thu, 7 Jul 2022 22:02:13 +0000 (18:02 -0400)]
Added Dash Movement (needs work)
Skullheadx [Thu, 7 Jul 2022 21:10:12 +0000 (17:10 -0400)]
Update Enemy.py
Skullheadx [Thu, 7 Jul 2022 21:09:52 +0000 (17:09 -0400)]
player now takes dmg
Skullheadx [Thu, 7 Jul 2022 20:41:43 +0000 (16:41 -0400)]
fixed bug where camera not working as intended
Skullheadx [Thu, 7 Jul 2022 19:03:08 +0000 (15:03 -0400)]
fixed pushing
lbcmk [Thu, 7 Jul 2022 18:11:18 +0000 (14:11 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Thu, 7 Jul 2022 18:06:46 +0000 (14:06 -0400)]
Updated gitignore
Skullheadx [Thu, 7 Jul 2022 17:36:51 +0000 (13:36 -0400)]
Merge pull request #2 from Skullheadx/other-computer
halfway
Skullheadx [Thu, 7 Jul 2022 17:34:06 +0000 (13:34 -0400)]
halfway