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
328 Commits 8 Branches 1 Tag
172b26ed51a669357efd5f7e772abe5a6a82a92c
Commit Graph

328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lieght
71dab89dc8 Removed need for manual typecast 2025-10-01 16:17:02 +02:00
lieght
dd74eaab43 Removed files no longer in use 2025-10-01 16:04:42 +02:00
lieght
af9da93421 JDK25 2025-10-01 16:03:35 +02:00
lieght
632756bd51 Removed no more needed files. 2025-10-01 16:03:06 +02:00
Bas Antonius de Jong
9b17a4ba7f Alpha UI update (#95) 
* added localization options
//todo add all the strings

* broken push

* merge to UI

* broken push

* Alpha rebase complete, added asset loader for UI branch

* merge to UI

* UI now uses assetmanager

* added NL and EN for all strings currently in UI

* fix small merge error

---------

Co-authored-by: Ticho Hidding <tichohidding@gmail.com>
Co-authored-by: ramollia <@>
 2025-10-01 15:59:12 +02:00
lieght
435d443b94 Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	.idea/misc.xml
 2025-10-01 15:58:33 +02:00
Ticho Hidding
2c83427faf fix small merge error 2025-10-01 15:57:46 +02:00
lieght
5a779a8a25 Merge remote-tracking branch 'origin/Alpha' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/menu/MainMenu.java
#	app/src/main/java/org/toop/app/menu/QuitMenu.java
 2025-10-01 15:56:42 +02:00
Ticho Hidding
9134c7e3e7 Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/org/toop/app/menu/MainMenu.java
#	app/src/main/java/org/toop/app/menu/QuitMenu.java
 2025-10-01 15:54:18 +02:00
Ticho Hidding
9e35db4dd4 added NL and EN for all strings currently in UI 2025-10-01 15:51:14 +02:00
lieght
13bc313c17 UI now uses assetmanager 2025-10-01 15:48:23 +02:00
Ticho Hidding
b12c74433a merge to UI 2025-10-01 15:31:38 +02:00
Bas Antonius de Jong
2f9b155e6e Alpha DrawCondition update (#89) 
* drawConditions gemaakt en geimplementeerd

* drawConditions gemaakt en geimplementeerd, werkt wanneer je het lokaal draait

* better draw conditions in a shorter amount of lines

* commit for ticho

* working draw conditions (maybe?)

* moved a little bit

* removed a little bit

---------

Co-authored-by: michiel <m.brands.3@st.hanze.nl>
 2025-10-01 15:20:02 +02:00
Bas Antonius de Jong
eb6dc03a3d Alpha UI update (#88) 
* broken push

* broken push

* Alpha rebase complete, added asset loader for UI branch

---------

Co-authored-by: ramollia <@>
 2025-10-01 15:09:26 +02:00
lieght
527378ac00 Alpha rebase complete, added asset loader for UI branch 2025-10-01 15:08:18 +02:00
lieght
197db4faac Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	app/pom.xml
#	app/src/main/java/org/toop/app/gui/RemoteGameSelector.java
#	app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java
#	app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
 2025-10-01 15:04:03 +02:00
ramollia
5edd3a2278 broken push 2025-10-01 15:01:32 +02:00
lieght
823a2cd4df Added ability to track loading amount through event. 2025-10-01 14:50:47 +02:00
lieght
b2b8601f0c Added methods to FontAsset to make it usable. 2025-10-01 04:30:35 +02:00
lieght
5e4db91750 Moved loads to own class for better memory management. Added ability to add text- and localizationassets. 2025-10-01 04:19:28 +02:00
lieght
f11ff0421b Merge remote-tracking branch 'origin/assetManager' into assetManager 2025-10-01 00:13:04 +02:00
lieght
6cd2c083b7 Refactored to have assets use self reflection to identify with certain extensions 2025-10-01 00:12:38 +02:00
Stef
aba8f682ec Merge remote-tracking branch 'origin/assetManager' into assetManager 2025-10-01 00:08:01 +02:00
Stef
7ff65de1ca Added an isLoaded check to AudioAsset getNewClip(). 2025-10-01 00:07:15 +02:00
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
lieght
21763851e8 Made AssetManager be Thread safe. 2025-09-30 23:42:56 +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
Ticho Hidding
f37d26db28 Merge remote-tracking branch 'origin/UI' into Localization 
# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/org/toop/Main.java
#	app/src/main/java/org/toop/app/gui/LocalServerSelector.java
#	app/src/main/java/org/toop/events/WindowEvents.java
#	app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
 2025-09-30 14:25:41 +02:00
Ticho Hidding
52d41e587e merge to UI 2025-09-30 14:22:08 +02:00
ramollia
99a3b7e85b broken push 2025-09-30 12:38:49 +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