8000 Effect manager by orangishcat · Pull Request #71 · aehmttw/Tanks · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Effect manager #71

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

Jump to bottom
Merged
merged 24 commits into from
Jun 17, 2025
Merged

Effect manager #71

merged 24 commits into from
Jun 17, 2025

Conversation

orangishcat
Copy link
Contributor
@orangishcat orangishcat commented Jun 6, 2025 •
edited
Loading
  • Moved attribute and status effect-related methods to a new class
  • Moved AttributeModifier, StatusEffect, and EffectManager to a separate package tanks.effect
  • The methods' code is mostly the same as before
  • Implemented a recycling system so no new memory is allocated
  • Very minor code simplifications in Movable.java
  • No functionality should have changed

Sorry, something went wrong.

@orangishcat
better sound loading + modify info bar
9fbe3d7 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
effect manager
bc0a4d4 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
effect manager rename
94f7247 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
bug fix
f39f409 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
Merge remote-tracking branch 'upstream/master' into upstream-fixes
20ffa4e
@orangishcat
serializer compatibility change
1c32926 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
bug fix
dff93e6 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
remove caching gradle
87ff004 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
Revert "serializer compatibility change"
3b60ef5 
This reverts commit 1c32926.
@orangishcat
Merge remote-tracking branch 'remote/master' into effect-manager
d0ef52e 
# Conflicts:
#	src/main/java/tanks/Movable.java
#	src/main/java/tanks/gui/screen/ScreenGame.java
#	src/main/java/tanks/gui/screen/ScreenTitle.java
#	src/main/java/tanks/minigames/Arcade.java
#	src/main/java/tanks/tank/Tank.java
#	src/main/java/tanks/tank/TankAIControlled.java
#	src/main/java/tanks/tank/TankPlayer.java
#	src/main/java/tanks/tank/TankPlayerRemote.java
@orangishcat
update to 1.6.e, simplify code
7b3f2c5 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat orangishcat mentioned this pull request Jun 6, 2025
Closed
@orangishcat
Copy link
Contributor Author

Will do testing tomorrow

orangishcat added 11 commits June 7, 2025 17:43
@orangishcat
effect manager bug fix
b244a56 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
fix missing references
c0d61dc 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
bug fixes
195d6fb 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
more bug fixes
4ff181b 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
more bug fixes
048912f 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
memory optimizations
c12ecf2 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
EffectManager changes
347adf5 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
Merge remote-tracking branch 'remote/master' into effect-manager
93f1fc8 
# Conflicts:
#	src/main/java/tanks/tank/TankAIControlled.java
#	src/main/java/tanks/tank/TankPlayerRemote.java
@orangishcat
update to latest commit
c8b3dbc 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
try using openjdk instead of liberica
f98b146 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
nevermind, it didn't work
70b75fc 
Signed-off-by: pythoncoder1234 <fdsnail2@gmail.com>
@orangishcat
Copy link
Contributor Author

Testing is done.

Notable change: the AttributeModifier returned from getAttribute is now mutable. It should not be modified but instead copied before modification.

@aehmttw aehmttw merged commit 4f1a4c8 into aehmttw:master Jun 17, 2025
1 check passed
@orangishcat orangishcat deleted the effect-manager branch June 18, 2025 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@orangishcat @aehmttw
0