Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 01:15:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,046 Commits 7 Branches 22 Tags
e85d269518a2b7465bb5259b10d3fec0a61c57d5
Commit Graph

30 Commits

Author SHA1 Message Date
KingRainbow44
e85d269518 Run spotlessApply on previous commit 2023-04-23 23:12:01 -04:00
KingRainbow44
c9d6225194 Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests) 2023-04-23 22:51:08 -04:00
KingRainbow44
97ee71bcf4 Continue merging quests (pt. 1) 
Finished last at: `World.java`, line `player.setAvatarsAbilityForScene(newScene);`
 2023-04-09 13:25:16 -04:00
KingRainbow44
a3970f8e43 Format code 2023-04-02 21:34:07 -04:00
KingRainbow44
9fbb7fb3be Continue updating/refactoring classes 
Most code is matched from `Grasscutter-Quests`.
 2023-04-01 22:17:10 -04:00
KingRainbow44
fc05602128 Run Spotless on src/main 2023-03-31 22:30:45 -04:00
KingRainbow44
15e2f3ca34 Run IntelliJ IDEA code formatter 2023-03-31 17:19:26 -04:00
AnimeGitB
4d8caf5a8c Refactor Entity data 2022-11-05 23:18:33 +10:30
AnimeGitB
85f44ebdf3 Refactor out some EntrySets 2022-10-17 20:47:52 +10:30
hamusuke
bf8ee32382 fix: albedo elevator doesn't work (#1845) 
* Packet preparation

* elevator creation

* Make elevator work, scene time, entity removed event.

* Avoid referencing certain character name.
 2022-10-12 17:26:45 +10:30
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
AnimeGitB
fbf3dbbf77 Move vehicle fightprop hacks 2022-08-25 00:23:00 +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
KingRainbow44
cf2832ae72 Add EntityDamageEvent and implementations 2022-08-04 21:36:00 -04:00
KingRainbow44
886c2e2f43 Add EntityDeathEvent and implementations 2022-07-24 13:20:42 -04:00
KingRainbow44
956d4023c7 Merge branch 'development' into more-events 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
#	src/main/java/emu/grasscutter/game/entity/GameEntity.java
#	src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
 2022-07-22 17:52:58 -04:00
github-actions
ae2d1fe438 Fix whitespace [skip actions] 2022-07-21 00:22:26 -07:00
Melledy
5feabc8f9a Add Entity::OnInteract 2022-07-21 00:21:00 -07:00
KingRainbow44
80e75fd023 Implement PlayerMoveEvent 2022-07-15 12:43:49 -04:00
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
Melledy
30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Yazawazi
f139818224 [Anime Game Version update] Support 2.7 (#1072) 
* feature(2.7 version): support 2.7 version & upload new protos

1. Support GC in GI 2.7.0;
2. Upload new protos;
3. Fix some bugs cuz by new protos.

BREAKING CHANGE: all

* fix(database helper): fix player uid issues

* fix(ability embryo): uint32 to fixed32

* fix(proto): map mark

rename MAP_MARK_FROM_TYPE_NOE to MAP_MARK_FROM_TYPE_NONE

* fix(game version): change game version to 2.7.0

* perf(proto): remove unused protos

1. Remove unused protos;
2. Temporarily commented out some of the proto fields.

* fix(proto): uint32 to fixed32
 2022-05-30 20:06:25 -07:00
ShiroSaki
fef5c06a29 Fix the bug that can't kill command-generated monsters 
Command-generated monsters do not have spawnentry so we have to get data from getMonsterData
 2022-05-23 15:46:21 -07:00
Melledy
cd77fb90a3 Move gadget/monster creation events to after they are spawned in scene 2022-05-19 00:36:38 -07:00
Melledy
897f082b12 Implement AbilityManager 2022-05-08 06:05:50 -07:00
Melledy
7e377dff59 Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
d71b7abfc3 Implement script support needed for dungeons 
Only a few are supported right now
You will need certain script files in ./resources/Scripts
 2022-04-28 22:19:14 -07:00
Melledy
d1fc8c1faa Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00