Conversation
# Conflicts: # res/mapTextFiles/LobbyTest.txt # src/tile/TileManager.java
- added gate object
# Conflicts: # res/mapTextFiles/LobbyTest.txt # res/tiles/secondLevel/69.png # res/tiles/secondLevel/70.png # res/tiles/secondLevel/71.png # res/tiles/secondLevel/72.png # res/tiles/secondLevel/73.png # res/tiles/secondLevel/74.png # res/tiles/secondLevel/75.png # res/tiles/secondLevel/76.png # res/tiles/secondLevel/77.png # res/tiles/secondLevel/78.png # res/tiles/secondLevel/79.png # res/tiles/secondLevel/save # src/ai/Pathfinder.java # src/entity/Entity.java # src/entity/Player.java # src/entity/Projectile.java # src/main/AssetSetter.java # src/main/EventHandler.java # src/main/GamePanel.java # src/mobs/MOB_ArmoredGuardian.java # src/mobs/MOB_Canine.java # src/mobs/MOB_FlyingEye.java # src/mobs/MOB_Goblin.java # src/mobs/MOB_Mushroom.java # src/mobs/MOB_Ramses.java # src/mobs/MOB_RobotGuardian.java # src/mobs/MOB_SkeletonKnight.java # src/mobs/MOB_Skellington.java # src/mobs/MOB_Slime.java # src/object/OBJ_Energyball.java # src/object/OBJ_Projectile.java # src/object/OBJ_Rock.java # src/tile/TileManager.java
* Dialog Functioning * Dialog Fully Functioning * fixed bugs * fixed bugs pt 2. * fixed bugs pt 3. can exit out of blacksmith with e * mob added, but animation not working as expected * added mob scaling & proper animation * Iframe added, mob hurt player added mob sucessfully implemented * bug fixed * slime hitbox fixed * fixed diagonal movement & collision * Hitbox (WIP) * Player Attack Animation (WIP) * PLayer Attack Animation pt 2 (WIP) EventHandler Working * Merge With Recent Dev * Merge With Recent Dev * Fixed Blacksmith bug and tile bug * Added Healing Pool, added hammer sprite, * Fixed Comments * Changed Objects to be entity, added render order * Entity Death, Fixed HitBox * Mob Health Bar, KnockBack * Interactive Tile Implementation * MAP TRANSITION (WIP) * MAP FIX (WIP) * MAP FIX pt 2(WIP) * MAP TRANSITION WORKING (2ND MAP NOT IMPLEMENTED) * MAP TRANSITION WORKING (2ND MAP NOT IMPLEMENTED) * fixed player camera and rendering distance * Debug Tool Added (Press T) * Robot Guardian Added / Fixed Lobby * Merge with Dev (but fireball no work) ananda pls fix * fixed arrow and camera centering for extra Player classes * All mobs added (IGNORE THE WARNINGS THEY ARE BECAUSE MOBS ARE NOT SPAWNED ON MAP) * Pathfinding Added * Knockback (WIP) * Better Knockback implemented * fixed direction of knockback * Organized Entity Attributes * Housekeeping Organize Code shorten mob classes * Animating Monster Attack (WIP) * added tileset for second level * Animating Monster Attack Slime and Mushroom , hitbox (WIP) * Animating Monster Attack Slime and Mushroom , hitbox (WIP) * Fixed bugs * added musrhoom animations * Mob Projectile WIP * Mob Projectile WIP * MOB PROJECTILE SHOOTS BUT AT PLAYER CURSOR? * ADJUSTED PROJECTILE SIZE * ALL MOB ANIMATIONS ADDED * added attack buffer for each Mob * ADDED BUFFER TO ALL MOBS * FIXED HP BAR MOB POSITION * ADDED MAP TRANSITION * GAME OVER MENU (WIP) * DYNAMIC DIALOG DISPLAY * FIXED INFINITE LOOP BUG * updated tile filenames * fixed player UI flashing bug during iframe * FIXED DUPLICATING PLAYER BUG * CENTERED LOBBY, FIXED NPC POSITION * FIXED DIALOGS ITERATIONS * ADDED DEATH TRANSITION TO PLAYER LOBBY * ADDED OBJECT DROPS FROM MOBS * FIX BUG PLAYER LOCATION * WORLD RENDER BUG FIX * added map files for level 1 & 2 * adjusted assets placement * fixed loading bug * changed outside tiles appropriately on level 2 * ENABLED EVENTHANDLER TO ACTIVATE MORE EASIER * - refactored attack methods for dynamic length - added gate object --------- Co-authored-by: PeePeePooPoo <bhowjk@gmail.com>
…RANSITION TO 2 MAP
# Conflicts: # src/main/GamePanel.java # src/main/UI.java
- Added skeleton options menu
- Added Option Menu
# Conflicts: # src/entity/Entity.java # src/entity/Player.java # src/entity/Projectile.java # src/main/AssetSetter.java # src/object/OBJ_Fireball.java
# Conflicts: # res/userData.txt # src/entity/Player.java # src/main/KeyHandler.java # src/mobs/BOSS_FrostGiant.java
- fixed some audio issues - added option to go back to title screen
- fixed some audio issues - added option to go back to title screenqd
# Conflicts: # src/main/UI.java
AND FIXED FINAL BOSS HITBOXES
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.