Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 03:42:55 +00:00
Code Issues Projects Releases Wiki Activity
2,432 Commits 7 Branches 22 Tags 133 MiB
a2eba7b795
Commit Graph

2432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KingRainbow44
c21f95928b
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-13 00:42:59 -04:00
github-actions
98cb2f3a57 Format code [skip actions] 2023-05-13 04:41:58 +00:00
github-actions
954939744c Lint Code [skip actions] 2023-05-13 04:40:24 +00:00
KingRainbow44
be560e4754
Make descriptions of objects scrollable 2023-05-13 00:39:48 -04:00
KingRainbow44
dc4d081e08
Add support for 'plain text' mode 2023-05-13 00:39:32 -04:00
KingRainbow44
254c96c2c0
Add setting level to entity card 2023-05-13 00:04:15 -04:00
KingRainbow44
1c91a776ed
Implement entity spawning 2023-05-12 23:50:28 -04:00
KingRainbow44
10adc756d7
Fix going back returning a blank screen 2023-05-12 23:40:29 -04:00
KingRainbow44
5f9d5dd33f
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-12 23:25:38 -04:00
github-actions
ff124095bb Format code [skip actions] 2023-05-13 03:20:49 +00:00
KingRainbow44
b55cbbc507
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-12 23:20:26 -04:00
KingRainbow44
ebc6d9a06e
Remove 'Mechanicus' entities from the list of entities 2023-05-12 23:20:19 -04:00
KingRainbow44
6e1617e621
Make clickable buttons appear clickable 2023-05-12 23:20:00 -04:00
github-actions
98b834cdcd Lint Code [skip actions] 2023-05-13 03:18:45 +00:00
KingRainbow44
8c0045a8d7
Add color change to Join the Community! 2023-05-12 21:49:13 -04:00
KingRainbow44
8a2b860932
Fix listener ConcurrentModificationException issue 2023-05-12 20:19:30 -04:00
KingRainbow44
78ee3e8db1
Implement handbook teleporting 
also a few formatting changes and sort data by logical sense
 2023-05-12 20:18:53 -04:00
KingRainbow44
f8054a82a9
Add basic troubleshooting command 2023-05-12 19:38:46 -04:00
KingRainbow44
63488f826a
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-12 19:05:18 -04:00
KingRainbow44
e3accdad1b
Fix character names rendering incorrectly 2023-05-11 23:05:36 -04:00
github-actions
757dc9f261 Lint Code [skip actions] 2023-05-12 02:54:36 +00:00
KingRainbow44
564e4e496b
Check if a command should be copied or HTTP should be used 2023-05-11 22:52:09 -04:00
scooterboo
ef263cb326
unload scene when there are no players (#2147) 
* unload scene when there are no players

* Update src/main/java/emu/grasscutter/game/world/Scene.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-05-11 22:04:43 -04:00
github-actions
c425fb12c4 Format code [skip actions] 2023-05-12 02:03:50 +00:00
KingRainbow44
2017bc57a0
Merge remote-tracking branch 'origin/unstable' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/game/talk/TalkManager.java
 2023-05-11 22:01:28 -04:00
KingRainbow44
6516e4be1e
NPCs are not spawned server side; change logic to handle it 2023-05-11 21:17:08 -04:00
github-actions
3f4578c0ba Format code [skip actions] 2023-05-12 01:13:53 +00:00
KingRainbow44
db1cc788b4
Validate the NPC being talked to 2023-05-11 21:11:10 -04:00
KingRainbow44
9c0b9afae2
Make KcpTunnel public 2023-05-11 21:10:38 -04:00
KingRainbow44
0fb0b590e1
Move invalid ability action to trace 2023-05-11 21:09:49 -04:00
KingRainbow44
82b193945e
Add more information to the 'unknown condition handler' message 2023-05-11 21:08:33 -04:00
KingRainbow44
02a9c55b0f
Move 'invalid gather object' to trace 2023-05-11 21:08:14 -04:00
github-actions
6d3dc1ad70 Format code [skip actions] 2023-05-11 23:56:24 +00:00
KingRainbow44
780674e8de
Use Lombok's EqualsAndHashCode for comparing scene regions 2023-05-11 19:54:04 -04:00
github-actions
45f4a9233d Format code [skip actions] 2023-05-11 23:46:37 +00:00
KingRainbow44
e514095e8a
Fix region removal checking 2023-05-11 19:43:52 -04:00
KingRainbow44
5cd9d3a26d
Initialize the script loader in ResourceLoader#loadAll 2023-05-11 19:41:50 -04:00
KingRainbow44
4eaaa507ae
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-11 00:52:06 -04:00
github-actions
77e048b36b Format code [skip actions] 2023-05-11 04:52:00 +00:00
KingRainbow44
de5fd49d93
Re-add call to Player#updatePlayerGameTime 2023-05-11 00:51:57 -04:00
scooterboo
5e3acab116
Fully fix fairy clock (#2146) 
* Fix scene transition

* fully fix fairy clock
 2023-05-11 00:49:21 -04:00
github-actions
c78f9f2801 Format code [skip actions] 2023-05-11 04:27:51 +00:00
KingRainbow44
42e6e4c44d
Fix delay with server tasks 2023-05-11 00:25:09 -04:00
github-actions
f9906c4492 Format code [skip actions] 2023-05-11 02:23:43 +00:00
KingRainbow44
f51fd55cb5
Fix worktop options not appearing 2023-05-10 22:21:16 -04:00
KingRainbow44
e32aea4d0b
Remove more scene synchronized 2023-05-10 22:21:13 -04:00
KingRainbow44
1719c08eb0
Remove debug calls when teleporting 2023-05-10 22:21:10 -04:00
KingRainbow44
c0381d3795
Prevent updating player game time 2023-05-10 22:21:03 -04:00
Magix
d2203cc511
Merge pull request #2107 from Grasscutters/unstable-quests 
Merge `unstable-quests` into `unstable`
 2023-05-10 19:14:22 -07:00
KingRainbow44
07e038343d
Fix teleporting errors 2023-05-10 20:54:25 -04:00