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
361 Commits 8 Branches 1 Tag
6085f6ebe2d8219cf39cac17c6a60479af7122d1
Commit Graph

361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lieght
83130806a8 Changed bundled resources to use static base name instead. 
Added options menu with selectable language.

Created checkbox for setting fullscreen.

Refactored code to functions
 2025-10-03 04:15:36 +02:00
lieght
a5513bf87b Merge remote-tracking branch 'origin/121-settings-menu' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/menu/OptionsMenu.java
#	app/src/main/resources/assets/localization/localization_de.properties
#	app/src/main/resources/assets/localization/localization_en_US.properties
#	app/src/main/resources/assets/localization/localization_es.properties
#	app/src/main/resources/assets/localization/localization_fr.properties
#	app/src/main/resources/assets/localization/localization_it.properties
#	app/src/main/resources/assets/localization/localization_nl.properties
#	app/src/main/resources/assets/localization/localization_zh.properties
 2025-10-03 03:25:20 +02:00
lieght
547ea55300 Changed bundled resources to use static base name instead. 
Added options menu with selectable language
 2025-10-03 03:19:38 +02:00
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
8ac76dd17f Merge remote-tracking branch 'origin/UI' into UI 2025-10-03 01:34:15 +02:00
ramollia
efca808e1c small amount of refactoring. might break everything :). 2025-10-03 01:33:49 +02:00
Bas Antonius de Jong
dd230ad515 Merge pull request #122 from 2OOP/UI 
Feature merge
 2025-10-03 01:19:45 +02:00
lieght
1dd345a290 Merge remote-tracking branch 'origin/Development' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/menu/MainMenu.java
 2025-10-03 01:18:18 +02:00
lieght
e48df5df15 More gitignore 2025-10-03 00:58:57 +02:00
lieght
ef550f353d Pom fixes 2025-10-02 22:07:51 +02:00
lieght
ccc8ba3b79 Renamed assetmanager to resourcemanager in-development 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
Bas Antonius de Jong
a6bd2495ab UI (#107) 
* 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

* added German, French, Spanish, Italian and Mandarin Chinese

---------

Co-authored-by: Ticho Hidding <tichohidding@gmail.com>
Co-authored-by: ramollia <@>
 2025-10-02 19:34:10 +02:00
Bas Antonius de Jong
477afa142b UI (#106) 
* 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

* added German, French, Spanish, Italian and Mandarin Chinese

---------

Co-authored-by: Ticho Hidding <tichohidding@gmail.com>
Co-authored-by: ramollia <@>
 2025-10-02 19:25:21 +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
lieght
e7fded0c9e Added event for playing sound on button press. 2025-10-02 12:40:57 +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
Bas Antonius de Jong
2003fcbf5b Alpha Audio update (#90) 
Co-authored-by: Stef <48526421+StefBuwalda@users.noreply.github.com>
 2025-10-01 21:33:18 +02:00
lieght
f86775ff4c Estimate for how much RAM used in loading assets. 2025-10-01 19:30:57 +02:00
ramollia
258ce964c9 main menu done(?). probably not but fine for now 2025-10-01 19:25:19 +02:00
lieght
afdadbba66 Naming and logging 2025-10-01 19:21:39 +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
5ff7bdc0bd Merge remote-tracking branch 'origin/Alpha' into UI 
# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/menu/CreditsMenu.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/OptionsMenu.java
#	app/src/main/java/org/toop/app/menu/QuitMenu.java
#	app/src/main/resources/assets/style/main.css
#	app/src/main/resources/assets/style/quit.css
 2025-10-01 18:12:36 +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
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