Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore the previous pull request #56

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

Ignore the previous pull request #56

Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
53b300e
change gc to final variable
limqiying Feb 26, 2018
22a1479
add KeyCode object type specification to inputList
limqiying Feb 26, 2018
aefb0df
added keycode object type specification to list
limqiying Feb 26, 2018
1b11675
cleaned up keyboard input handler code by replacing if/else with switch.
limqiying Feb 27, 2018
e754a29
added functionality to exploding bomb state
limqiying Mar 2, 2018
a2a72ec
added functionality to exploding bomb state
limqiying Mar 2, 2018
5fb18af
made exploding time an adjustable variable
limqiying Mar 2, 2018
e735dfd
cleaned up updateGame loop by separating entity loop into another
limqiying Mar 2, 2018
1f0a7de
changed entity to abstract class instead of interface
limqiying Mar 2, 2018
d5fd3bf
added isAlive capability only to killable entities, others have default
limqiying Mar 2, 2018
987e0a8
cleaned sprite code
limqiying Mar 2, 2018
66e2d2c
cached sprite positions with new SpriteSpecification class
limqiying Mar 2, 2018
bf56393
cached sprite specifications
limqiying Mar 16, 2018
892f72d
cleaned renderer
limqiying Mar 16, 2018
320ba21
change dying animation so that it plays through once and player
limqiying Mar 16, 2018
e9cd570
consolidated commit
limqiying Apr 9, 2018
5a1d236
consolidated commit
limqiying Apr 9, 2018
199b2a2
consolidated commit
limqiying Apr 9, 2018
392244c
Delete nblibraries.properties
limqiying Apr 9, 2018
b08d553
Delete build-impl.xml
limqiying Apr 9, 2018
749833b
Delete manifest.mf
limqiying Apr 9, 2018
daf2339
Delete build.xml
limqiying Apr 9, 2018
9991a4e
Delete README.md
limqiying Apr 9, 2018
6a75113
Delete LICENSE
limqiying Apr 9, 2018
dc12ab3
Delete CONTRIBUTING.md
limqiying Apr 9, 2018
da39417
Merge branch 'master' of https://github.com/limqiying/Aidos.git
limqiying Apr 9, 2018
0246c50
re-organized package hierarchy
limqiying Apr 9, 2018
e68b17e
added comments
limqiying Apr 9, 2018
da0545e
changed background colour to green -- for gras
limqiying Apr 9, 2018
1d84dea
changed player bounding box dimensions for easier movement
limqiying Apr 9, 2018
e5cf447
changed setED to void
limqiying Apr 11, 2018
dcbfc8c
added door sprites
limqiying Apr 11, 2018
76a2a37
created hidden door entity
limqiying Apr 11, 2018
ffd1459
added door to map
limqiying Apr 11, 2018
ae2aa2c
remove scene initial dimensions
limqiying Apr 18, 2018
2bb81c1
store stage controls in separate class from Sandbox
limqiying Apr 18, 2018
76061ba
newGame functionality to GameHandler
limqiying Apr 18, 2018
d5c9fba
added newGame and PauseGame Buttons
limqiying Apr 18, 2018
5fb9286
add pause and play functionality
limqiying Apr 18, 2018
012ef94
moved windowManager
limqiying Apr 18, 2018
c7345e3
create level indicator
limqiying Apr 19, 2018
7663ab0
change pause to ToggleButton
limqiying Apr 19, 2018
15ef740
remove keyboard control of buttons
limqiying Apr 19, 2018
d00fad5
added new level
limqiying Apr 19, 2018
899f6a6
moved door to futher position
limqiying Apr 19, 2018
b53f702
removed unneeded modules
limqiying Apr 19, 2018
b583129
changed root from Group to Pane for resizability
limqiying Apr 19, 2018
1efc851
moved cleaning up entities to Sandbox as method
limqiying Apr 19, 2018
614c339
consolidate sandbox method, add obervable pattern to detect game win
limqiying Apr 19, 2018
2cfda36
loads next map if hidden door is found
limqiying Apr 19, 2018
1e21582
update all entity lists in sandbox
limqiying Apr 19, 2018
c2ecb6c
fixed issue with wrong level labels
limqiying Apr 19, 2018
f84a1e8
add level adjust buttons
limqiying Apr 19, 2018
402c469
remove unneeded controls
limqiying Apr 19, 2018
88f815b
moved configurations to separate package
limqiying Apr 20, 2018
eaaf84f
changed balloon animations
limqiying Apr 20, 2018
acb5c5c
added new random map maker for testing purposes
limqiying Apr 20, 2018
05bfce9
fixed issue with incorrect pause/play labels when levels are switched
limqiying Apr 20, 2018
8f407ac
added hidden door to level3 map
limqiying Apr 20, 2018
d78dbc2
added descriptor
limqiying Apr 20, 2018
e137251
updated readme gif to most current
limqiying Apr 20, 2018
ac6167b
changed to MVC model
limqiying Apr 25, 2018
4ffc10b
observer pattern for MVC
limqiying Apr 25, 2018
be03da4
refactored game status to be kept in game handler
limqiying Apr 25, 2018
a8e027e
add life count
limqiying Apr 25, 2018
31cec26
cleaned update function
limqiying Apr 26, 2018
8d23472
DS_Store to gitignore
limqiying Oct 23, 2019
d71f28e
fixed missing gif
limqiying Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
made exploding time an adjustable variable
  • Loading branch information
@limqiying
limqiying committed Mar 2, 2018
commit 5fb18afbaf07fbb1280352d53bdc93b4c8c6b4e7
2 changes: 1 addition & 1 deletion src/bomberman/entity/staticobjects/BlackBomb.java
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ private STATE checkBombState() {
if (timePast < 0) {
s = STATE.ACTIVE;
}
else if (timePast < 100) {
else if (timePast < explodingTime) {
s = STATE.EXPLODING;
}
else {