Commit Graph

2439 Commits

Author SHA1 Message Date
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
github-actions
a3c56dff7e Format code [skip actions] 2023-05-30 06:43:54 +00:00
Magix
f00c54cb95
Implement a proper ability system (#2166)
* Apply fix `21dec2fe`

* Apply fix `89d01d5f`

* Apply fix `d900f154`

this one was already implemented; updated to use call from previous commit

* Ability changing commit

TODO: change info to debug

* Remove use of deprecated methods/fields

* Temp commit v2
(Adding LoseHP and some fixes)

* Oopsie

* Probably fix monster battle

* Fix issue with reflecting into fields

* Fix some things

* Fix ability names for 3.6 resources

* Improve logging

---------

Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2023-05-30 02:40:02 -04:00
Nazrin
9b58105120
Fully fix fairy clock for real this time (#2167)
* Fully fix fairy clock For real this time

* Make it so relogging keeps the time lock state.

* Refactor out questLockTime

* Per Hartie, the client packet needs to be changed too

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

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

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java

* Remove all code not needed to get clock working

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-05-30 02:39:34 -04:00
github-actions
911993084e Format code [skip actions] 2023-05-30 05:53:50 +00:00
KingRainbow44
bcf15eb715
Merge remote-tracking branch 'origin/unstable' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/data/excels/MonsterSpecialNameData.java
2023-05-30 01:48:50 -04:00
KingRainbow44
ec1a6881ce
Fix merge import 2023-05-30 01:34:32 -04:00
github-actions
d5905d6ad8 Format code [skip actions] 2023-05-30 05:02:07 +00:00
KingRainbow44
2b13ea2a82
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-30 00:58:53 -04:00
KingRainbow44
d6b16f2111
Merge branch 'development' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/data/GameData.java
#	src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java
#	src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java
#	src/main/java/emu/grasscutter/game/entity/EntityMonster.java
2023-05-30 00:58:41 -04:00
Nazrin
7b3419b1d2
Implement some lua variables for less console spam (#2172)
* Implement some lua variables for less console spam

* Add GetHostQuestState

This fixes some chapter 3 stuff.
2023-05-30 00:57:45 -04:00
github-actions
43a09ace2b Format code [skip actions] 2023-05-29 07:50:43 +00:00
KingRainbow44
be9fc452fa
Fix protocol definitions 2023-05-29 03:45:55 -04:00
KingRainbow44
4fd617cebd
Remove outdated packet 2023-05-29 03:08:37 -04:00
KingRainbow44
3a9caf2cae
Add/update all/more protocol definitions 2023-05-29 01:48:55 -04:00
KingRainbow44
3a8a13c5be
Add/update all/more protocol definitions 2023-05-29 00:44:17 -04:00
Moistcrafter
7f4fb20773
Fix boss names in boss bar (#2169)
* Boss bar fix

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

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

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

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

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-05-27 16:23:52 -04:00
KingRainbow44
37215254c7
Rename fields (might be wrong) 2023-05-27 00:54:54 -04:00
KingRainbow44
980905817b
Run spotlessApply 2023-05-27 00:40:07 -04:00
KingRainbow44
d0dde9bc2f
Update to REL3.7 2023-05-27 00:34:42 -04:00
Magix
71f6198361
Upgrade to REL3.7 (#2164)
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
2023-05-27 00:29:02 -04:00
KingRainbow44
d1f774892c
Fix event calling & canceling 2023-05-26 23:26:49 -04:00
KingRainbow44
9d4cb733e2
Fix GitHub actions 2023-05-26 14:57:20 -04:00
KingRainbow44
1fef3f8a05
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-26 14:52:39 -04:00
KingRainbow44
d35777d969
Implement fetching a player across servers & Add a chainable JsonObject
useful for plugins! might be used in grasscutter eventually
2023-05-26 14:52:22 -04:00
KingRainbow44
273dadd4ba
Fix target destination for the Gradle-built handbook 2023-05-26 14:25:29 -04:00
github-actions
5f6766305d Lint Code [skip actions] 2023-05-26 18:21:59 +00:00
KingRainbow44
b0714f209c
Fix the 'finer details' with the handbook UI 2023-05-26 13:49:10 -04:00
KingRainbow44
77796aa8b6
Build the handbook with Gradle 2023-05-26 13:48:52 -04:00
KingRainbow44
2107866787
Add _some_ scaling to the home buttons and its text 2023-05-26 12:03:25 -04:00
KingRainbow44
60d4211887
Change scrollbar to a vibrant color 2023-05-26 12:02:56 -04:00
KingRainbow44
9f6f8bef79
Implement hiding widgets 2023-05-26 12:02:43 -04:00
KingRainbow44
be588de92f
Change HTML spacing to 2 spaces 2023-05-26 12:02:28 -04:00
KingRainbow44
cf4389cd1d
Fix the background color leaking from the character widget 2023-05-26 11:22:54 -04:00
KingRainbow44
77fa859caa
Fix protocol definitions
thank you Nazrin! (+ hiro for raw definitions)
2023-05-26 11:10:58 -04:00
Nazrin
883dcef054
instantiate personalLineList (#2165) 2023-05-25 10:19:21 -04:00
github-actions
a4ef130923 Format code [skip actions] 2023-05-23 23:38:49 +00:00
KingRainbow44
c0ad1bf75b
Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-23 19:35:51 -04:00
KingRainbow44
f1baaf5869
Add dumper for world areas 2023-05-23 19:35:05 -04:00