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

1426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harmonic
3c18b060cc Updated HC Badge Achievement so it no longer requires payday to be enabled. 2021-02-10 19:03:52 +00:00
Harmonic
ac83132b75 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-02-10 03:33:46 +00:00
Remco
3f152c560c Merge branch 'Thijmen-dev-patch-77239' into 'dev' 
HC Gifts fix

See merge request morningstar/Arcturus-Community!403
 2021-02-09 22:21:53 +00:00
Thijmen
e9e96a0c11 Don't do calculation server side - client relies on the amount of days the offer needs to have. 2021-02-09 17:03:25 -05:00
Remco
2806a37615 Merge branch 'revert-d256e653' into 'dev' 
Revert "Merge branch 'Snaiker/Arcturus-Community-patch-fix-issue-934' into dev"

See merge request morningstar/Arcturus-Community!402
 2021-02-09 15:43:24 +00:00
Remco
926e817e4f Revert "Merge branch 'Snaiker/Arcturus-Community-patch-fix-issue-934' into dev" 
This reverts merge request !362
 2021-02-09 10:42:09 -05:00
skeletor
d11d3546a8 Merge branch 'fix-ping' into 'dev' 
fixed pinging to send every 30 seconds, regardless of idle state

See merge request morningstar/Arcturus-Community!401
 2021-02-09 08:24:58 +00:00
Dank074
0bbe249cee fixed pinging to send every 30 seconds, regardless of idle state 2021-02-09 01:35:43 -06:00
Harmonic
30f9425018 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-02-07 16:41:58 -08:00
Remco
d256e65343 Merge branch 'Snaiker/Arcturus-Community-patch-fix-issue-934' into dev 2021-02-07 23:32:23 +01:00
Remco
a93aad2b66 Merge branch 'dev' into Snaiker/Arcturus-Community-patch-fix-issue-934 2021-02-07 22:19:43 +01:00
Remco
5531c20644 Merge branch 'fix/timer-threading' into 'dev' 
#949 Fixed game timer threading issue

See merge request morningstar/Arcturus-Community!399
 2021-02-04 20:53:58 +00:00
Harmony
e03a76f30c Merge branch 'fix-ban-empty-machine-id' into 'dev' 
fix ban behavior for empty machine id/ip address

See merge request morningstar/Arcturus-Community!398
 2021-02-04 20:09:14 +00:00
Harmony
a1bb93a767 Merge branch 'fix/gift-achievement' into 'dev' 
#944 Gifting yourself won't progress achievements anymore

See merge request morningstar/Arcturus-Community!400
 2021-02-04 20:08:56 +00:00
Remco
f527527787 Gifting yourself won't progress achievements anymore 2021-02-04 21:05:38 +01:00
Remco
8ad3aeb6b2 Fixed game timer threading issue 2021-02-04 19:59:16 +01:00
Dank074
35f81f96c4 fix ban behavior for empty machine id/ip address 2021-02-03 19:16:50 -06:00
Remco
1949ed4c66 Merge branch 'fix/mannequin-save-name-event' into 'dev' 
MannequinSaveNameEvent now checks for acc_anyroomowner

See merge request morningstar/Arcturus-Community!397
 2021-02-03 16:54:54 +00:00
Remco
2bb55a8e38 MannequinSaveNameEvent now checks for acc_anyroomowner 2021-02-03 17:53:00 +01:00
Remco
f69c1e58a4 Merge branch 'fix/mannequin-save-look-event' into 'dev' 
Mannequin save look event now checks for acc_anyroomowner

See merge request morningstar/Arcturus-Community!395
 2021-02-02 17:22:38 +00:00
Remco
4c096ae8d1 Mannequin save look event now checks for acc_anyroomowner 2021-02-02 18:21:02 +01:00
Remco
d7e96d9475 Mannequin save look event now checks for acc_anyroomowner 2021-02-02 18:18:08 +01:00
Remco
c4495408b5 Merge branch 'fix/wired-not-trigger-on-furni' into 'dev' 
Fixed wired Condition: Trigger is NOT on furni

See merge request morningstar/Arcturus-Community!394
 2021-02-01 18:25:32 +00:00
Remco
64b75a0be6 Fixed wired Condition: Trigger is NOT on furni 2021-02-01 19:09:11 +01:00
Harmonic
e40f772e38 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-01-30 13:49:03 -08:00
skeletor
0f243aa02f Merge branch 'fix-availabilitystatus-packet' into 'dev' 
fixed availabilitystatus packet

See merge request morningstar/Arcturus-Community!393
 2021-01-30 03:31:46 +00:00
Dank074
610144851a fixed availabilitystatus packet 2021-01-29 19:31:26 -06:00
Remco
b20411c37d Merge branch 'feature/secure-login-event-logging' into 'dev' 
Added logging for SecureLoginEvent

See merge request morningstar/Arcturus-Community!392
 2021-01-29 23:03:07 +00:00
Remco
e4f2a792e8 Added logging for SecureLoginEvent 2021-01-29 23:53:55 +01:00
Harmonic
4a8a714172 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-01-29 10:41:23 -08:00
Remco
2dfd110ad3 Merge branch 'fix/butlerbot-serving' into 'dev' 
ButlerBot behaviour fixes

See merge request morningstar/Arcturus-Community!391
 2021-01-29 18:39:44 +00:00
Remco
fe31b37aa1 Bot now only serves once when the distance is more than reach distance 2021-01-29 19:28:18 +01:00
Remco
5851162a63 Bot now only serves once when the distance is more than reach distance 2021-01-29 19:08:41 +01:00
Harmonic
cd2fbcf169 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-01-28 14:54:41 -08:00
skeletor
9c0cb00628 Merge branch 'enc-force-option' into 'dev' 
add option to force encryption

See merge request morningstar/Arcturus-Community!390
 2021-01-28 07:47:19 +00:00
Dank074
c14746a05f add option to force encryption 2021-01-28 01:34:59 -06:00
Harmonic
b0683f524a Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-01-27 05:39:13 -08:00
Remco
6715e48aa5 Merge branch 'refactor/WiredConditionNotMatchStatePosition' into 'dev' 
Refactored WiredConditionNotMatchStatePosition

See merge request morningstar/Arcturus-Community!381
 2021-01-23 17:46:43 -05:00
Remco
eee24c9830 Merge branch 'dev' into refactor/WiredConditionNotMatchStatePosition 2021-01-23 23:33:29 +01:00
Harmony
6da8d316c5 Merge branch 'fix/respectpoints' into 'dev' 
Fixed respect points cleaner

See merge request morningstar/Arcturus-Community!382
 2021-01-23 14:04:22 -05:00
Remco
ba145e6113 Fixed daily respects 2021-01-23 19:51:56 +01:00
Remco
433e02497c Refactored WiredConditionNotMatchStatePosition 2021-01-23 18:56:04 +01:00
Remco
3efbaadad6 Merge branch 'fix/wired-bot-talk' into 'dev' 
Bot variables can now be used in wireds

See merge request morningstar/Arcturus-Community!356
 2021-01-23 11:20:42 -05:00
Remco
ca26e7cf37 Merge branch 'dev' into fix/wired-bot-talk 2021-01-23 15:27:22 +01:00
Remco
80d58364a5 Moved bot SQLs to another sql file 2021-01-23 15:25:46 +01:00
Remco
fa6d81ef53 Merge branch 'TheOleg-dev-patch-57406' into 'dev' 
Update Dockerfile - run emulator in UTF-8 mode

See merge request morningstar/Arcturus-Community!377
 2021-01-21 06:11:35 -05:00
TheOleg
a9b73d23d0 Update Dockerfile - run emulator in UTF-8 mode 2021-01-20 18:11:16 -05:00
Harmonic
55aa890268 Merge branch 'beta-branch' into 'dev' 
Add Docker support

See merge request morningstar/Arcturus-Community!368
 2021-01-19 06:12:51 -05:00
Thijmen
4cf11336cf Add Docker support 2021-01-19 06:12:51 -05:00
skeletor
d8fbc3d0c3 Merge branch 'add-userip-event' into 'dev' 
Added plugin event for getting user ip

See merge request morningstar/Arcturus-Community!373
 2021-01-17 18:45:34 -05:00