nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-30 01:50:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,858 Commits 6 Branches 30 Tags 9.6 MiB
ms4/dev
Commit Graph

1858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Harmonic
817c9ab88c Added full comments to Pet.java 2023-01-06 08:17:28 -08:00
John
e37e675668 Merge branch 'ms4/dev' into 'ms4/dev' 
All Pets Fixed and Commands

See merge request morningstar/Arcturus-Community!18
 2023-01-06 14:46:55 +00:00
DuckieTM
0f81342179 All Pets Fixed and Commands 2023-01-06 08:52:46 +00:00
brenoepic
109b6b8273 Merge branch 'ms4/dev' into 'ms4/dev' 
Ms4/dev

See merge request morningstar/Arcturus-Community!17
 2023-01-05 17:06:23 +00:00
brenoepic
b11fb8a8d2 Merge branch 'ms4/dev' into 'ms4/dev' 
# Conflicts:
#   sqlupdates/3_5_0 to 4_0_0.sql
 2023-01-05 16:57:44 +00:00
DuckieTM
d7adda47c6 Updated 2 more 2023-01-05 11:37:59 +00:00
DuckieTM
1f6385861a Update Pet commando's 2023-01-05 09:56:52 +00:00
brenoepic
ea9e02f60d Merge branch 'ms4/dev-add-fix-disk-song' into 'ms4/dev' 
Fixed the song disk bug

See merge request morningstar/Arcturus-Community!16
 2023-01-03 13:26:59 +00:00
brenoepic
4319dab80b Update .gitlab-ci.yml 2023-01-03 05:45:45 +00:00
Julimar Melo
db703d36b3 Fixed the song disk bug 2023-01-03 02:31:25 -03:00