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
617 Commits 8 Branches 1 Tag
8508377cb4f359a178e49790dee7cfd0ba443712
Commit Graph

617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ramollia
acc9972c80 redesign. add: themes and text size 2025-10-06 21:08:36 +02:00
Bas de Jong
5097e371f3 Added sendChallenge 2025-10-06 20:02:14 +02:00
Bas de Jong
98755b6bed Added connectedLayer with a playerList 2025-10-06 19:52:31 +02:00
Stef
0d771088e1 Merge pull request #129 
* Sound data is now stored in memory as a byte[]
 2025-10-06 19:08:46 +02:00
Stef
43c577ef17 Volume slider affects clips (#127) 2025-10-06 18:51:04 +02:00
Ticho Hidding
017673452b Merge remote-tracking branch 'origin/UI' into UI 2025-10-06 15:03:55 +02:00
Ticho Hidding
b8488c7289 small fix v2 2025-10-06 15:03:37 +02:00
ramollia
cfde1f8d7f update: style 2025-10-06 11:43:09 +02:00
Ticho Hidding
9144cb453e small fix 2025-10-06 02:34:48 +02:00
Ticho Hidding
20a7fd7a3e serverThread added. cant test cus server doesnt allow "MOVE <int>" 2025-10-06 01:36:58 +02:00
ramollia
33255d5ee6 update: java version 2025-10-05 20:08:43 +02:00
ramollia
ada778fe71 Merge remote-tracking branch 'origin/UI' into UI 2025-10-05 20:07:47 +02:00
ramollia
ab7494616b fix: issues 2025-10-05 20:07:36 +02:00
lieght
08bfb97399 Wip OnlineGameState 2025-10-05 19:55:29 +02:00
ramollia
062fe2e8bc Merge remote-tracking branch 'origin/UI' into UI 2025-10-05 18:24:25 +02:00
ramollia
b903e9b3c4 setup for server thread 2025-10-05 18:24:15 +02:00
Ticho Hidding
a40d30fec7 Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/GameType.java
#	app/src/main/java/org/toop/app/layer/layers/GameLayer.java
 2025-10-05 18:22:10 +02:00
Ticho Hidding
98bff669e9 start van match.java. allemaal events 2025-10-05 18:21:28 +02:00
lieght
c2d320ea97 Merge remote-tracking branch 'origin/UI' into UI 2025-10-05 17:52:45 +02:00
ramollia
9ee6bf3067 Merge remote-tracking branch 'origin/UI' into UI 2025-10-05 17:52:40 +02:00
lieght
2198b8a8d9 Fixes gets 2025-10-05 17:52:32 +02:00
ramollia
7e3f13491d fix: some things 2025-10-05 17:52:29 +02:00
lieght
d28fd90b84 Merge remote-tracking branch 'origin/UI' into UI 2025-10-05 17:38:16 +02:00
lieght
b8336ce3d2 Added throw exception 2025-10-05 17:38:01 +02:00
ramollia
b5ac747f77 Merge remote-tracking branch 'origin/UI' into UI 2025-10-05 17:28:46 +02:00
ramollia
369df7a0d1 save locale 2025-10-05 17:28:33 +02:00
lieght
06464945bd Sane default for audio. 2025-10-05 17:23:05 +02:00
lieght
1bab3e12a5 Fixed garbage code. 2025-10-05 17:21:31 +02:00
ramollia
a50c1a8d0d broken merge 2025-10-05 17:18:33 +02:00
ramollia
f780309572 Merge remote-tracking branch 'origin/Settings' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/layer/layers/OptionsLayer.java
#	framework/src/main/java/org/toop/framework/audio/SoundManager.java
 2025-10-05 17:03:09 +02:00
ramollia
2362333d46 add: some more languages 2025-10-05 16:59:37 +02:00
lieght
0ab0cd75ba Fixed audio not getting correct volume at settings loading. Added back background music 2025-10-05 01:51:29 +02:00
ramollia
043b789da1 readd: localization 2025-10-04 22:57:12 +02:00
michiel
d7d6a49b98 settings 2025-10-04 22:33:46 +02:00
ramollia
39fa2edb3a add: credits layer 2025-10-04 20:25:59 +02:00
ramollia
e7d606f08e add: options layer 2025-10-04 19:26:30 +02:00
ramollia
db6231c6d0 add: fullscreen option 2025-10-04 18:18:53 +02:00
ramollia
cd2f3c312e start: options 2025-10-04 16:59:28 +02:00
ramollia
2eeca4e418 finish: multiplayer layer 2025-10-04 16:54:58 +02:00
ramollia
4daa379011 remove: addCanvas 2025-10-04 16:30:50 +02:00
ramollia
ba4173f029 add: separators 2025-10-04 16:24:27 +02:00
ramollia
af0db24b0a add: sliders 
change: formatting
 2025-10-04 15:56:07 +02:00
ramollia
732abedba5 sorry michiel 2025-10-04 15:18:34 +02:00
ramollia
fe6b050702 Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	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/OptionsMenu.java
 2025-10-04 15:16:39 +02:00
ramollia
b3feab7cb3 change things 2025-10-04 15:16:07 +02:00
ramollia
87a5b301c7 change: layout stuff 2025-10-04 13:52:04 +02:00
ramollia
8fc7f606f9 change: toggles 2025-10-03 23:16:47 +02:00
ramollia
fae5b8bcda added: toggle 2025-10-03 22:34:26 +02:00
ramollia
ac6de04e68 changed how the layer background uses css 2025-10-03 21:44:32 +02:00
michiel
d9a93f24fb credits toegevoegd 2025-10-03 21:44:06 +02:00