]> Skullheadx's Git Forge - Pygame-Jam.git/log
Pygame-Jam.git
3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Wed, 13 Jul 2022 00:02:56 +0000 (20:02 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoa
Skullheadx [Wed, 13 Jul 2022 00:02:13 +0000 (20:02 -0400)]
a

3 years agoFix
lbcmk [Wed, 13 Jul 2022 00:02:09 +0000 (20:02 -0400)]
Fix

3 years agoMultiple Dialogues can now stay up
lbcmk [Tue, 12 Jul 2022 23:46:23 +0000 (19:46 -0400)]
Multiple Dialogues can now stay up

3 years agoEnd screen and credits
lbcmk [Tue, 12 Jul 2022 23:35:44 +0000 (19:35 -0400)]
End screen and credits

3 years agoChanged Levels
lbcmk [Tue, 12 Jul 2022 23:35:26 +0000 (19:35 -0400)]
Changed Levels

3 years agoSmall Changes
lbcmk [Tue, 12 Jul 2022 23:10:21 +0000 (19:10 -0400)]
Small Changes

3 years agoDialogue Floating Text Fix
lbcmk [Tue, 12 Jul 2022 23:10:03 +0000 (19:10 -0400)]
Dialogue Floating Text Fix

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Tue, 12 Jul 2022 22:28:26 +0000 (18:28 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoboss level layout
Skullheadx [Tue, 12 Jul 2022 22:27:18 +0000 (18:27 -0400)]
boss level layout

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Tue, 12 Jul 2022 22:26:52 +0000 (18:26 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agodialogue can now be turned into floating text
lbcmk [Tue, 12 Jul 2022 22:26:23 +0000 (18:26 -0400)]
dialogue can now be turned into floating text

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Tue, 12 Jul 2022 22:01:31 +0000 (18:01 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoUpdate Game.py
Skullheadx [Tue, 12 Jul 2022 22:01:27 +0000 (18:01 -0400)]
Update Game.py

3 years agocant close window bug fixed
Skullheadx [Tue, 12 Jul 2022 21:58:34 +0000 (17:58 -0400)]
cant close window bug fixed

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
711215 [Tue, 12 Jul 2022 21:50:15 +0000 (17:50 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agofixed cave level
711215 [Tue, 12 Jul 2022 21:50:00 +0000 (17:50 -0400)]
fixed cave level

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Tue, 12 Jul 2022 21:49:30 +0000 (17:49 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoChanged Dialogue so it has a timer
lbcmk [Tue, 12 Jul 2022 21:42:14 +0000 (17:42 -0400)]
Changed Dialogue so it has a timer

3 years agohelp me fix dialogue
Skullheadx [Tue, 12 Jul 2022 21:34:27 +0000 (17:34 -0400)]
help me fix dialogue

3 years agoFixed options
lbcmk [Tue, 12 Jul 2022 21:02:04 +0000 (17:02 -0400)]
Fixed options

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Tue, 12 Jul 2022 20:54:13 +0000 (16:54 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoSave and Load game functionality
lbcmk [Tue, 12 Jul 2022 20:54:11 +0000 (16:54 -0400)]
Save and Load game functionality

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Tue, 12 Jul 2022 20:45:13 +0000 (16:45 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agonew textures
Skullheadx [Tue, 12 Jul 2022 20:45:11 +0000 (16:45 -0400)]
new textures

3 years agopause menu
711215 [Tue, 12 Jul 2022 20:35:42 +0000 (16:35 -0400)]
pause menu

3 years agoFIXED crash when using multiple layers
Skullheadx [Tue, 12 Jul 2022 18:44:38 +0000 (14:44 -0400)]
FIXED crash when using multiple layers

3 years agoadded clouds
Skullheadx [Tue, 12 Jul 2022 17:23:54 +0000 (13:23 -0400)]
added clouds

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Tue, 12 Jul 2022 16:34:36 +0000 (12:34 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoblock menu in editor
Skullheadx [Tue, 12 Jul 2022 16:34:26 +0000 (12:34 -0400)]
block menu in editor

3 years agocave level for now
711215 [Tue, 12 Jul 2022 16:27:15 +0000 (12:27 -0400)]
cave level for now

3 years agoadded spikes
Skullheadx [Tue, 12 Jul 2022 16:06:53 +0000 (12:06 -0400)]
added spikes

3 years agoAdded a Death Floor
lbcmk [Tue, 12 Jul 2022 15:38:07 +0000 (11:38 -0400)]
Added a Death Floor

3 years agoAdded Enemies to sky levels
lbcmk [Tue, 12 Jul 2022 15:14:31 +0000 (11:14 -0400)]
Added Enemies to sky levels

3 years agolibvorbisfile-3.dll catch error
lbcmk [Tue, 12 Jul 2022 15:11:04 +0000 (11:11 -0400)]
libvorbisfile-3.dll catch error

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Tue, 12 Jul 2022 15:05:34 +0000 (11:05 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoChanged Menus
lbcmk [Tue, 12 Jul 2022 15:05:31 +0000 (11:05 -0400)]
Changed Menus

3 years agofix hold sword sfx bug
Skullheadx [Tue, 12 Jul 2022 14:55:27 +0000 (10:55 -0400)]
fix hold sword sfx bug

3 years agoimplemented music
711215 [Tue, 12 Jul 2022 14:39:08 +0000 (10:39 -0400)]
implemented music

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Tue, 12 Jul 2022 14:37:30 +0000 (10:37 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Tue, 12 Jul 2022 14:37:22 +0000 (10:37 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoAdded Backgrounds
lbcmk [Tue, 12 Jul 2022 14:37:14 +0000 (10:37 -0400)]
Added Backgrounds

3 years agosword shows when player run
Skullheadx [Tue, 12 Jul 2022 14:37:13 +0000 (10:37 -0400)]
sword shows when player run

3 years agochanged from mp3 to ogg
711215 [Tue, 12 Jul 2022 14:36:57 +0000 (10:36 -0400)]
changed from mp3 to ogg

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Tue, 12 Jul 2022 13:37:08 +0000 (09:37 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoChanging the position of text on the main menu
lbcmk [Tue, 12 Jul 2022 13:36:46 +0000 (09:36 -0400)]
Changing the position of text on the main menu

3 years agooops
lbcmk [Tue, 12 Jul 2022 13:36:27 +0000 (09:36 -0400)]
oops

3 years agocollectable potions, combat done
Skullheadx [Tue, 12 Jul 2022 06:04:39 +0000 (02:04 -0400)]
collectable potions, combat done

3 years agoMore performance fixes
Skullheadx [Tue, 12 Jul 2022 04:39:07 +0000 (00:39 -0400)]
More performance fixes

3 years agolanding sound added
711215 [Tue, 12 Jul 2022 03:48:17 +0000 (23:48 -0400)]
landing sound added

3 years agoAdd files via upload
711215 [Tue, 12 Jul 2022 03:43:08 +0000 (23:43 -0400)]
Add files via upload

3 years agocave, sky & combat music assets
711215 [Tue, 12 Jul 2022 03:40:15 +0000 (23:40 -0400)]
cave, sky & combat music assets

3 years agooverworld music asset
711215 [Tue, 12 Jul 2022 01:17:44 +0000 (21:17 -0400)]
overworld music asset

3 years agomenu music asset
711215 [Tue, 12 Jul 2022 01:14:52 +0000 (21:14 -0400)]
menu music asset

3 years agoquadrupled FPS
Skullheadx [Tue, 12 Jul 2022 01:03:55 +0000 (21:03 -0400)]
quadrupled FPS

credit to Starbuck!

3 years agofixed bug where cant close window
Skullheadx [Tue, 12 Jul 2022 00:53:04 +0000 (20:53 -0400)]
fixed bug where cant close window

3 years agoparticles
Skullheadx [Tue, 12 Jul 2022 00:41:58 +0000 (20:41 -0400)]
particles

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Mon, 11 Jul 2022 21:06:35 +0000 (17:06 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agofixed more bugs + added anim for skele
Skullheadx [Mon, 11 Jul 2022 21:05:58 +0000 (17:05 -0400)]
fixed more bugs + added anim for skele

3 years agoAdded Levels
lbcmk [Mon, 11 Jul 2022 19:59:07 +0000 (15:59 -0400)]
Added Levels

3 years agoTemporary CLOUD texture
lbcmk [Mon, 11 Jul 2022 19:58:44 +0000 (15:58 -0400)]
Temporary CLOUD texture

3 years agoChanged match case
lbcmk [Mon, 11 Jul 2022 19:58:18 +0000 (15:58 -0400)]
Changed match case

3 years agoFixed merge
lbcmk [Mon, 11 Jul 2022 19:52:39 +0000 (15:52 -0400)]
Fixed merge

3 years agoFixed DevLevelSelect
lbcmk [Mon, 11 Jul 2022 19:51:20 +0000 (15:51 -0400)]
Fixed DevLevelSelect

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Mon, 11 Jul 2022 19:49:56 +0000 (15:49 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agofixed collision bugs
Skullheadx [Mon, 11 Jul 2022 19:49:50 +0000 (15:49 -0400)]
fixed collision bugs

3 years agono running sound after jumping bug fix
711215 [Mon, 11 Jul 2022 19:46:22 +0000 (15:46 -0400)]
no running sound after jumping bug fix

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
711215 [Mon, 11 Jul 2022 19:01:04 +0000 (15:01 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agosword swing sfx added
711215 [Mon, 11 Jul 2022 19:00:49 +0000 (15:00 -0400)]
sword swing sfx added

3 years agoFixed Portal
lbcmk [Mon, 11 Jul 2022 18:50:39 +0000 (14:50 -0400)]
Fixed Portal

3 years agoFixed Merge Conflict
lbcmk [Mon, 11 Jul 2022 18:37:41 +0000 (14:37 -0400)]
Fixed Merge Conflict

3 years agoa
lbcmk [Mon, 11 Jul 2022 18:36:40 +0000 (14:36 -0400)]
a

3 years agonew assets
Skullheadx [Mon, 11 Jul 2022 18:30:03 +0000 (14:30 -0400)]
new assets

3 years agoDialogue Changes
lbcmk [Mon, 11 Jul 2022 17:53:57 +0000 (13:53 -0400)]
Dialogue Changes

3 years agoMade Dialogue easier to use
lbcmk [Mon, 11 Jul 2022 17:50:09 +0000 (13:50 -0400)]
Made Dialogue easier to use

3 years agoadded portal rect
lbcmk [Mon, 11 Jul 2022 17:42:31 +0000 (13:42 -0400)]
added portal rect

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Mon, 11 Jul 2022 17:38:38 +0000 (13:38 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoPortal now work with Level Maker
lbcmk [Mon, 11 Jul 2022 17:38:18 +0000 (13:38 -0400)]
Portal now work with Level Maker

3 years ago(kinda buggy) added walking sound effect
711215 [Mon, 11 Jul 2022 15:08:21 +0000 (11:08 -0400)]
(kinda buggy) added walking sound effect

3 years agoplayer faces vel when run
Skullheadx [Mon, 11 Jul 2022 06:22:34 +0000 (02:22 -0400)]
player faces vel when run

3 years agoadded player run animation
Skullheadx [Mon, 11 Jul 2022 06:10:05 +0000 (02:10 -0400)]
added player run animation

3 years agoFixed sky conflict
lbcmk [Mon, 11 Jul 2022 03:19:41 +0000 (23:19 -0400)]
Fixed sky conflict

3 years agoFixed merge conflict
lbcmk [Mon, 11 Jul 2022 03:16:52 +0000 (23:16 -0400)]
Fixed merge conflict

3 years agoCreated dialogue ui
lbcmk [Mon, 11 Jul 2022 03:15:18 +0000 (23:15 -0400)]
Created dialogue ui

3 years agoChanged init requirements
lbcmk [Mon, 11 Jul 2022 03:14:58 +0000 (23:14 -0400)]
Changed init requirements

3 years agoFixed Textures + combat
Skullheadx [Mon, 11 Jul 2022 02:34:41 +0000 (22:34 -0400)]
Fixed Textures + combat

3 years agoCompleted Transition and Portals
lbcmk [Sun, 10 Jul 2022 23:28:42 +0000 (19:28 -0400)]
Completed Transition and Portals

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Sun, 10 Jul 2022 18:11:28 +0000 (14:11 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoChanged TODO
lbcmk [Sun, 10 Jul 2022 18:11:25 +0000 (14:11 -0400)]
Changed TODO

3 years agoIt can now check if the player is in front of the portal
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

3 years agofade in/out classes
711215 [Sun, 10 Jul 2022 16:29:28 +0000 (12:29 -0400)]
fade in/out classes

just uh initialize and update in a loop

3 years agopotion cd + potion ui
711215 [Sun, 10 Jul 2022 14:56:19 +0000 (10:56 -0400)]
potion cd + potion ui

3 years agoFixed sword hitbox
Skullheadx [Sun, 10 Jul 2022 04:54:21 +0000 (00:54 -0400)]
Fixed sword hitbox

3 years agoadded support for decor in editor
Skullheadx [Sun, 10 Jul 2022 04:21:32 +0000 (00:21 -0400)]
added support for decor in editor

3 years agoMerge branch 'combat'
Skullheadx [Sun, 10 Jul 2022 03:03:11 +0000 (23:03 -0400)]
Merge branch 'combat'

3 years agosword animation combat
Skullheadx [Sun, 10 Jul 2022 03:02:56 +0000 (23:02 -0400)]
sword animation

3 years agoMerge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Sun, 10 Jul 2022 02:51:03 +0000 (22:51 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam

3 years agoEdited Imports
lbcmk [Sun, 10 Jul 2022 02:49:56 +0000 (22:49 -0400)]
Edited Imports

3 years agoPortal Object in game
lbcmk [Sun, 10 Jul 2022 02:49:45 +0000 (22:49 -0400)]
Portal Object in game

3 years agoMerge pull request #6 from Skullheadx/test
Skullheadx [Sun, 10 Jul 2022 02:06:18 +0000 (22:06 -0400)]
Merge pull request #6 from Skullheadx/test

fixed