]>
Skullheadx's Git Forge - Pygame-Jam.git/log
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
lbcmk [Thu, 7 Jul 2022 17:15:05 +0000 (13:15 -0400)]
Changed it so that Weapon.py takes sword from asset folder
lbcmk [Thu, 7 Jul 2022 17:11:51 +0000 (13:11 -0400)]
Made it so that you can change the level by changing the level variable
Skullheadx [Thu, 7 Jul 2022 16:13:53 +0000 (12:13 -0400)]
work from last night
Skullheadx [Thu, 7 Jul 2022 01:37:41 +0000 (21:37 -0400)]
???
Skullheadx [Thu, 7 Jul 2022 00:44:56 +0000 (20:44 -0400)]
assets
Skullheadx [Wed, 6 Jul 2022 23:29:08 +0000 (19:29 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Wed, 6 Jul 2022 23:29:06 +0000 (19:29 -0400)]
added weapon
lbcmk [Wed, 6 Jul 2022 22:02:06 +0000 (18:02 -0400)]
Changed font to Exo2
lbcmk [Wed, 6 Jul 2022 21:59:45 +0000 (17:59 -0400)]
Fixed Import
lbcmk [Wed, 6 Jul 2022 21:58:42 +0000 (17:58 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
lbcmk [Wed, 6 Jul 2022 21:58:34 +0000 (17:58 -0400)]
Made a Main Menu
lbcmk [Wed, 6 Jul 2022 21:56:36 +0000 (17:56 -0400)]
Updated gitignore
711215 [Wed, 6 Jul 2022 21:49:13 +0000 (17:49 -0400)]
player healthbar complete
Skullheadx [Wed, 6 Jul 2022 20:20:54 +0000 (16:20 -0400)]
added new font and assets
Skullheadx [Wed, 6 Jul 2022 19:23:11 +0000 (15:23 -0400)]
Added Ragdoll for enemy
Skullheadx [Wed, 6 Jul 2022 17:56:07 +0000 (13:56 -0400)]
death detection
Skullheadx [Wed, 6 Jul 2022 17:53:53 +0000 (13:53 -0400)]
changed stuff
Skullheadx [Wed, 6 Jul 2022 17:28:22 +0000 (13:28 -0400)]
?
lbcmk [Wed, 6 Jul 2022 17:19:55 +0000 (13:19 -0400)]
Updated Files
Skullheadx [Wed, 6 Jul 2022 16:36:26 +0000 (12:36 -0400)]
Update game_doc.txt
Skullheadx [Wed, 6 Jul 2022 16:36:04 +0000 (12:36 -0400)]
added pets
lbcmk [Wed, 6 Jul 2022 16:31:18 +0000 (12:31 -0400)]
Updated Game doc
Skullheadx [Wed, 6 Jul 2022 16:21:55 +0000 (12:21 -0400)]
Update .gitignore
Skullheadx [Wed, 6 Jul 2022 16:21:47 +0000 (12:21 -0400)]
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
Skullheadx [Wed, 6 Jul 2022 16:21:39 +0000 (12:21 -0400)]
Created actors or things that move in the game
projects / Pygame-Jam.git / log