Commit Graph

2490 Commits

Author SHA1 Message Date
Nazrin
50db3a20f5
Fix issues with regions (#2177)
Luckily, SceneRegion and TriggerExcelConfigData both have group numbers, so we can use those to differentiate regions!
2023-06-01 01:54:21 -04:00
KingRainbow44
19fa9deae7
Revert "Potentially fix issues with regions"
This reverts commit 84e3823695.
2023-05-31 23:46:12 -04:00
KingRainbow44
6950e14ec4
Download additional handbook data 2023-05-31 23:37:40 -04:00
KingRainbow44
eaff698b7a
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-31 23:35:57 -04:00
KingRainbow44
84e3823695
Potentially fix issues with regions 2023-05-31 23:34:43 -04:00
github-actions
53d8bdce40 Format code [skip actions] 2023-06-01 03:24:28 +00:00
KingRainbow44
083e9ba422
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-31 23:23:08 -04:00
KingRainbow44
28cb202d2b
Update GitHub actions 2023-05-31 23:22:54 -04:00
KingRainbow44
e0a2ccf49c
Re-add hack to fix 35303 2023-05-31 23:22:41 -04:00
github-actions
55a0719c12 Format code [skip actions] 2023-06-01 03:07:37 +00:00
KingRainbow44
fc79c72d48
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-31 23:06:16 -04:00
KingRainbow44
8e333b35dc
Optimize player kicking on server close 2023-05-31 23:06:05 -04:00
KingRainbow44
6d831a8859
fix the stupidest bug ive ever seen 2023-05-31 23:05:51 -04:00
github-actions
2e6bfbb749 Format code [skip actions] 2023-06-01 02:46:57 +00:00
KingRainbow44
8e9121c962
Fix ignored open states from being set 2023-05-31 22:44:42 -04:00
KingRainbow44
7458d4369e
Merge remote-tracking branch 'origin/unstable' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/game/ability/actions/ActionAvatarSkillStart.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
2023-05-31 22:41:00 -04:00
KingRainbow44
5430956744
Remove existing hack for 35303 2023-05-31 22:38:15 -04:00
StartForKiller
6448bb1b9b
Quick fix for questing, needs more investigation
This would make the questing work again
2023-05-31 22:30:49 -04:00
github-actions
9bd833c6e7 Format code [skip actions] 2023-06-01 02:30:23 +00:00
KingRainbow44
8840e2b574
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-31 22:29:09 -04:00
KingRainbow44
3e2607af4c
Add default open state ignore list 2023-05-31 22:28:25 -04:00
KingRainbow44
e7f30f4d43
Require plugins to specify an API version and match with the server 2023-05-31 22:20:01 -04:00
KingRainbow44
44a557a1dc
Load activity config on server startup 2023-05-31 22:11:58 -04:00
KingRainbow44
4113b42707
Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met 2023-05-31 22:11:45 -04:00
github-actions
b1b8abc627 Format code [skip actions] 2023-06-01 01:06:12 +00:00
KingRainbow44
73c23707b4
Fix new avatar weapons being null 2023-05-31 21:04:38 -04:00
github-actions
bcf54dd6ba Format code [skip actions] 2023-05-31 23:57:51 +00:00
KingRainbow44
77a70c7880
Merge remote-tracking branch 'origin/unstable' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/game/entity/EntityWeapon.java
2023-05-31 19:56:14 -04:00
KingRainbow44
8e11f53a2e
Implement handbook request limiting 2023-05-31 19:55:13 -04:00
KingRainbow44
a575a2b7f6
Fix unnecessary warning for first-time setup 2023-05-31 19:40:09 -04:00
KingRainbow44
28da66fff4
Remove deprecated API & Fix resource checking 2023-05-31 19:38:12 -04:00
KingRainbow44
7db45a0a12
Fix EntityWeapon 2023-05-31 19:29:26 -04:00
github-actions
36dee424ee Format code [skip actions] 2023-05-31 23:26:53 +00:00
StartForKiller
815ba3e3e3
Fix something and implement weapon entities 2023-05-31 19:25:26 -04:00
KingRainbow44
16ec2e3d40
Merge remote-tracking branch 'origin/unstable' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
#	src/main/java/emu/grasscutter/game/ability/AbilityManager.java
2023-05-31 19:18:13 -04:00
KingRainbow44
25b75b9691
more trace 2023-05-31 19:17:41 -04:00
github-actions
36a5661a21 Format code [skip actions] 2023-05-31 22:20:31 +00:00
KingRainbow44
1269a0430e
Move more logs to trace 2023-05-31 18:18:06 -04:00
github-actions
07205d9a3a Format code [skip actions] 2023-05-31 06:12:06 +00:00
KingRainbow44
f277f59725
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-31 02:10:35 -04:00
KingRainbow44
ff421c01f9
Use the headers provided by a context to get the IP address
should acknowledge #1975
2023-05-31 02:10:25 -04:00
github-actions
c719076f87 Format code [skip actions] 2023-05-31 05:36:13 +00:00
github-actions
3563d05685 Lint Code [skip actions] 2023-05-31 05:35:46 +00:00
KingRainbow44
6c97da3715
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-31 01:35:00 -04:00
KingRainbow44
d6d854cdd3
Fix handbook server details 2023-05-31 01:32:23 -04:00
github-actions
006490a540 Format code [skip actions] 2023-05-31 04:54:33 +00:00
KingRainbow44
959f0ad261
Merge remote-tracking branch 'origin/unstable' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/server/http/documentation/HandbookHandler.java
2023-05-31 00:51:39 -04:00
KingRainbow44
bef455d50c
Fix game-related data not saving 2023-05-30 18:47:05 -04:00
KingRainbow44
31a02050cf
Add system for setting handbook address and port 2023-05-30 17:38:13 -04:00
github-actions
bdbfb733a0 Format code [skip actions] 2023-05-30 20:55:44 +00:00