stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 02:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 1bab3e12a5 Fixed garbage code. lieght 2025-10-05 17:21:31 +02:00
  • a50c1a8d0d broken merge ramollia 2025-10-05 17:18:33 +02:00
  • f780309572 Merge remote-tracking branch 'origin/Settings' into UI ramollia 2025-10-05 17:03:09 +02:00
  • 2362333d46 add: some more languages ramollia 2025-10-05 16:59:37 +02:00
  • 0ab0cd75ba Fixed audio not getting correct volume at settings loading. Added back background music lieght 2025-10-05 01:51:29 +02:00
  • 043b789da1 readd: localization ramollia 2025-10-04 22:57:12 +02:00
  • d7d6a49b98 settings michiel 2025-10-04 22:33:46 +02:00
  • 39fa2edb3a add: credits layer ramollia 2025-10-04 20:25:59 +02:00
  • e7d606f08e add: options layer ramollia 2025-10-04 19:26:30 +02:00
  • db6231c6d0 add: fullscreen option ramollia 2025-10-04 18:18:53 +02:00
  • cd2f3c312e start: options ramollia 2025-10-04 16:59:28 +02:00
  • 2eeca4e418 finish: multiplayer layer ramollia 2025-10-04 16:54:58 +02:00
  • 4daa379011 remove: addCanvas ramollia 2025-10-04 16:30:50 +02:00
  • ba4173f029 add: separators ramollia 2025-10-04 16:24:27 +02:00
  • af0db24b0a add: sliders change: formatting ramollia 2025-10-04 15:56:07 +02:00
  • 732abedba5 sorry michiel ramollia 2025-10-04 15:18:34 +02:00
  • fe6b050702 Merge remote-tracking branch 'origin/UI' into UI ramollia 2025-10-04 15:16:39 +02:00
  • b3feab7cb3 change things ramollia 2025-10-04 15:16:07 +02:00
  • 87a5b301c7 change: layout stuff ramollia 2025-10-04 13:52:04 +02:00
  • 8fc7f606f9 change: toggles ramollia 2025-10-03 23:16:47 +02:00
  • fae5b8bcda added: toggle ramollia 2025-10-03 22:34:26 +02:00
  • ac6de04e68 changed how the layer background uses css ramollia 2025-10-03 21:44:32 +02:00
  • d9a93f24fb credits toegevoegd michiel 2025-10-03 21:44:06 +02:00
  • 754c8fea2e started working on the game selection layer ramollia 2025-10-03 21:31:42 +02:00
  • 82f8d00625 started the great ui redesign ramollia 2025-10-03 20:38:50 +02:00
  • 56a1afe1cd "Fixed double sound bug" lieght 2025-10-03 18:34:48 +02:00
  • 796c3a2bc6 Added forgotten sound effects lieght 2025-10-03 18:31:13 +02:00
  • dd192692bd Working sound effect for clicking, bug when using audio volume changer (changes some sounds to be wrong) lieght 2025-10-03 17:12:50 +02:00
  • 5a200a8a70 Working audio rocker in settings menu. lieght 2025-10-03 04:42:48 +02:00
  • 83130806a8 Changed bundled resources to use static base name instead. lieght 2025-10-03 04:15:36 +02:00
  • a5513bf87b Merge remote-tracking branch 'origin/121-settings-menu' into UI lieght 2025-10-03 03:25:20 +02:00
  • 547ea55300 Changed bundled resources to use static base name instead. lieght 2025-10-03 03:19:38 +02:00
  • 3471ae54a5 small merge fixes Ticho Hidding 2025-10-03 02:46:48 +02:00
  • c020269f6e Merge remote-tracking branch 'origin/UI' into UI Ticho Hidding 2025-10-03 02:43:39 +02:00
  • f037412e9a Change language buttons added. Made UI update all text on language change Ticho Hidding 2025-10-03 02:37:38 +02:00
  • 5e1d53e96b tiny portion of refactoring ramollia 2025-10-03 01:41:11 +02:00
  • 8ac76dd17f Merge remote-tracking branch 'origin/UI' into UI ramollia 2025-10-03 01:34:15 +02:00
  • efca808e1c small amount of refactoring. might break everything :). ramollia 2025-10-03 01:33:49 +02:00
  • dd230ad515 Merge pull request #122 from 2OOP/UI Bas Antonius de Jong 2025-10-03 01:19:45 +02:00
  • 1dd345a290 Merge remote-tracking branch 'origin/Development' into UI lieght 2025-10-03 01:18:18 +02:00
  • e48df5df15 More gitignore lieght 2025-10-03 00:58:57 +02:00
  • ef550f353d Pom fixes lieght 2025-10-02 22:07:51 +02:00
  • ccc8ba3b79 Renamed assetmanager to resourcemanager in-development lieght 2025-10-02 21:47:18 +02:00
  • 3c699cde01 merged ramollia 2025-10-02 19:59:14 +02:00
  • 6626157052 Merge remote-tracking branch 'origin/UI' into UI ramollia 2025-10-02 19:47:09 +02:00
  • a6bd2495ab UI (#107) Bas Antonius de Jong 2025-10-02 19:34:10 +02:00
  • 477afa142b UI (#106) Bas Antonius de Jong 2025-10-02 19:25:21 +02:00
  • 2fb116e107 Merge remote-tracking branch 'origin/UI' into UI lieght 2025-10-02 19:22:58 +02:00
  • 7f7637bc4e Merge remote-tracking branch 'refs/remotes/origin/Development' into UI lieght 2025-10-02 19:22:39 +02:00
  • be917e6a61 added German, French, Spanish, Italian and Mandarin Chinese Ticho Hidding 2025-10-02 13:43:00 +02:00
  • e7fded0c9e Added event for playing sound on button press. lieght 2025-10-02 12:40:57 +02:00
  • fb0e16acc2 Added MusicAsset, renamed SoundAsset to be SoundEffectAsset. Created new directories for fx and music types of sound. (#105) Bas Antonius de Jong 2025-10-02 00:08:39 +02:00
  • 2003fcbf5b Alpha Audio update (#90) Bas Antonius de Jong 2025-10-01 21:33:18 +02:00
  • f86775ff4c Estimate for how much RAM used in loading assets. lieght 2025-10-01 19:30:57 +02:00
  • 258ce964c9 main menu done(?). probably not but fine for now ramollia 2025-10-01 19:25:19 +02:00
  • afdadbba66 Naming and logging lieght 2025-10-01 19:21:39 +02:00
  • 258adbb627 UI (#96) Bas Antonius de Jong 2025-10-01 18:14:56 +02:00
  • 5ff7bdc0bd Merge remote-tracking branch 'origin/Alpha' into UI lieght 2025-10-01 18:12:36 +02:00
  • 744bef2ddf Docs and easy font loading. Added interfaces for PreloadResource's lieght 2025-10-01 18:09:14 +02:00
  • 8ae7510219 Added ability to load in BundledResource for localization lieght 2025-10-01 16:55:40 +02:00
  • 71dab89dc8 Removed need for manual typecast lieght 2025-10-01 16:17:02 +02:00
  • dd74eaab43 Removed files no longer in use lieght 2025-10-01 16:04:42 +02:00
  • af9da93421 JDK25 lieght 2025-10-01 16:03:35 +02:00
  • 632756bd51 Removed no more needed files. lieght 2025-10-01 16:03:06 +02:00
  • 9b17a4ba7f Alpha UI update (#95) Bas Antonius de Jong 2025-10-01 15:59:12 +02:00
  • 435d443b94 Merge remote-tracking branch 'origin/UI' into UI lieght 2025-10-01 15:58:33 +02:00
  • 2c83427faf fix small merge error Ticho Hidding 2025-10-01 15:57:46 +02:00
  • 5a779a8a25 Merge remote-tracking branch 'origin/Alpha' into UI lieght 2025-10-01 15:56:42 +02:00
  • 9134c7e3e7 Merge remote-tracking branch 'origin/UI' into UI Ticho Hidding 2025-10-01 15:54:18 +02:00
  • 9e35db4dd4 added NL and EN for all strings currently in UI Ticho Hidding 2025-10-01 15:51:14 +02:00
  • 13bc313c17 UI now uses assetmanager lieght 2025-10-01 15:48:23 +02:00
  • b12c74433a merge to UI Ticho Hidding 2025-10-01 15:31:38 +02:00
  • 2f9b155e6e Alpha DrawCondition update (#89) Bas Antonius de Jong 2025-10-01 15:20:02 +02:00
  • eb6dc03a3d Alpha UI update (#88) Bas Antonius de Jong 2025-10-01 15:09:26 +02:00
  • 527378ac00 Alpha rebase complete, added asset loader for UI branch lieght 2025-10-01 15:08:18 +02:00
  • 197db4faac Merge remote-tracking branch 'origin/UI' into UI lieght 2025-10-01 15:04:03 +02:00
  • 5edd3a2278 broken push ramollia 2025-09-30 12:38:49 +02:00
  • 823a2cd4df Added ability to track loading amount through event. lieght 2025-10-01 14:50:47 +02:00
  • b2b8601f0c Added methods to FontAsset to make it usable. lieght 2025-10-01 04:30:35 +02:00
  • 5e4db91750 Moved loads to own class for better memory management. Added ability to add text- and localizationassets. lieght 2025-10-01 04:19:28 +02:00
  • f11ff0421b Merge remote-tracking branch 'origin/assetManager' into assetManager lieght 2025-10-01 00:13:04 +02:00
  • 6cd2c083b7 Refactored to have assets use self reflection to identify with certain extensions lieght 2025-10-01 00:12:38 +02:00
  • aba8f682ec Merge remote-tracking branch 'origin/assetManager' into assetManager Stef 2025-10-01 00:08:01 +02:00
  • 7ff65de1ca Added an isLoaded check to AudioAsset getNewClip(). Stef 2025-10-01 00:07:15 +02:00
  • d661e0d4b5 Moved isLoaded to BaseResource. Loading and unloading will still be overridden if necessary. Added some subclass/super safe load and unload functions. Stef 2025-10-01 00:06:46 +02:00
  • 21763851e8 Made AssetManager be Thread safe. lieght 2025-09-30 23:42:56 +02:00
  • d432887860 Added back changes from audio branch. byte[] is stored in base resource and different Resources can extract their data from it. Stef 2025-09-30 23:42:00 +02:00
  • 7c970d9a4d Updated assetmanager to now load assets with an assetloader lieght 2025-09-30 23:32:37 +02:00
  • d78fd1b606 Fixed unknown names, Assetmanager now has initializeloader lieght 2025-09-30 23:17:32 +02:00
  • cf9c281992 Merge remote-tracking branch 'refs/remotes/origin/46-audio-epic' into assetManager lieght 2025-09-30 22:54:54 +02:00
  • 8328387e86 Reworked resources to be assets, and made AssetManager a singleton Bas de Jong 2025-09-30 21:01:59 +02:00
  • a7cd0016f1 83 spelen van geluid geeft id terug (#86) Stef 2025-09-30 20:29:42 +02:00
  • d158668dfd Resources now impelement the ResourceType interface Bas de Jong 2025-09-30 20:04:48 +02:00
  • db544868d9 Merge pull request #85 from 2OOP/84-Byte-array-ipv-InputStream Stef 2025-09-30 19:55:10 +02:00
  • 324811d026 Switched from Input Stream to Byte array. getStream can now be used to get a buffered stream Stef 2025-09-30 19:53:39 +02:00
  • 44b4613c27 Updated SoundManager.java to simplify how audios are played. Uses new AssetManager and AudioInputStream instead of whatever was going on at first. Stef 2025-09-30 16:58:26 +02:00
  • 423fd9d68a AssetManager init Bas de Jong 2025-09-30 16:38:13 +02:00
  • f37d26db28 Merge remote-tracking branch 'origin/UI' into Localization Ticho Hidding 2025-09-30 14:25:41 +02:00
  • 52d41e587e merge to UI Ticho Hidding 2025-09-30 14:22:08 +02:00
  • 99a3b7e85b broken push ramollia 2025-09-30 12:38:49 +02:00