stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 19:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
255 Commits 8 Branches 1 Tag
3471ae54a51b0e3a03cb0681367d2d5f4c5f4b75
Commit Graph

49 Commits

Author SHA1 Message Date
Ticho Hidding
3471ae54a5 small merge fixes 2025-10-03 02:46:48 +02:00
Ticho Hidding
c020269f6e Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/menu/MainMenu.java
#	app/src/main/java/org/toop/app/menu/game/GameMenu.java
 2025-10-03 02:43:39 +02:00
Ticho Hidding
f037412e9a Change language buttons added. Made UI update all text on language change 2025-10-03 02:37:38 +02:00
ramollia
5e1d53e96b tiny portion of refactoring 2025-10-03 01:41:11 +02:00
ramollia
efca808e1c small amount of refactoring. might break everything :). 2025-10-03 01:33:49 +02:00
lieght
ccc8ba3b79 Renamed assetmanager to resourcemanager 2025-10-02 21:47:18 +02:00
ramollia
3c699cde01 merged 2025-10-02 19:59:14 +02:00
ramollia
6626157052 Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/menu/MainMenu.java
#	app/src/main/java/org/toop/app/menu/Menu.java
#	app/src/main/java/org/toop/app/menu/QuitMenu.java
#	app/src/main/resources/assets/image/background.jpg
#	app/src/main/resources/assets/image/battleship.png
#	app/src/main/resources/assets/image/icon.png
#	app/src/main/resources/assets/image/lowpoly.png
#	app/src/main/resources/assets/image/other.png
#	app/src/main/resources/assets/image/reversi.png
#	app/src/main/resources/assets/image/sudoku.png
#	app/src/main/resources/assets/image/tictactoe.png
#	app/src/main/resources/assets/style/app.css
#	app/src/main/resources/assets/style/main.css
#	app/src/main/resources/assets/style/quit.css
#	app/src/main/resources/assets/style/style.css
 2025-10-02 19:47:09 +02:00
lieght
2fb116e107 Merge remote-tracking branch 'origin/UI' into UI 2025-10-02 19:22:58 +02:00
lieght
7f7637bc4e Merge remote-tracking branch 'refs/remotes/origin/Development' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	framework/src/main/java/org/toop/framework/asset/AssetLoader.java
#	framework/src/main/java/org/toop/framework/asset/AssetManager.java
 2025-10-02 19:22:39 +02:00
Ticho Hidding
be917e6a61 added German, French, Spanish, Italian and Mandarin Chinese 2025-10-02 13:43:00 +02:00
Bas Antonius de Jong
fb0e16acc2 Added MusicAsset, renamed SoundAsset to be SoundEffectAsset. Created new directories for fx and music types of sound. (#105) 2025-10-02 00:08:39 +02:00
ramollia
258ce964c9 main menu done(?). probably not but fine for now 2025-10-01 19:25:19 +02:00
Bas Antonius de Jong
258adbb627 UI (#96) 
* 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

* Removed no more needed files.

* JDK25

* Removed files no longer in use

* Removed need for manual typecast

* Added ability to load in BundledResource for localization

* Docs and easy font loading. Added interfaces for PreloadResource's

---------

Co-authored-by: Ticho Hidding <tichohidding@gmail.com>
Co-authored-by: ramollia <@>
 2025-10-01 18:14:56 +02:00
lieght
744bef2ddf Docs and easy font loading. Added interfaces for PreloadResource's 2025-10-01 18:09:14 +02:00
lieght
8ae7510219 Added ability to load in BundledResource for localization 2025-10-01 16:55:40 +02:00
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
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
Ticho Hidding
2c83427faf fix small merge error 2025-10-01 15:57:46 +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
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
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
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
6cd2c083b7 Refactored to have assets use self reflection to identify with certain extensions 2025-10-01 00:12:38 +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
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
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
ramollia
99a3b7e85b broken push 2025-09-30 12:38:49 +02:00
Bas de Jong
d1da49ad1d New assetManager 2025-09-30 11:48:53 +02:00
Bas de Jong
a957195514 Rudimentary audio file processing. 2025-09-29 13:48:03 +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
Ticho Hidding
2c4719f6d4 added localization options 
//todo add all the strings
 2025-09-25 14:38:06 +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
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
ramollia
da777f5300 refactor 2025-09-24 15:52:58 +02:00
ramollia
9fdd74326a refactor 2025-09-24 15:44:38 +02:00