Alexander Hartmann
08fdcf6ed4
fixed gadget hp properties and invincibility handling ( #1773 )
...
* fixed gadget hp properties and invincibility handling
* Allow killing of hp locked entities, if the damage is higher then the hp
Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-15 11:56:20 +09:30
pfyy
96caa7db17
fix serenitea pot ( #1726 )
...
* partial fix of serenitea pot
* fix serenitea pot
2022-08-31 02:13:48 -07:00
omg-xtao
5db73d2849
Fix QuestEncryptionKeys Path ( #1696 )
...
* Fix QuestEncryptionKeys Path
* Load resources QuestEncryptionKeys
2022-08-23 23:29:52 +09:30
github-actions
c517b8a2c9
Fix whitespace [skip actions]
2022-08-21 11:33:54 +00:00
赵怡然
abd1e7569e
Blossom Implement ( #1606 )
...
* Blossom!
* rename
* delete SpawnBlossomEntry.java
* use MAP
* use List
* use LIST
* use List
* useCondensedResin
* useCondensedResin
* fix build
* enhance
* fix bug
* REMOVE BOSS
* fix condensed resin
* fix condensed resin
* use POSITIVE_INFINITY
* use RewardPreviewData
* fix build
* fix resources
* add BLOSSOM_MONSTER_FIGHTING_VOLUME
* edit monster score
* edit monster score
* fix bug
* fix bug
* improve logic
* fix monsters level
* Deleted comment blocks
* nitpick
* Fix compilation problems
* nitpick
* Refactor + nitpick
* Clean up overall diff to develop
* Clean up other usage of condensed resin
* Clean up overall diff to develop
* Lombokify Scene.java
* Missed an odd getter name
* Unhardcode reward previews
* EDIT NAME
* remove leyline 1
* remove leyline 2
* Update BlossomManager.java
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-08-20 23:19:59 -07:00
AnimeGitB
46223c8976
Refactor Json helper functions to JsonUtils
2022-08-11 17:59:08 +09:30
AnimeGitB
c6323e9759
Funnel all gson calls into helper functions
...
Add deprecated getGsonFactory for plugin compat until 3.0
2022-08-11 17:59:08 +09:30
GanyusLeftHorn
04f0fae898
Handle Unlocking of Waypoints and Statues ( #1608 )
...
Original commits:
* Add necessary protos for scene point/area unlocking.
* Rename PlayerOpenStateManager to PlayerProgressManager and move data to Player.
* Handle unlocking of waypoints.
* Add primo rewards for waypoint unlock.
* Statue unlocking.
* Add statue quest on player login.
* I forgor to add an unlock command.
* Give EXP as reward, fire quest trigger, make EXP UI show up.
2022-08-10 19:33:47 +09:30
AnimeGitB
c624479439
Fix an edge case that breaks embryos if resources are loaded early
2022-08-10 17:00:43 +09:30
Magix
3121e3e67d
Introduce a new arguments parser ( #1629 )
...
Original commits:
* Clean-up
* Introduce a new application arguments parser & handler
* Clean-up and deprecate `Tools#getLanguageOption`
* Fix `-debug` and `-debugall` parameters
* found this while debugging, ...why
* Remove deprecated parameters
* Invoke startup argument parser before handbook generation
* Move command map instantiation to `Grasscutter `(prevent making 3 instances on startup)
* Ensure \n at EOF
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-08-10 11:54:43 +09:30
AnimeGitB
0994417261
Cache used strings from TextMaps
2022-08-09 20:59:11 +09:30
AnimeGitB
0d9116225c
Suppress stacktrace on missing questkeys file
2022-07-27 21:10:32 +09:30
Magix
6ba4846e58
Change loading quest keys from info
to debug
.
...
Please for the love of god use `debug` for information not important to the enduser when starting the server.
2022-07-26 14:49:45 -04:00
Melledy
7600f706b5
Move QuestEncryptionKeys
to resources/
2022-07-26 08:22:27 -07:00
akatatsu27
92aeb79ac3
Merge branch 'development' into questing
2022-07-26 14:17:42 +03:00
hartie95
ffeff92dd6
2.7+ prerendered cutscene support
2022-07-26 16:55:53 +09:30
akatatsu27
8050f0cc07
and misc bug fixes
2022-07-23 12:28:49 +03:00
github-actions
ae2d1fe438
Fix whitespace [skip actions]
2022-07-21 00:22:26 -07:00
Melledy
408fa90728
Move config java files to their own package
2022-07-21 00:21:00 -07:00
Melledy
55541fa1da
Add a loadReader
helper function to DataLoader
...
Also minor name changing on a few DataLoader methods
2022-07-21 00:21:00 -07:00
zhaodice
6c49fab137
Block loader (sort and merge gadgets into different blocks) ( #1517 )
...
Original commits:
* block loader
* fix
* fix
* fix foolish bug
* add scales
* rename
* set to 600
* nitpick
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-07-18 19:43:55 +09:30
zhaodice
2462da2ede
Big World Resources Collection Implement ( #1368 )
...
* init
* init
* init
* revoke
* fix error
* mining support
* mining support
* Roks endurance support
* Roks endurance support
* Timed refresh
* upgrade resource data
* Timed refresh support
* remove null gadget
* Coordination
* full synchronized
* oh no, my math teacher will hit me!
* synchronized onInteract
* remove break;
* supply re-spawn time , thanks to @wl23333
* Clean up and integrate collection spawns into SpawnDataEntries
Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
2022-06-29 04:53:50 -07:00
KingRainbow44
71b118dd9f
Add a start and finish message to resource loading
2022-06-26 12:31:09 -04:00
KingRainbow44
2dcdb839c4
Move resource loading messages to the debug
level
2022-06-26 12:26:39 -04:00
Melledy
30c7bb9443
Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development
2022-06-17 23:35:45 -07:00
Akka
2d461641f1
a little fix
2022-06-17 18:15:49 -07:00
Akka
e16633e34b
Implement the Home System (Serenitea Pot)
2022-06-17 18:15:49 -07:00
Melledy
ac49114c45
Add embryos for all skill depots for the main characters
2022-06-16 07:54:53 -07:00
Melledy
7cfa2b6c5b
Fixed constellation issues from new binout
2022-05-30 20:06:25 -07:00
Melledy
a23b29b65a
Rename excel classes
2022-05-30 20:06:25 -07:00
Akka
5a3e9bc34e
Fixed excessive memory usage of Spatial Index
2022-05-25 00:42:52 -07:00
Akka
d95708ec03
Support spawn NPC
2022-05-24 21:43:51 -07:00
4Benj_
f473e44611
"Autogenerate" data files with data fallbacks and moved keys folder into jar resources ( #927 )
...
* Autogenerate keys and data files
* Update gacha html files
Accidentally pushed with old html files
* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation
Removed unused code from old GC as well.
* Moved somethings and better errors
* Fixed resources from loading twice
* Data files fallback
2022-05-17 03:00:52 -07:00
Melledy
631a53030c
Switch to using quest excels
2022-05-13 03:12:25 -07:00
Melledy
dfd8fcb250
Fix build error from merge
2022-05-11 04:01:38 -07:00
Melledy
51844b6535
Merge branch 'development' into dev-quests
2022-05-11 03:56:59 -07:00
Melledy
e9d7d5d5f2
Implement quests
2022-05-11 03:56:40 -07:00
KingRainbow44
11161227ab
Convert to the far superior config system
2022-05-11 00:30:07 -04:00
Melledy
897f082b12
Implement AbilityManager
2022-05-08 06:05:50 -07:00
cfuncode
0152b146c5
Improved fault tolerance for json file deserialization ( #595 )
...
* 修复一个Gson发序列化json文件的空值问题
* Improved fault tolerance for json file deserialization
2022-05-06 13:39:37 -07:00
Melledy
3169e87c60
Fix constellations that give an extra charge to skills
...
Fix #228
2022-04-30 19:34:50 -07:00
Melledy
66c2743d6e
Update how scene/dungeon map points are handled
2022-04-30 01:20:44 -07:00
Melledy
53cc1822f6
Implement dungeon entry
2022-04-28 08:20:37 -07:00
Melledy
1c36f0785b
Renamed all references to a certain game
2022-04-26 21:27:35 -07:00
WetABQ
addfb5eb5d
[BREAKING CHANGE] proto auto compiled by gradle ( #226 )
...
* [BREAK] proto auto compiled by gradle
* [BREAK] move proto to submodule
* update gitmodules
* [BREAK] move proto to submodule
* move proto to submodule
* fix merge conflict
* fix github action after merging
* fix merge conflicts and del submodule
* upload the proto
2022-04-26 14:44:30 -07:00
Melledy
711e6eabd0
Natural spawn test
...
(without luas)
2022-04-25 14:28:44 -07:00
alt3ri
452e89b4db
Fix typo
...
"When you create a new account via auto register or console server then during scene select a character and write a name on it press it it will get stuck and make the server disconnected. Some can get through and some can't passed it, so currently I'm still on the stable version . even how many times have I deleted the datebase and tried it on some linux and directly on windows too :/ btw 0e7976f906/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131)
in scene folder there is a typo name "BinOutPut" it should be "BinOutput" so scene file can't be found." - [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760 )
Thanks [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760 )
2022-04-22 00:54:06 +07:00
Yazawazi
f6df468e47
folder check
2022-04-21 10:37:24 +08:00
Yazawazi
6f43c0765f
teleports
2022-04-21 04:45:38 +08:00
ayy lmao
ac6ae1178d
Fix folder seperators
2022-04-19 19:21:14 +03:00