Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 15:22:16 +00:00
Code Issues Projects Releases Wiki Activity
2,477 Commits 7 Branches 22 Tags 133 MiB
2e6bfbb749
Commit Graph

2477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
github-actions
9f3d859817 Lint Code [skip actions] 2023-05-30 20:55:09 +00:00
KingRainbow44
25b126f468
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-30 16:54:13 -04:00
KingRainbow44
a35ce5fecb
Add system for setting handbook address and port 2023-05-30 16:53:57 -04:00
github-actions
c69a889e66 Format code [skip actions] 2023-05-30 19:40:39 +00:00
KingRainbow44
36a35c11aa
Use thread executors to speed up the database loading process 2023-05-30 15:38:26 -04:00
KingRainbow44
2009a90e66
Change the way HTML is served after authentication 2023-05-30 14:29:55 -04:00
KingRainbow44
a3bbfd4c5d
Add properties to AbilityModifier 2023-05-30 13:56:21 -04:00
KingRainbow44
c6869aaaa2
HACK: Return the avatar which holds the weapon when the weapon is referred to by ID 2023-05-30 13:56:06 -04:00
KingRainbow44
a2eba7b795
Implement completely useless global value copying 2023-05-30 13:55:30 -04:00
KingRainbow44
999d3c739f
Default debug to false; enable with -debug 2023-05-30 13:28:43 -04:00
KingRainbow44
385b6fbd7c
Remove protocol definitions from Spotless 2023-05-30 13:19:24 -04:00
KingRainbow44
01dfebf681
Format some code 2023-05-30 13:07:49 -04:00
KingRainbow44
c780fb7934
Add system for sending messages between servers 2023-05-30 13:06:50 -04:00