stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
199 Commits 8 Branches 1 Tag
d661e0d4b5799241616c9499cc7e19a1272a31f8
Commit Graph

199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stef
d661e0d4b5 Moved isLoaded to BaseResource. Loading and unloading will still be overridden if necessary. Added some subclass/super safe load and unload functions. 2025-10-01 00:06:46 +02:00
Stef
d432887860 Added back changes from audio branch. byte[] is stored in base resource and different Resources can extract their data from it. 2025-09-30 23:42:00 +02:00
lieght
7c970d9a4d Updated assetmanager to now load assets with an assetloader 2025-09-30 23:32:37 +02:00
lieght
d78fd1b606 Fixed unknown names, Assetmanager now has initializeloader 2025-09-30 23:17:32 +02:00
lieght
cf9c281992 Merge remote-tracking branch 'refs/remotes/origin/46-audio-epic' into assetManager 
# Conflicts:
#	framework/src/main/java/org/toop/framework/assets/resources/AudioAsset.java
#	framework/src/main/java/org/toop/framework/assets/resources/BaseResource.java
#	framework/src/main/java/org/toop/framework/assets/resources/ImageResource.java
 2025-09-30 22:54:54 +02:00
Bas de Jong
8328387e86 Reworked resources to be assets, and made AssetManager a singleton 2025-09-30 21:01:59 +02:00
Stef
a7cd0016f1 83 spelen van geluid geeft id terug (#86) 
* Between commit

* Revert "Between commit"

This reverts commit 6c6e55492e.

* Removed debug print from main

* Removed class variables that are no longer used. Sound resources now generate a new Clip with the getNewClip() method.

* Successfully plays multiple instances of the same sound. Returns the clipID so the sound can be stopped.

* Added some comments
 2025-09-30 20:29:42 +02:00
Bas de Jong
d158668dfd Resources now impelement the ResourceType interface 2025-09-30 20:04:48 +02:00
Stef
db544868d9 Merge pull request #85 from 2OOP/84-Byte-array-ipv-InputStream 
Changed Input Stream into byte array
 2025-09-30 19:55:10 +02:00
Stef
324811d026 Switched from Input Stream to Byte array. getStream can now be used to get a buffered stream 2025-09-30 19:53:39 +02:00
Stef
44b4613c27 Updated SoundManager.java to simplify how audios are played. Uses new AssetManager and AudioInputStream instead of whatever was going on at first. 2025-09-30 16:58:26 +02:00
Bas de Jong
423fd9d68a AssetManager init 2025-09-30 16:38:13 +02:00
Bas de Jong
57bd6ded6f HasMap to String, Asset instead of Long Asset 2025-09-30 11:53:13 +02:00
Bas de Jong
d1da49ad1d New assetManager 2025-09-30 11:48:53 +02:00
Bas de Jong
9131803044 Working audio system with events. 2025-09-29 13:48:03 +02:00
Bas de Jong
a957195514 Rudimentary audio file processing. 2025-09-29 13:48:03 +02:00
lieght
4ea2bb96a6 Fixed test never ending 2025-09-28 21:57:59 +02:00
lieght
233ef78e7a Fixed java 25 not supposrted 2025-09-28 21:57:59 +02:00
lieght
a94d83292e Fixed unittests. Formatting 2025-09-28 21:57:59 +02:00
lieght
c76b7a800e Server in working state, can be merged with working branch. 2025-09-28 21:57:59 +02:00
lieght
a9e63b3fcc Initial parsing of server response 2025-09-28 21:57:59 +02:00
ramollia
27e7166ac7 refactored game 2025-09-25 15:50:10 +02:00
lieght
7431d1b03f Disabled error prone for now. Improved eventflow speed 2025-09-24 22:04:00 +02:00
lieght
e6e11a3604 Refactor and fixes 2025-09-24 18:37:13 +02:00
lieght
9df467c0d3 Events fixed 2025-09-24 16:59:28 +02:00
lieght
afc79f8d36 Added back import 2025-09-24 16:55:40 +02:00
ramollia
7d4285eb36 Merge remote-tracking branch 'origin/Refactor' into Refactor 
# Conflicts:
#	app/pom.xml
 2025-09-24 16:54:41 +02:00
ramollia
20c4a011b6 refactored pom.xml 2025-09-24 16:54:11 +02:00
lieght
e590941e2f Fixed framework and moved window events to app 2025-09-24 16:53:29 +02:00
lieght
05e2b27330 Fixed poms 2025-09-24 16:28:25 +02:00
lieght
8d101b8d0f Refactored and marking directory's 2025-09-24 16:03:11 +02:00
lieght
80f0b9e957 Updated module names 2025-09-24 15:57:01 +02:00
ramollia
da777f5300 refactor 2025-09-24 15:52:58 +02:00
ramollia
9fdd74326a refactor 2025-09-24 15:44:38 +02:00
ramollia
f80c565a32 refactored the file structure again 2025-09-24 15:23:21 +02:00
lieght
dfc09f6df6 Merge remote-tracking branch 'origin/Refactor' into Refactor 2025-09-24 15:08:46 +02:00
lieght
aaf2e4ab80 Removed Guava 2025-09-24 15:08:32 +02:00
ramollia
4573556bb5 moved the img directory to resources 2025-09-24 15:05:15 +02:00
ramollia
9acd6debd8 Merge remote-tracking branch 'origin/Refactor' into Refactor 2025-09-24 15:02:24 +02:00
ramollia
fa96cd7c07 refactored the file structure. nothing works :) 2025-09-24 15:02:11 +02:00
lieght
1569c38840 Upgrade to java25 2025-09-24 14:48:58 +02:00
lieght
c46e872c23 Updated pom.xml 2025-09-24 14:43:25 +02:00
lieght
35620e983a Refactoring, removed unnecessary files and classes. 2025-09-24 14:23:36 +02:00
lieght
f712fca14e Merge remote-tracking branch 'origin/GameClient' into GameClient 2025-09-24 14:13:52 +02:00
michiel
5f68c27b65 hele kleine ui update 2025-09-24 14:13:33 +02:00
Ticho Hidding
7e23aaa849 Fixed race condition on startup of AI vs Player game 
# Conflicts:
#	src/main/java/org/toop/frontend/UI/RemoteGameSelector.java
 2025-09-24 14:13:31 +02:00
lieght
7a0ab2f7f4 Wip. 2025-09-24 14:10:20 +02:00
lieght
61a861910a Renamed EventPublisher to EventFlow because of change in what it does. 2025-09-23 01:31:52 +02:00
lieght
b5ee0a6725 Removed google guave dependency. Added a new GlobalEventBus. Refined the EventPublisher. Moving events to own file. 2025-09-23 00:40:15 +02:00
lieght
63b08f3010 Updated eventpublisher to also accept normal events without uuid 2025-09-22 17:07:39 +02:00