nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 15:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,845 Commits 6 Branches 30 Tags 9.6 MiB
2a6ddaee2b
Commit Graph

1845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
brenoepic
7f3521f821 Update 3_5_0 to 4_0_0.sql 2022-12-31 07:29:45 +00:00
brenoepic
164908e5e2 Fix CannonKick Null Point Exception 2022-12-31 07:16:01 +00:00
brenoepic
f6dddbdde6 Merge branch 'ms4/dev' into 'ms4/dev' 
Update Dockerfile with updated artifactId

See merge request morningstar/Arcturus-Community!12
 2022-12-24 15:23:48 +00:00
O O
2d0ca4cbd2 Update Dockerfile with updated artifactId 2022-12-24 15:22:01 +00:00
brenoepic
3141602e45 Merge branch 'TheOleg-ms4/dev-patch-64987' into 'ms4/dev' 
Update Dockerfile

See merge request morningstar/Arcturus-Community!9
 2022-12-24 14:00:58 +00:00
brenoepic
bb3f011b0c Merge branch 'TheOleg-ms4/dev-patch-59344' into 'ms4/dev' 
Update InteractionInformationTerminal.java

See merge request morningstar/Arcturus-Community!10
 2022-12-24 14:00:37 +00:00
brenoepic
df67a21e16 Merge branch 'TheOleg-ms4/dev-patch-21605' into 'ms4/dev' 
Skip catalog_items with amount < 1

See merge request morningstar/Arcturus-Community!8
 2022-12-24 14:00:09 +00:00
O O
4c6286dd65 Update InteractionInformationTerminal.java 2022-12-24 10:37:58 +00:00
O O
2ce1422fbd Update Dockerfile 2022-12-24 10:25:04 +00:00
O O
f4da5dc286 Skip catalog_items with amount < 1 2022-12-24 10:20:50 +00:00
brenoepic
3264fbba6e Merge branch 'yt-fix' into 'ms4/dev' 
Fix Youtube playlists loading

See merge request morningstar/Arcturus-Community!2
 2022-12-21 14:07:02 +00:00
brenoepic
9516e25da7 Merge branch 'fix-games' into 'ms4/dev' 
Fix GymEquipment, Freeze, BattleBanzai and Wired game effects

See merge request morningstar/Arcturus-Community!1
 2022-12-21 14:06:41 +00:00
brenoepic
98e70e8f81 Update FreezeGamePlayer.java 2022-12-04 02:16:47 -03:00