2343 Commits

Author SHA1 Message Date
StartForKiller
27da992848
Optimized entity adding and group checking 2023-04-16 15:34:35 +02:00
hartie95
7539eb45a3 Merge branch 'quests' of github.com:Anime-Game-Servers/Grasscutter-Quests into activity_dev
# Conflicts:
#	src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java
#	src/main/java/emu/grasscutter/game/entity/EntityGadget.java
#	src/main/java/emu/grasscutter/game/entity/EntityMonster.java
#	src/main/java/emu/grasscutter/game/world/Scene.java
#	src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
2023-04-12 23:58:24 +02:00
StartForKiller
22a46b576f
Fix loading 2023-04-07 15:09:38 +02:00
StartForKiller
d9d819b587
Move grid to another custom folder 2023-04-07 15:08:00 +02:00
StartForKiller
72b56b45de
Fix grid cache 2023-04-07 13:58:29 +02:00
StartForKiller
6e6198d172
Fixed some smells again 2023-04-07 01:32:16 +02:00
StartForKiller
ae86400890
Fixed some critical and major code smells 2023-04-07 01:27:22 +02:00
StartForKiller
fb97f7a7c0
Maybe fix all the serializable smells 2023-04-07 01:11:54 +02:00
StartForKiller
f67942b547
Fixed some issues 2023-04-07 01:06:39 +02:00
StartForKiller
769abcfb98
Make grids cached 2023-04-06 17:41:16 +02:00
Alexander Hartmann
a78f2635c6
Merge pull request #61 from Anime-Game-Servers/conditions
Extended some commands a bit, changed questCondition handling and some smaller bugfixes
2023-04-01 23:48:19 +02:00
hartie95
15f1a4ec9c update group command usage and add Sound command to play sounds 2023-03-17 00:16:23 +01:00
StartForKiller
88bb5ee82c
Update handling technique 2023-03-14 03:09:25 +01:00
StartForKiller
f99789f13a
Temp commit to store all he changes to test 2023-03-12 20:16:57 +01:00
hartie95
82e2b6bf3f Extended some commands a bit, changed questCondition handling and some smaller bugfixes 2023-02-26 20:09:15 +01:00
Alexander Hartmann
e48d6f7986
Merge pull request #60 from Anime-Game-Servers/activity
[Activity] fix music game activity and some activity condition changes
2023-02-26 19:50:16 +01:00
hartie95
8a2f17f9c5 [Activity] fix music game activity and some activity condition changes
* renamed changed protos for user generated content (music game
* added ACtivityCondGroups
* added open and close time to ACtivityConfigItem
* actually add meet conditions to the acitivty info
* fix wrong quest state enum being used in activityCondition for questFinished
2023-02-26 19:46:36 +01:00
Alexander Hartmann
c3ffa339d0
Merge pull request #59 from Anime-Game-Servers/some_fixes
Some more fixes and additions
2023-02-11 11:25:50 +01:00
hartie95
4830c1ed69 [Lua] Implemented PlayCutScene method and added a placeholder for PlayCutSceneWithParam
* also added the cutscene packages
2023-02-08 20:28:04 +01:00
hartie95
3006e16e9b [Challenges] Added support for some more challenges and fixed others (thx @NotThorny for finding the parameter bug for the guard challenge) 2023-02-08 20:19:15 +01:00
Alexander Hartmann
c23a721ae3
Merge pull request #58 from Anime-Game-Servers/some_fixes
Some smaller fixes and refactorings
2023-02-08 17:13:06 +01:00
hartie95
7b82c07d5d [refactoring] handle code comments 2023-02-08 08:37:09 +01:00
hartie95
5347393986 [Lua] always cancel group timers after usage 2023-02-07 02:53:17 +01:00
hartie95
39f0ef75b3 [Fix] fix monsterTideService, for situations, where lua also spawns additional monsters 2023-02-07 02:52:24 +01:00
hartie95
e96ae3e584 [LUA] fixed getSceneUidList and added some more placeholder functions to ScriptLib 2023-02-07 02:51:23 +01:00
hartie95
5b64ff92d4 [Fix,LUA] most events are now limited to only their source group and fixes some group variable null handling 2023-02-07 02:49:21 +01:00
hartie95
63da8bf420 [Fix] Catch and log exceptions during ServerTask 2023-02-07 02:44:40 +01:00
hartie95
9f6568c791 [Resources] some binout EntityConfig loading refactoring and added some more lua and binout fields 2023-02-07 02:44:15 +01:00
Alexander Hartmann
ec93a0455b
Merge pull request #51 from mjolsic/trial-avatar-activity
Added functionality for Trial Avatar Activity
2023-02-07 00:36:41 +01:00
hartie95
cd4c936050 [refactoring and fixes] Some more refactoring to reduce redundant code and changes to fix leabing dungeons sometimes being stuck
* Also move the Dungeon Avatar Trial team handling to the DungeonManager
2023-02-07 00:33:22 +01:00
hartie95
0647e7f302 Merge branch 'quests' of github.com:Hartie95/Grasscutter into trial-avatar-activity 2023-02-06 03:54:41 +01:00
Alexander Hartmann
0f1a6d298f
Merge pull request #57 from StartForKiller/activity_dev
Fix variable refreshing and add GetGatherConfigIdList
2023-02-05 04:30:52 +01:00
StartForKiller
79fad67f71
Revert info to debug 2023-02-05 04:18:49 +01:00
StartForKiller
91624df059
Fix variable refreshing and add GetGatherConfigIdList 2023-02-05 02:35:44 +01:00
Alexander Hartmann
61d996a3d0
Merge pull request #56 from StartForKiller/activity_dev
Add group loading based on pos to mimic the original behaviour
2023-01-26 10:38:25 +01:00
StartForKiller
57752b5223
Revert back to debug 2023-01-26 01:52:27 +01:00
StartForKiller
41436a54be
Add group loading based on pos to mimic the original behaviour 2023-01-26 01:43:41 +01:00
hartie95
22f2ad2526 [Fix] some small unrealted fixes 2023-01-25 23:40:33 +01:00
hartie95
1e3767b5f6 [Cleanup] Some code cleaups before merge 2023-01-25 21:10:44 +01:00
hartie95
ca10b6e6b5 Merge branch 'quests' of github.com:Hartie95/Grasscutter into trial-avatar-activity 2023-01-25 20:29:34 +01:00
Alexander Hartmann
1615021144
Merge pull request #55 from StartForKiller/group_loading
Implemented Group loading and more fixes and quest conditions
2023-01-24 23:56:50 +01:00
hartie95
5fef2fa491 [cleanup] small code cleanup before merge 2023-01-24 23:53:09 +01:00
StartForKiller
5dfd2d31f5
Add debug and error messages and fix a loading bug 2023-01-24 20:51:54 +01:00
StartForKiller
a1d88f79f7
Half string operations 2023-01-24 20:13:57 +01:00
StartForKiller
524ab891e4
Reenable loggin and revert printLog to info 2023-01-24 19:52:08 +01:00
StartForKiller
354b009bdd
Fix lint 2023-01-24 19:49:28 +01:00
StartForKiller
c8fa90fe4b
Add stub keys for other languages 2023-01-24 19:45:19 +01:00
StartForKiller
b83dcde0bd
Added a simple commmand:
To be able to manually refresh group suites
2023-01-23 22:00:05 +01:00
StartForKiller
53fe7f959d
Not sure if this fixes something:
Changed some requested changes
2023-01-23 21:41:43 +01:00
StartForKiller
5d4a22cc33
Oopsie 2023-01-23 00:38:38 +01:00