600 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lieght	123ecc7d3a	Working state. Split AudioManager into 3 different branches for easier testing and srp	2025-10-11 04:50:49 +02:00
Ticho Hidding	c1f7a093ef	Moves flip dots. all tests pass. can play reversi local.	2025-10-11 00:51:46 +02:00
Ticho Hidding	5dda85248e	legal moves now get highlighted in red	2025-10-09 15:27:58 +02:00
Ticho Hidding	5a3490af2e	start to reversi logic	2025-10-08 17:27:50 +02:00
Bas de Jong	7f3d858320	AppSettings now also get loaded into the assetmanager	2025-10-08 00:14:40 +02:00
Bas de Jong	e9dfbbd150	Renamed asset folder to resource, made resourceLoader more robust. Completed some TODO's, formatting	2025-10-07 23:54:33 +02:00
Bas de Jong	72e322675e	Fixed bugs and oversights	2025-10-07 22:39:47 +02:00
Bas Antonius de Jong	afb4844084	Merge pull request #164 from 2OOP/Development ... Development update, demo 2	2025-10-07 19:57:50 +02:00
Bas de Jong	ed3cb902e4	Fixed wrong test	2025-10-07 19:55:23 +02:00
Bas de Jong	3c385e27b0	Formatting	2025-10-07 19:47:45 +02:00
Bas de Jong	783cfd22e1	Updated .gitignore	2025-10-07 19:46:14 +02:00
Bas de Jong	16a5b1ce2f	Merge remote-tracking branch '2OOP/main' into Development ... # Conflicts: # .idea/compiler.xml # .idea/misc.xml # app/src/main/java/org/toop/Main.java	2025-10-07 19:40:55 +02:00
Bas de Jong	6bfa8868bf	Moved import	2025-10-07 19:36:42 +02:00
Bas de Jong	748f72352f	Merge remote-tracking branch 'origin/Development' into UI	2025-10-07 19:36:14 +02:00
ramollia	e12e48b4fb	fast server connection	2025-10-07 12:40:12 +02:00
michiel	a302f0d24d	added a song	2025-10-07 12:35:54 +02:00
ramollia	3d9914c927	add: missing localization	2025-10-07 12:08:01 +02:00
Stef	3af182b986	Add a music volume slider (#135)	2025-10-07 11:47:57 +02:00
Stef	58269e917a	Split AudioVolumeManager from SoundManager (#134)	2025-10-07 09:45:59 +02:00
ramollia	172b26ed51	...	2025-10-07 04:46:45 +02:00
ramollia	78aef47bc0	fix: effects volume translation	2025-10-06 23:36:25 +02:00
ramollia	ea8de7881f	Merge remote-tracking branch 'origin/UI' into UI ... # Conflicts: # app/src/main/resources/assets/localization/localization_ka.properties	2025-10-06 23:26:07 +02:00
ramollia	e6fa522f39	add: ai think time. ... remove: georgian language pack	2025-10-06 23:25:48 +02:00
Bas de Jong	6d7a8e4c50	Refactored code	2025-10-06 23:10:07 +02:00
Bas de Jong	c6c1c110f7	var to string	2025-10-06 23:04:11 +02:00
Bas de Jong	046a59e915	Added clickable players	2025-10-06 22:59:18 +02:00
Bas de Jong	501b411e34	Merge remote-tracking branch 'origin/UI' into UI	2025-10-06 22:27:27 +02:00
Bas de Jong	95c4a2fc8e	finished fx audio volume	2025-10-06 22:27:14 +02:00
ramollia	ce02fc2b88	add: online player list	2025-10-06 22:16:23 +02:00
ramollia	f525fc7ffc	add: missing localization	2025-10-06 21:49:35 +02:00
ramollia	1bf3f00322	add: win screen	2025-10-06 21:46:38 +02:00
ramollia	525adfdd04	translated: connection type	2025-10-06 21:15:43 +02:00
ramollia	fcdd4a8fc1	Merge remote-tracking branch 'origin/UI' into UI ... # Conflicts: # app/src/main/java/org/toop/app/layer/layers/MultiplayerLayer.java # app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java	2025-10-06 21:09:23 +02:00
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