1818 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
John	166d6dd9ca	Merge branch 'ms4/dev' into 'ms4/dev' ... add parameter to sql back See merge request morningstar/Arcturus-Community!44	2023-01-19 12:44:39 +00:00
Dom Bridge	c0e718ec92	add parameter to sql back	2023-01-17 09:34:44 +00:00
John	0f3ca7807e	Merge branch 'fix-height-bot-onplace' into 'ms4/dev' ... Fix for bot not sitting at right height when placing on a chair, fixes issue #1999 See merge request morningstar/Arcturus-Community!41	2023-01-16 23:05:17 +00:00
John	3d26fa122d	Merge branch 'fix-duplicate-tags' into 'ms4/dev' ... Fix for duplicating room tags #2000 See merge request morningstar/Arcturus-Community!40	2023-01-16 23:04:26 +00:00
John	16a241db02	Merge branch 'fix-wired-effectToggle-accept-switches' into 'ms4/dev' ... Updated forbidden interactionTypes for Wired Effect Toggle Furniture #1917 See merge request morningstar/Arcturus-Community!43	2023-01-16 23:03:27 +00:00
Yordi	36fad3d807	Modification of the forbidden types to select and use with the Wired Effect Toggle Furniture, types has been checked on Habbo on the 16th of January 2023	2023-01-16 21:06:35 +01:00
John	86c30d880c	Merge branch 'ms4/dev' into 'ms4/dev' ... possibly fix navigator See merge request morningstar/Arcturus-Community!42	2023-01-16 15:54:09 +00:00
Dom Bridge	c638e60936	possibly fix navigator	2023-01-16 15:47:13 +00:00
Yordi	5f3099865a	Fix for bot not sitting at right height when placing on a chair, fixes issue #1999	2023-01-16 13:50:00 +01:00
Yordi	344cb2756d	Fix for duplicating room tags #2000	2023-01-16 13:43:38 +01:00
John	1cc8674b18	Merge branch 'fix-databaseconstant' into 'ms4/dev' ... Modification DatabaseConstants.USER_ID See merge request morningstar/Arcturus-Community!39	2023-01-16 12:29:43 +00:00
Yordi	120c7295d4	Modification DatabaseConstants.USER_ID	2023-01-16 12:29:43 +00:00
John	21b7742ebe	Merge branch 'ms4/dev' into 'ms4/dev' ... Revert "add flyway migrations - older flyway as new one is being a dick" See merge request morningstar/Arcturus-Community!38	2023-01-13 23:15:16 +00:00
Dom Bridge	ca5970b2b7	Revert "add flyway migrations - older flyway as new one is being a dick" ... This reverts commit efc2707a	2023-01-13 23:13:31 +00:00
John	11fd7d8c26	Merge branch 'feature/unit-test-support' into 'ms4/dev' ... Added unit test support See merge request morningstar/Arcturus-Community!37	2023-01-13 20:48:52 +00:00
Remco Krews	37d1afecc0	Added unit test support	2023-01-13 20:48:52 +00:00
John	2418dfd177	Merge branch 'db-migrations' into 'ms4/dev' ... add flyway migrations - older flyway as new one is being a dick See merge request morningstar/Arcturus-Community!35	2023-01-13 14:13:16 +00:00
Dominic Bridge	efc2707aff	add flyway migrations - older flyway as new one is being a dick	2023-01-13 14:13:16 +00:00
John	45e3b6ed99	Merge branch 'fix-build' into 'ms4/dev' ... Add missing classes See merge request morningstar/Arcturus-Community!34	2023-01-13 09:47:46 +00:00
Dom Bridge	bca0af2d46	Add missing classes	2023-01-13 09:39:15 +00:00
John	b43f9454e7	Merge branch 'commands-refactor' into 'ms4/dev' ... Refactor commands See merge request morningstar/Arcturus-Community!33	2023-01-13 08:24:53 +00:00
Dom Bridge	00c3ae28fe	Refactor commands	2023-01-12 12:15:41 +00:00
brenoepic	a224028df3	Merge branch 'happiyness' into 'ms4/dev' ... Goodbye Happyness, welcome Happiness. Now where's my cup of tea, Elizabeth? See merge request morningstar/Arcturus-Community!32	2023-01-12 09:23:53 +00:00
Yordi	b0e46101d9	Goodbye Happyness, welcome Happiness. Now where's my cup of tea, Elizabeth?	2023-01-12 10:10:48 +01:00
brenoepic	bf2ee66942	Merge branch 'implementToggleStaffPickEvent' into 'ms4/dev' ... Reimplemented the ToggleStaffPickEvent (used to be RoomStaffPickEvent) See merge request morningstar/Arcturus-Community!30	2023-01-12 08:40:33 +00:00
brenoepic	8ba06449ff	Merge branch 'code-readability' into 'ms4/dev' ... Fix build See merge request morningstar/Arcturus-Community!31	2023-01-12 08:39:03 +00:00
Dom Bridge	40ca3a388d	Fix build	2023-01-12 08:18:59 +00:00
John	671ab9fe9b	Merge branch 'code-readability' into 'ms4/dev' ... Code optimisations and readability See merge request morningstar/Arcturus-Community!29	2023-01-11 21:24:07 +00:00
Yordi	27ea656fe3	Reimplemented the ToggleStaffPickEvent (used to be RoomStaffPickEvent)	2023-01-11 21:46:35 +01:00
John	a48c72307f	Merge branch 'sqlupdatepets' into 'ms4/dev' ... SQL updates for pets See merge request morningstar/Arcturus-Community!28	2023-01-11 18:35:44 +00:00
Yordi	46950d231b	SQL updates for pets	2023-01-11 18:35:44 +00:00
Dom Bridge	ab5bd82ed3	Code optimisations and readability	2023-01-11 15:34:22 +00:00
Dom Bridge	f973f7885d	Code optimisations and readability	2023-01-11 12:45:21 +00:00
Harmonic	c4b9e0546d	Change java version to 19, required for experimental features.	2023-01-10 17:47:34 -08:00
John	c133b262da	Merge branch 'feature/remove-some-code-duplication2' into 'ms4/dev' ... Feature/remove some code duplication2 See merge request morningstar/Arcturus-Community!27	2023-01-10 14:44:58 +00:00
Dominic Bridge	1105b96a8f	Feature/remove some code duplication2	2023-01-10 14:44:58 +00:00
John	b7794d239a	Merge branch 'feature/remove-redundant-exceptions' into 'ms4/dev' ... Feature/remove redundant exceptions See merge request morningstar/Arcturus-Community!25	2023-01-10 14:36:39 +00:00
Dominic Bridge	c3e00b927d	Feature/remove redundant exceptions	2023-01-10 14:36:39 +00:00
John	537737d658	Merge branch 'feature/encapsulation' into 'ms4/dev' ... More encapsulation See merge request morningstar/Arcturus-Community!24	2023-01-10 14:29:21 +00:00
Dominic Bridge	57b13cac48	More encapsulation	2023-01-10 14:29:21 +00:00
John	9ee1997c50	Merge branch 'ms4/dev' into 'ms4/dev' ... Update Pets See merge request morningstar/Arcturus-Community!22	2023-01-10 02:05:48 +00:00
DuckieTM	02987fed92	Update Pets	2023-01-10 02:05:48 +00:00
John	dacf69657d	Merge branch 'feature/code-cleanup' into 'ms4/dev' ... Use Lombok, use math functions, encapsulate fields, use some java18 features,... See merge request morningstar/Arcturus-Community!23	2023-01-09 23:04:13 +00:00
Dominic Bridge	bd400bdcf0	Use Lombok, use math functions, encapsulate fields, use some java18 features,...	2023-01-09 23:04:13 +00:00
Harmonic	284069b509	Merge branch 'ms4/dev' of https://git.krews.org/morningstar/Arcturus-Community into ms4/dev	2023-01-08 10:55:46 -08:00
Harmonic	8310e9f7df	Push Comments for WiredConditionDateRangeActive.java for Wired Documentation.	2023-01-08 10:55:34 -08:00
John	dd471c065b	Merge branch 'ms4/dev' into 'ms4/dev' ... Ms4/dev See merge request morningstar/Arcturus-Community!21	2023-01-07 03:42:32 +00:00
DuckieTM	4643ee79fd	Ms4/dev	2023-01-07 03:42:32 +00:00
Harmonic	60bf49df74	Added full comments to PetCommand.java	2023-01-06 19:24:27 -08:00
Harmonic	d4b3355068	Merge branch 'ms4/dev' of https://git.krews.org/morningstar/Arcturus-Community into ms4/dev	2023-01-06 08:18:02 -08:00