Grasscutter

mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 09:47:28 +00:00

Author	SHA1	Message	Date
Melledy	6d59159b8b	Cleanup package names	2022-06-16 07:57:57 -07:00
Melledy	ac49114c45	Add embryos for all skill depots for the main characters	2022-06-16 07:54:53 -07:00
Tesutarin	cc4094549e	Gacha Records: Support multiple languages	2022-06-15 23:44:57 -07:00
Paimon2022	37230d1274	Fix issue: skill recovery value of a character should benefit from his/her own property, not the character he/she treats.	2022-06-15 23:10:17 -07:00
ImmuState	50c8f43d5b	Fix giveall and givechar giving broken characters.	2022-06-15 23:10:04 -07:00
zhaodice	c056ad5cd1	[Ready]Replace deprecated KCP library (#1237 ) * Replace deprecated KCP library support get srtt Waiting server to establish logicThread Print Bad Package Information Avoid orphan data improve conv id security * Improve connection subsequence	2022-06-15 04:13:35 -07:00
yuyuko	8a3d6e3db4	Fix multi server function	2022-06-14 18:28:35 -07:00
ImmuState	ebab89d433	Don't show internal server error on gacha with full inventory.	2022-06-14 18:09:02 -07:00
ImmuState	e0d386105a	Only send full clear notification on burst cast.	2022-06-14 18:08:55 -07:00
ImmuState	0db1472195	Adapt protocol for clearing energy.	2022-06-14 18:08:55 -07:00
xlpmyxhdr	521deab4f2	Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at once Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at one time, so that one Ancient Rock Dragon Lizard was generated at a time, and the attributes were different	2022-06-14 18:08:43 -07:00
loulou310	57918d0344	Added fr-FR.json	2022-06-14 21:44:42 +02:00
saucebing	458aadc2ff	fix healing ability of some characters to some extent (#1201 ) * fix healing ability of some characters to some extent * using SerialName to replace replaceAll in avatar ability files reading * add class HealAbilityManager * move codes in onAbilityInvoke of class AbilityManager to class HealAbilityManager	2022-06-14 04:36:53 -07:00
Tesutarin	7c9db30bca	KickCommand: Remove unnecessary subpermission	2022-06-14 01:14:33 -07:00
ImmuState	6e955c9fdb	Implement Resin (#1257 ) * Basic resin usage/refresh. * Honor resin config, move some logic to logon. * Add resin usage to DungeonChallenge * Make fragile and transient resin usable. * Get resin cost from dungeon excel. * Add ability to unlock combine diagrams. * Refactor CombineManager to use Inventory.payItems, enabling crafting of condensed resin. * Refactor ForgingManager to use Inventory.payItems, to prepare for eventually forging Mystic Enhancement Ores using resin. * Remove comment * Check resin usage in addResin	2022-06-14 01:14:15 -07:00
Luke Hubmayer-Werner	2fd2fab54c	Partial revert of #1245	2022-06-12 21:49:47 -07:00
Tesutarin	c5b45358e7	Command: Add permissionTargeted or targetRequirement	2022-06-12 17:55:19 -07:00
ImmuState	c4ce6caeba	Add alternate name for tranSceneId, and fix inconsistent indentation.	2022-06-11 19:42:11 -07:00
zhaodice	db039cc35b	make sure towerData is not null (#1240 ) * make sure towerData is not null * Update Player.java * add notice	2022-06-11 04:34:25 -07:00
Tesutarin	eb170bcb15	Language: Update translation	2022-06-10 21:20:50 -07:00
zhaodice	052e70e488	Fix inconformity of Player Object at TowerManager (#1226 ) * Fix inconformity of Player Object at TowerManager Fix inconformity of Player Object at TowerManager class from GameSession * fix with a reasonable resolution * Make sure towerManager'player is online player * Make sure towerManager'player is online player * Obsolete storage * Fix build * fix build * fix build * add @Entity * set record map * replace tab with space * add Entity to TowerData * make infomater more accurate * move player register to onLogin	2022-06-09 13:38:53 -07:00
ImmuState	a8d972c0c0	Make UI for blueprint unlocking behave.	2022-06-08 05:43:38 -07:00
ImmuState	4309e96253	Make calculation for partial claims better.	2022-06-08 05:43:38 -07:00
ImmuState	443cc8fc4b	Make the UI behave.	2022-06-08 05:43:38 -07:00
ImmuState	9a313e50eb	Send periodic notifications to the client for ongoing forges.	2022-06-08 05:43:38 -07:00
ImmuState	4b77e84e81	Add ForgeQueueDataNotify, unwhack UI.	2022-06-08 05:43:38 -07:00
ImmuState	0e1c8dc526	Cancel forging and refund items.	2022-06-08 05:43:38 -07:00
ImmuState	0cc4bad18c	Obtain forging results (UI is broken though).	2022-06-08 05:43:38 -07:00
ImmuState	28a8475cea	Consume material.	2022-06-08 05:43:38 -07:00
ImmuState	a668bd6ec1	Check materials and mora	2022-06-08 05:43:38 -07:00
ImmuState	5db5c90a8b	Start a new forge (no checking for now).	2022-06-08 05:43:38 -07:00
ImmuState	e5498e373e	Add handling for ForgeExcelConfigData.	2022-06-08 05:43:38 -07:00
ImmuState	9d6bc2a910	Change active forges in player to list.	2022-06-08 05:43:38 -07:00
ImmuState	8db0500e9d	Add missing forging protos, add data for ongoing forges to player, handler for ForgeStartReq.	2022-06-08 05:43:38 -07:00
ImmuState	3fc63c2c4b	Move forging stuff to ForgingManager, make client respond to ForgeGetQueueDataReq and actually display forging queues.	2022-06-08 05:43:38 -07:00
zhaodice	ecf7a81ad1	Fix unable to save game data occasionally (#1194 ) * Fix unable to save game data occasionally * No self-kicking * Game data synchronization * finally * prevent duplicated saving * reverse changing * keep the previous code * Update GameServerInitializer.java * Update GameSession.java * remove sanity check because of try block * a session needs can be created without a pipeline.	2022-06-05 04:23:19 -07:00
liizfq	934fb5873a	add new command (unlimitenergy):toggle energyusage for each player (#1186 ) * add new command (unlimitenergy):toggle energyusage for each player while energyusage is ture in config.json * Solve the problem of layout and naming errors * make currentActiveTeam's Avatar full-energy while turn on the ule. * Resolve language document errors * add config_error message while player try to execute UnlimitEnergyCommand in GAME_OPTIONS.energyUsage == false	2022-06-04 19:14:52 -07:00
AZ	fa2ab59887	List game & server version when starting server (#1181 ) * When the server starts, it now outputs the game and server version. Too dumb to not hardcode it - sorry! * ... * sorry i dropped my spaghetti, I'll help clean that * Doing simple stuff: now without hardcoding! * Restored Git hash functionality * Fixed other languages and made the output more useful. * Forgot this file lol	2022-06-04 02:41:18 -07:00
Melledy	910a5749f0	Refactor and optimize DatabaseHelper::checkIfPlayerExists	2022-06-03 19:32:10 -07:00
AZthemute	06546707e1	Fixed sendmessage command output. Also clarified coop command in help command.	2022-06-03 19:11:47 -07:00
Tesutarin	66b642ef06	Language: Update translation	2022-06-03 10:16:45 -07:00
leonier-test	09580ef448	Ruin Guards/Hunters/Graders should drop Chaos Device series instead of Chaos Gear series.	2022-06-03 06:12:25 -07:00
leonier-test	0c5ff4377e	Fix default Shop.json (for Mondstadt General Goods)	2022-06-03 06:12:04 -07:00
Paimon2022	a19e7c6db6	Spawn default monsters with different levels according to data/Spawns.json when worldLevelOverride is not zero. For example, in world with worldlevel 8, base monster level is 90 according to resources/ExcelBinOutput/WorldLevelExcelConfigData.json, monster level bias in data/Spawns.json belongs to [1,32], so the monster level would belong to [69, 100].	2022-06-03 03:20:07 -07:00
Paimon2022	4119f8b787	Add coordinate support for spawn command (monster only) Now the spawn command is: spawn <entityID> [amount] [level(monster only)] <x> <y> <z>(monster only, optional) The coordinate is optional	2022-06-03 03:19:59 -07:00
zhaodice	73a1c5762a	skipping right characters panel for Android	2022-06-03 02:42:17 -07:00
zhaodice	bbc398d374	Incompletely implement about QuickUseWidgetReq WARNING: with the consuming of material widget ( Example: bomb ), this is just a implement designed to the decreasing of count ### Known Bug: No effects after using item but decrease. ### If you know which Packet could make the effects, feel free to contribute!	2022-06-03 00:52:32 -07:00
ImmuState	e140284d37	Persist unlocked blueprints to the database.	2022-06-03 00:52:22 -07:00
ImmuState	f243c10157	Unlock forging blueprints.	2022-06-03 00:52:22 -07:00
zhaodice	056ba678a8	Fix Irreversible equipping Fix that can not detach equipment after attached	2022-06-03 00:52:10 -07:00
zhaodice	01481fd524	Arresting small creature support (#1150 ) * Arresting small creature support * add InsectCaptureManager * use EnvAnimalGatherExcelConfigData.json * Update InsectCaptureManager.java	2022-06-03 00:51:51 -07:00
Magix	27b7ce7cc1	Update NoStaminaCommand.java	2022-06-02 19:02:26 -04:00
tamilpp25	71b53e0be4	Adding toggle feature to "nostamina" command similar to "godmode" command (#1152 ) * stamina command enhancement * added "ns" as command aliases for NoStaminaCommand	2022-06-02 03:33:46 -07:00
ImmuState	e1688c866f	Make sure no player already has the reserved UID when creating and account.	2022-06-01 16:14:18 -07:00
zhaodice	7f3e8984ac	Fix receiving reward repeatedly (#1140 ) * Fix receiving reward repeatedly fix #1105 （just fix "无限发送领取请求"） * Fix dead code and prevent getting item repeatedly * fix again	2022-06-01 16:13:48 -07:00
Tesutarin	d10fe0cdd3	WeatherCommand: Make it clear	2022-06-01 06:27:07 -07:00
Tesutarin	4c42e00a8b	Language: Update translation	2022-05-31 22:06:47 -07:00
line-bear	28b505e187	Fix stuck when talking to npc seller (#1128 ) * Fix zero length array check method * Import grasscutter logger	2022-05-31 02:42:16 -07:00
tester233	6f5a290a3a	Update translation	2022-05-31 02:41:43 -07:00
tester233	ba6a9fc798	Usage: Unified specification	2022-05-31 02:41:43 -07:00
lhhxxxxx	0e6ac4a827	Update default config to match the one in Koko-boya/Grasscutter_Resources	2022-05-31 02:07:18 -07:00
Melledy	aaf7777020	Fix players not setting their nickname properly after the opening cutscene	2022-05-31 02:06:40 -07:00
Elapse	f5347cf98b	fix banner title display	2022-05-30 21:22:42 -07:00
Elapse	550776a502	Update Banners.json	2022-05-30 20:15:11 -07:00
Melledy	184eec82b3	Limit spawn amount if too many entities are in the world Can be controlled in the config with `sceneEntityLimit`	2022-05-30 20:06:25 -07:00
Anush	18721758cc	Fix Aqua Simulacra & Fading Twilight not given by GiveAll command	2022-05-30 20:06:25 -07:00
ImmuState	2e167d2d78	Add energy generation probabilities to WeaponType.	2022-05-30 20:06:25 -07:00
line-bear	52a3f95729	Fix starglitter/stardust exchange error (#1108 )	2022-05-30 20:06:25 -07:00
Melledy	e9a7032c4d	Fix weapon curve excels and camel case relic affix ecels	2022-05-30 20:06:25 -07:00
Melledy	ef6e16aaf5	Refactor WeaponType and MonsterType into enums	2022-05-30 20:06:25 -07:00
ImmuState	b9ca4a5dbd	Make NA/CA energy not scale with ER.	2022-05-30 20:06:25 -07:00
ImmuState	635e342a3d	Make sure the hit target is actually a monster.	2022-05-30 20:06:25 -07:00
ImmuState	febdb99855	Add a rough implementation for NA/CA energy generation.	2022-05-30 20:06:25 -07:00
line-bear	3773f4df68	Add skill particle generation info for Yelan and Kuki Shinobu (#1097 ) * Fix enter tower dungeons * Add skill particle generation info for Yelan and Kuki Shinobu * Update SkillParticleGeneration.json	2022-05-30 20:06:25 -07:00
linebear	18df521347	Fix enter tower dungeons	2022-05-30 20:06:25 -07:00
Melledy	0ba13ef7ff	Fix map mark issues from updating from 2.6 Close #1086	2022-05-30 20:06:25 -07:00
Melledy	7cfa2b6c5b	Fixed constellation issues from new binout	2022-05-30 20:06:25 -07:00
Melledy	3ee13b3b1e	Fixed dungeon entries not working with new binout	2022-05-30 20:06:25 -07:00
Melledy	153280ea08	Fix quest data parser	2022-05-30 20:06:25 -07:00
Melledy	a23b29b65a	Rename excel classes	2022-05-30 20:06:25 -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
zhaodice	a95002fd40	Hunting and deforestation support. (#1083 ) * add drops for animals wild pig,fishes,foxes,birds * append fox * Deforestation Support implement drop woods when attacking tree * Deforestation support (remove prints) implement drop woods when attacking tree * Deforestation support (remove prints) implement drop woods when attacking tree * add AutoRecycleHashMap Map's KEY is automatic expire if key long time no use (query or modify from HashMap) * use AutoRecycleHashMap in case of memory leak * fix bug * remove prints * static AutoRecycleHashMap * fix problems * Delete AutoRecycleHashMap.java * remove log * fix build * improve * remove unnecessary information Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com> Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>	2022-05-29 06:16:49 -07:00
tester233	830ac793fe	Update translation	2022-05-28 21:34:38 -07:00
tester233	2a3d9fd06c	CoopCommand: Fix usage	2022-05-28 21:34:38 -07:00
tester233	02e737e920	Complement usage	2022-05-28 16:01:21 -07:00
KingRainbow44	68e1c8d75a	Merge remote-tracking branch 'origin/development' into development	2022-05-28 18:52:56 -04:00
KingRainbow44	05527fcb7c	Use static reference instead of local	2022-05-28 18:52:47 -04:00
Yazawazi	c164b25f90	fix(database helper): fix player uid issues	2022-05-28 04:28:36 -07:00
tester233	9af10859bb	Update translation keys	2022-05-28 04:22:53 -07:00
Luke H-W	eb899ccd91	Fix setstats command feedback for targeting others (#1079 ) Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>	2022-05-28 13:03:31 +02:00
ImmuState	cb3f3b92f5	Make sure energy drops are only processed for actual monsters.	2022-05-27 23:48:54 -07:00
KingRainbow44	b34ab5f8ec	Fix OAuth Authenticator	2022-05-27 20:09:13 -04:00
KingRainbow44	52c86afef0	[BREAKING] Refactor OAuth handler	2022-05-27 19:58:04 -04:00
Melledy	243ad3abe5	Refactor accounts to not use a player uid	2022-05-27 00:22:55 -07:00
ProxyismGH	880d177034	TeamManager avatar add refactor.	2022-05-26 22:54:36 -07:00
logictc	6a9018e310	fix no melee attach and adjust skill particle amount	2022-05-26 15:26:47 -07:00
ImmuState	b57cf83bbd	Some refactoring.	2022-05-26 03:41:19 -07:00
ImmuState	de8b0be36e	Introduce a simpler way to get the original owner of an EntityClientGadget	2022-05-26 03:41:19 -07:00
logictc	fa90e37da3	remove debug msg	2022-05-25 21:10:10 -07:00
logictc	baef25680f	change indentation to tab	2022-05-25 21:10:10 -07:00
logictc	c26bf08d90	fix indentation	2022-05-25 21:10:10 -07:00
logictc	95bc655882	implement skill particle generation	2022-05-25 21:10:10 -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
ImmuState	2a76e904ad	Energy: Particle/Orb Drops from Monsters (#1054 ) * Generate energy drops for monsters + make sure picking up particles honors their count. * Use drop info from excels instead. * Remove double newline. * Remove commented code.	2022-05-24 21:43:04 -07:00
logictc	5811556630	don't take effect if energyUsage is false	2022-05-24 14:43:02 -07:00
logictc	af381dcf42	clear energy on death	2022-05-24 14:43:02 -07:00
logictc	e0593554b6	implement persist energy	2022-05-24 14:43:02 -07:00
tester233	7f7e82e748	Update zh-CN.json	2022-05-24 14:19:24 -07:00
tester233	9b9e29b5d3	Fix usage & update zh-CN.json	2022-05-24 14:19:24 -07:00
ShiroSaki	c8a7aea78b	Fix new account can't load codex datas	2022-05-23 23:55:46 -07:00
ShigemoriHakura	9e8b6eff09	remove unused import	2022-05-23 15:46:21 -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
Akka	5a4a708931	remove unused imports	2022-05-23 15:46:17 -07:00
Akka	791b9534b7	refactor the challenge	2022-05-23 15:46:17 -07:00
ShiroSaki	2b799958d2	Refactor support for codex(aka archive) animal, weapon, reliquary	2022-05-23 02:46:50 -07:00
Luke H-W	117a947b07	Fix team command (#1035 ) * Fix logic error in team command * Sugar team command messages Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>	2022-05-23 02:45:03 -07:00
CCasusensa	6f798f838f	Traditional Chinese \| Translation Patch	2022-05-23 02:44:34 -07:00
ImmuState	922ae91771	Fix EnergyManager indentation.	2022-05-22 12:55:55 -07:00
ImmuState	ab1341f0d9	Make sure offFieldPenalty does not go below 0.1	2022-05-22 12:55:55 -07:00
ImmuState	88781fdd82	Remove debug stuff	2022-05-22 12:55:55 -07:00
ImmuState	4649680101	Fix traveller not being able to gain energy.	2022-05-22 12:55:55 -07:00
ImmuState	28323fed66	Move energy-related logic to a new EnergyManager.	2022-05-22 12:55:55 -07:00
ImmuState	1d2fde40d5	Make energy usage configurable, and preserve current behavior as the default.	2022-05-22 12:55:55 -07:00
ImmuState	531683f370	Make sure to use absolute energy to deplete burst.	2022-05-22 12:55:55 -07:00
ImmuState	8f5bd2f220	Give correct amount of energy for collecting particles/orbs, and consume energy on burst cast.	2022-05-22 12:55:55 -07:00
ImmuState	1df9acbb6a	Generate energy particle of the correct element for abilities.	2022-05-22 12:55:55 -07:00
tester233	2d2dc5d0a8	Update translation keys	2022-05-22 12:55:45 -07:00
Luke H-W	0ae3c3d7da	Allow commands to target offline players (#1022 ) * Add targetRequirement annotation for Command * Added MTL lines for other langs * Fix TargetRequirement enum scoping * Adjust commands to targetRequirement system * Add translation message sugar to prevent future messages from being translated for wrong player * Temporarily disable offline targeting on /permission and /clear * Preliminary README cleanup * Readme commands cleanup * Clean up command table in README, including column shuffle Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>	2022-05-22 01:02:11 -07:00
Kimi	fa0344d1f9	Traditional Chinese \| Translation Patches	2022-05-22 01:01:56 -07:00
Benjamin Elsdon	5bd88d596b	More Web Static Languages	2022-05-20 19:33:29 -07:00
xtaodada	7c899ce1d0	Fix dataloader not getting path correctly	2022-05-20 19:32:27 -07:00
Benjamin Elsdon	d1775b130f	Attempt to fix untranslated login window	2022-05-20 05:52:15 -07:00
Няшик Няшный	e6514f7ad1	Added banner start and end time checks	2022-05-20 05:51:44 -07:00
Няшик Няшный	1662278586	Changing how banners work	2022-05-20 05:51:44 -07:00
zrll_	eb54dcec0e	Update FileUtils.java fix: Error when checking files & always checking "/default/data" instead of folder	2022-05-20 05:49:28 -07:00
4Benj_	92f1a93ba2	Server Log Events (#996 ) * Server Log Event * LogEventAppender Encoder	2022-05-20 05:48:20 -07:00
ButterCookies	9125bacfce	Set the maximum number of player on the server through the config.json (#1001 ) * Show server status to three-party game launcher * Set the maximum number of player on the server through the config.json * modify the logical order and show the number of maxplayer to API /status/server * Now even players who have token already cannot bypass the maxPlayer check	2022-05-20 05:47:47 -07:00
Akka	717c2d1dd7	Support Boss Chest	2022-05-19 23:36:13 -07:00
zhaodice	2a467a48dc	Fix connection bugs without removing binding address (#993 ) * Fix connection bugs according to #921 Fix this for connect to game by local device or remote devices according to #921 * Fix connection bugs according to #921 same * Update GameServer.java * fix build * Update GameServer.java	2022-05-19 08:35:14 -07:00
tester233	cf7c4832fe	Remove outdated text & update zh-CN.json	2022-05-19 08:34:58 -07:00
Melledy	1282e1388f	Add error message in case data files in resources could not be found	2022-05-19 03:06:07 -07:00
Melledy	5429469852	Add error message in case data files in resources could not be found	2022-05-19 03:05:57 -07:00
Melledy	86dee4bae7	Fix dataloader not getting path correctly	2022-05-19 03:01:21 -07:00
Melledy	01987279b5	Fix dataloader not getting path correctly	2022-05-19 03:00:59 -07:00
Melledy	28dda4c307	Add area_id to SceneObject	2022-05-19 02:28:46 -07:00
Melledy	8c860308ba	Fix bad casting exceptions with scene garbages objects	2022-05-19 02:28:25 -07:00
Melledy	0dac404f0d	Fix issue with groups that dont have any suites	2022-05-19 02:19:18 -07:00
Melledy	a088ea9b6b	Fix dataloader with eclipse	2022-05-19 01:06:20 -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	512021b234	Fix dataloader with eclipse	2022-05-19 00:10:02 -07:00
xtaodada	7fb26c3843	Autogenerate document files	2022-05-18 23:19:13 -07:00
Akka	bad853573c	optimized the Lua func binding so that the script will not eval again	2022-05-18 20:51:39 -07:00
Melledy	a8f38ad995	Move chest rewards to new data format	2022-05-18 15:54:55 -07:00
Melledy	fe4e599014	Merge branch 'development' into dev-world-scripts	2022-05-18 15:54:35 -07:00
2bllw8	e3ed396889	Add web documentation - '/documentation': home page with all links - '/documentation/handbook': html version of the gm handbook - '/documentation/gachamapping': json document with the gacha mappings	2022-05-18 15:41:19 -07:00
linebear	827044b3da	Fix this does not look like a tar archive error when extract log file	2022-05-18 15:38:26 -07:00
tester233	efe459e17f	Fix punctuation & update zh-CN.json (#976 ) * Fix punctuation & update zh-CN.json * Fix error	2022-05-18 13:46:47 -07:00
tester233	b8cb6e108b	Improve text & update zh-CN.json	2022-05-18 05:48:17 -07:00
Melledy	3cffdd9773	Cleanup and remove business_type filter	2022-05-18 05:33:00 -07:00
Melledy	4b5f5b3db5	Only load groups that have a business type of 0	2022-05-18 05:10:45 -07:00
Melledy	b375881a3e	Fix errors caused by merge + Refactor chests into GadgetChest	2022-05-18 02:36:50 -07:00
Melledy	94997276db	Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into dev-world-scripts	2022-05-18 02:24:00 -07:00
Melledy	a48585d124	Implement local specialty spawning	2022-05-18 02:21:34 -07:00
Akka	5f13a51668	Support Open Chest	2022-05-18 01:07:06 -07:00
AZthemute	e45ef7de51	General housekeeping and clarification of en-us.json file	2022-05-17 21:11:10 -07:00
YukariChiba	d15c32df23	Add OAuth in AuthenticationSystem	2022-05-17 12:25:59 -07:00
muhammadeko	0c6521806c	add CommandResponseEvent	2022-05-17 12:21:17 -07:00
Benjamin Elsdon	10fe5d11ca	AuthenticationSystem::verifyUser now returns the user's Account instead of a boolean	2022-05-17 05:30:22 -07:00
YukariChiba	cc98c56916	Do not add default region if there are already regions	2022-05-17 04:30:28 -07:00
tester233	d0ab5fa5df	Add translation key	2022-05-17 04:24:18 -07:00
tester233	263369af9a	Modify usage	2022-05-17 04:24:18 -07:00
tester233	b5632aa62d	Fix usage & remove outdated text	2022-05-17 04:24:18 -07:00
Benjamin Elsdon	ef63708675	Change BANNED_PACKETS to HashSet instaed of List	2022-05-17 04:24:01 -07:00
Benjamin Elsdon	fffa5a9c47	Fix "Attempt to get java.util.List field 'PacketOpcodes.BANNED_PACKETS' with illegal data type conversion to int"	2022-05-17 04:24:01 -07:00
Benjamin Elsdon	20feb75c86	Permanent fix for version.json stuff (causes 4206)	2022-05-17 04:11:50 -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	df580bf519	Fixed issue with scene groups after merge	2022-05-16 22:09:10 -07:00
Melledy	81183db104	Merge branch 'development' into dev-world-scripts	2022-05-16 22:08:28 -07:00
xtaodada	1adffc21c0	Enhance the default permissions logic	2022-05-16 21:55:47 -07:00
RDsatan	21478b0a33	fixed	2022-05-16 21:53:16 -07:00
RDsatan	34ea3089b6	Optimize the join and remove commands to team	2022-05-16 21:53:16 -07:00
Akka	593de83847	optimized the lua serializer	2022-05-16 21:30:04 -07:00
muhammadeko	5ddf67d9e5	add config to enable/disable console	2022-05-16 17:57:14 -07:00
TangHuLuTaiTian	1925bf64d8	Some clients Code 4206 Error	2022-05-16 17:49:46 -07:00
Magix	3e2ff211ec	Merge pull request #928 from 6ixfalls/dispatch-fix Fix "/" Route	2022-05-16 12:56:13 -04:00
Elapse	58a5ad4909	update opcodes, correct op names, and update relative codes	2022-05-16 06:20:34 -07:00
line-bear	87966b9e98	Remove the extra slash while loading resources. (#893 ) * Remove the extra slash * Update src/main/java/emu/grasscutter/Configuration.java Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com> * Update src/main/java/emu/grasscutter/Configuration.java Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com> * Update src/main/java/emu/grasscutter/Configuration.java Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com> * Import java.nio.file.Paths to use Paths.get * Mark fields as private to prevent use FOLDER directly Remove unnecessary slash Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>	2022-05-15 23:32:03 -07:00
Akka	18ef5ee7de	fix the dynamic group loading	2022-05-15 12:40:36 -07:00
6ixfalls	c71842c9d0	Fix "/" Route	2022-05-15 09:41:10 -07:00
Akka	6dc30e4def	Enable script in big world (#884 ) * add docs for tower * fix: LEAK: ByteBuf.release() was not called * enableScriptInBigWorld * not print log when loaded scripts from cache * revert the change of server tick * revert the change of server tick * fix * optimize the performance: lazy load & cache * fix the refresh group * fix NPE Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>	2022-05-15 04:19:24 -07:00
Melledy	eb64b25f12	Implement quest rewards	2022-05-15 03:48:47 -07:00
AnimeGitB	f5cdedcc88	Fix logic error in remove command	2022-05-15 01:17:26 -07:00
AnimeGitB	efd7467a71	Fix targeting on Join and Remove commands	2022-05-15 01:17:26 -07:00
muhammadeko	05e13d81ad	Modify chat manager to give plugin ability to change it	2022-05-14 23:27:36 -07:00
lsCoding666	7a66f22827	fix join command and remove command bug and update docs (#904 ) * feat:new command "join" and "remove" to force join or remove avatar in your current team * fix:change MaxAvatarsInTeam from 9 to 4 * feat:update & merge branch.Translate fix * fix(command):fix remove command a stupid bug.Loop delete element bug. * fix(command):fix join command. When adding avatars, repeat avatars skip and non repeat avatars join. * fix(language):fix join command remove command translate * fix(ReadMe):update README.md join and remove command.	2022-05-14 23:27:23 -07:00
muhammadeko	b05a5f85f6	fix permission command	2022-05-14 21:06:57 -07:00
Hotaru	3a216bf1bb	Move gacha files to separate directory and refactor file serving	2022-05-14 20:07:08 -07:00
HotaruYS	159feb4064	Properly handle static assets for announcements (#891 )	2022-05-14 20:05:19 -07:00
tiantian520	5b3c05a9a0	Add a new command "nostamina" (#877 ) * Add a new command " nostamina\ * Fix * Fix 2 * Renamed some names. * Update zh-CN.json Fix an existing language expression error.	2022-05-14 16:06:48 -07:00
KingRainbow44	6ec27cd17a	Update routes	2022-05-14 12:41:49 -04:00
KingRainbow44	04d9613fac	External authentication	2022-05-14 12:39:21 -04:00
KingRainbow44	5d7edc389e	Implement PR #657	2022-05-14 12:21:55 -04:00
KingRainbow44	0dcf0862f8	JavaDoc Fix	2022-05-14 12:13:41 -04:00
KingRainbow44	2e7cd0b46f	Fix errors	2022-05-14 12:10:43 -04:00
KingRainbow44	a2ff8c8470	Merge `development` into `plugin-auth`	2022-05-14 12:08:33 -04:00
Melledy	a751e71da9	Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development	2022-05-14 06:35:37 -07:00
lsCoding666	741e5749ad	new command join and remove to force join or remove avatars into your current team (#549 ) * feat:new command "join" and "remove" to force join or remove avatar in your current team * fix:change MaxAvatarsInTeam from 9 to 4 * feat:update & merge branch.Translate fix	2022-05-14 06:28:02 -07:00
zrll_	470007a6c0	Fix connot execute quest command in console	2022-05-14 05:28:57 -07:00
luluxiaoyu	3c654cf030	Update zh-TW.json	2022-05-13 22:12:14 -07:00
muhammadeko	4f553f6694	remove log	2022-05-13 22:12:07 -07:00
muhammadeko	855a098aa7	fix logic and some cleaning	2022-05-13 22:12:07 -07:00
muhammadeko	922359d6e6	add negative permission check	2022-05-13 22:12:07 -07:00
KingRainbow44	3adf0d448c	Refactor dispatch (now called HTTP) server (pt. 2)	2022-05-13 23:22:30 -04:00
ShiroSaki	20e3b8ffda	add support for announcement page	2022-05-13 16:48:37 -07:00
Melledy	248b655f07	Use scene types instead of hardcoding scene ids for checking enter reason	2022-05-13 16:35:03 -07:00
tester233	82698d5623	Improve text	2022-05-13 16:33:18 -07:00
ShigemoriHakura	749ef3ff23	Add support for codexQuests (#870 )	2022-05-13 16:33:07 -07:00
Yazawazi	ab6aa96144	fix(serenitea pot): teleport & read born pos from lua	2022-05-13 16:32:52 -07:00
Yazawazi	95a062123f	feature(serenitea pot): Implementation of enter Ugly hard code	2022-05-13 16:32:52 -07:00
Yazawazi	19ee983c08	feature(serenitea pot): Implementation of the entry function It's being perfected, so don't worry. (probably)	2022-05-13 16:32:52 -07:00
KingRainbow44	840f4706b5	Refactor dispatch (now called HTTP) server (pt. 1)	2022-05-13 11:39:40 -04:00
KingRainbow44	a0067b664e	Add JSON-related methods to `Utils.java`	2022-05-13 11:38:54 -04:00
KingRainbow44	39f23a0c47	Add new authentication system	2022-05-13 11:38:17 -04:00
Melledy	83f8bec947	Implement QUEST_CONTENT_FINISH_PLOT	2022-05-13 06:33:12 -07:00
Melledy	a227b44c70	Fixed quests not finishing their questline	2022-05-13 06:24:50 -07:00
Melledy	f4770cf20a	Merge pull request #816 from Grasscutters/dev-quests Implement quests	2022-05-13 05:36:30 -07:00
Kimi	891c70e5ea	Traditional Chinese \| Translation Patches	2022-05-13 05:35:21 -07:00
kyoko12	d4eb686fe2	Don't silently delete config.json if there is an error.	2022-05-13 05:34:59 -07:00
AnimeGitB	395da1ebcb	Fix gachadetails	2022-05-13 05:34:14 -07:00
AnimeGitB	420801b49e	Updated cost logic and default weights	2022-05-13 05:34:14 -07:00
AnimeGitB	736ca85300	Remove debug log from gacha	2022-05-13 05:34:14 -07:00
AnimeGitB	83c46cb9c8	Custom costs for different gacha pulls	2022-05-13 05:34:14 -07:00
AnimeGitB	f83f13204e	Gacha rework Add fallback stripping and C6 stripping Converting banner definitions from pity vars to lerp arrays Properly implement rates and pool smoothing Also move reusable functions to Utils	2022-05-13 05:34:14 -07:00
Melledy	cbd46e9215	Add one more quest trigger	2022-05-13 05:33:43 -07:00
Melledy	631a53030c	Switch to using quest excels	2022-05-13 03:12:25 -07:00
Akka	3c55aa64eb	fix: LEAK: ByteBuf.release() was not called	2022-05-13 00:21:26 -07:00
Hotaru	92b103d529	Fix UTF-8 encoding in announcements	2022-05-12 17:54:50 -07:00
tester233	12c7c8f8c1	Improve text	2022-05-12 14:54:53 -07:00
tester233	4d9c2becb5	Improve text	2022-05-12 14:54:53 -07:00
tester233	28f4f73dbe	Improve text	2022-05-12 14:54:53 -07:00
Akka	00ea35b81f	add docs for tower	2022-05-12 14:54:44 -07:00
Hotaru	2451d2c897	Build region_list and cur_region dynamically	2022-05-12 14:54:33 -07:00
gentlespoon	65fcae7961	Slowly recover HP near statue	2022-05-12 02:32:39 -07:00
gentlespoon	8c71af26f0	Clean up map mark related code 1. Remove unnecessary manager from player collection. 2. Clean up MarkMapReq handler. 3. Remove redundant checks.	2022-05-12 02:32:11 -07:00
Melledy	9b26426e8a	Merge branch 'development' into dev-quests	2022-05-12 02:31:28 -07:00
Melledy	1231802192	Implement basic quest condition handling Quests that require talking to npcs now work.	2022-05-12 02:30:34 -07:00
Yazawazi	8c32438b52	feature(widget): simple implementation of widget Simple implementation of a part of the gadget support, very rough, hard code variables, I am very sorry for that. It can now handle part of the gadget rig. More features and better support await PRs from others. if no one else does, I'll give it a try.	2022-05-12 01:23:16 -07:00
AnimeGitB	f45e106b2a	Fix immutable lists	2022-05-11 21:56:53 -07:00
AnimeGitB	b787c70cb0	More usage of payItems	2022-05-11 21:56:53 -07:00
AnimeGitB	b4d457d78a	Add some usage of Inventory.payItems() And add quantity to it	2022-05-11 21:56:53 -07:00
AnimeGitB	595234cc84	Add Inventory.payItems() method	2022-05-11 21:56:53 -07:00
gentlespoon	226a29f7c2	Fix logging level	2022-05-11 17:39:45 -07:00
gentlespoon	2531ae366d	Feature: vehicle stamina 1. Remove references. 2. Handle vehicle stamina.	2022-05-11 17:39:45 -07:00
gentlespoon	ba5635bf39	Update StaminaManager 1. Update function signatures to prepare for vehicle stamina. 3. Remove hard-coded skills. 2. Wind resonance -15% stamina cost. 4. Climb talent cost reduction. 5. Swim talent cost reduction. 6. Diluc will now consume stamina at full price if talent not activated. 7. Sayu's windwheel no longer consumes stamina.	2022-05-11 17:39:45 -07:00
Melledy	7befebe37f	Add quest ids to handbook	2022-05-11 12:47:16 -07:00
Melledy	5d4f245293	Merge branch 'development' into dev-quests	2022-05-11 12:39:28 -07:00
ImmuState	e5a85f81c2	Insert language setting based on the player's account.	2022-05-11 12:02:45 -07:00
ImmuState	57c7f7a43b	Add gacha details page.	2022-05-11 12:02:45 -07:00
mingjun97	570635ea02	Revise version format	2022-05-11 11:52:56 -07:00
mingjun97	895e2bc44a	Display version info at console starting	2022-05-11 11:52:56 -07:00
mingjun97	a77ae0bc3c	Introduce `-version` argument to display version	2022-05-11 11:52:56 -07:00
tester233	9fc18151c9	Improve text	2022-05-11 11:51:24 -07:00
tester233	99de46e261	Improve text & remove extra punctuation	2022-05-11 11:51:24 -07:00
Benjamin Elsdon	c932f9c7e5	Add verifyUser to AuthenticationHandler	2022-05-11 11:51:11 -07:00
Secretboy-SMR	9ed1bb9b94	It will use the english as default rather than tell you the value is not exist if there's no translation for currently language	2022-05-11 11:50:53 -07:00
KingRainbow44	03a2876233	Add plugin loggers	2022-05-11 11:46:36 -04:00
KingRainbow44	d215035fc8	Refactor config database settings	2022-05-11 11:38:30 -04:00
ayy lmao	3c0d85621e	Fix InRouting on dispatch server	2022-05-11 17:35:52 +03: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
Secretboy-SMR	e3fd2eaa17	Removed invalid code in getLanguageFileDescription,When the language is not discovered, it will use the built-in language fallback mechanism to fall back,At the same time, we also fix the issue that using language in the server does not save the settings of the server side locale	2022-05-11 03:11:10 -07:00
coooookies	7e3bfed003	Show server status to three-party game launcher	2022-05-11 02:45:21 -07:00
Secretboy-SMR	04f6e73447	fixed language not found prompt	2022-05-11 01:18:10 -07:00
mingjun97	8ad6bda3b2	Bug fixes. * Fix default port for the game server * Fix the returning region info	2022-05-11 01:17:51 -07:00
gentlespoon	37e1ffed28	Fix incorrect ascension level in givechar command	2022-05-11 01:17:10 -07:00
Magix	22cbe74875	Merge pull request #802 from Grasscutters/better-config Implement a better config structure	2022-05-11 01:23:43 -04:00
KingRainbow44	812f4b372c	Fix `ClassDefNotFound` & `NullPointerException` errors	2022-05-11 01:23:18 -04:00
KingRainbow44	0b3e2b3017	Remove config file	2022-05-11 00:48:40 -04:00
KingRainbow44	bd9e207a8c	Remove old config & migrate legacy configs	2022-05-11 00:46:49 -04:00
KingRainbow44	11161227ab	Convert to the far superior config system	2022-05-11 00:30:07 -04:00
KingRainbow44	c274907e9a	Create new config class	2022-05-10 22:49:25 -04:00
gentlespoon	54cf45a72e	Claymore charged attack stamina cost	2022-05-10 17:25:18 -07:00
Magix	099e45b581	Merge pull request #688 from HotaruYS/patch-3 Improve logging pattern by including caller class name	2022-05-10 20:17:13 -04:00
KingRainbow44	5d49323c37	my poor, poor, language system (Formatting refactor)	2022-05-10 20:00:47 -04:00
Secretboy-SMR	a26afe7d47	Fix language switching prompt and save	2022-05-10 13:36:57 -07:00
tester233	f92e839ad1	Improve text	2022-05-10 06:36:19 -07:00
Secretboy	94409b8635	fixed pr780, uploaded LanguageCommand.java (#782 ) * Fix the following issues: 1. HashMap non-thread-safe issus 2. Fix the same problem in pr621, but use a better implementation Add the following functions: 1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located * add /language command,each account has their own Locate * I forgot to git add...sorry,,this pr is to fix pr780, uploaded LanguageCommand.java	2022-05-10 06:35:37 -07:00
Secretboy	ecf028d0c6	add /language command (#780 ) * Fix the following issues: 1. HashMap non-thread-safe issus 2. Fix the same problem in pr621, but use a better implementation Add the following functions: 1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located * add /language command,each account has their own Locate	2022-05-10 05:33:45 -07:00
gentlespoon	0f1341512c	Reset first tick on new skill	2022-05-10 05:21:29 -07:00
gentlespoon	2a3708ee46	Talent moving stamina cost	2022-05-10 05:21:29 -07:00
gentlespoon	99dbac8ad3	Add UTF8 charset in dispatch server HTML template.	2022-05-10 05:21:21 -07:00
Kinesis	b1bd0a5a95	fixed KillCharacter help command description typo case	2022-05-10 05:21:13 -07:00
tester233	70cfe3e42a	Update zh-CN.json	2022-05-10 03:10:08 -07:00
tester233	ad1d45fa90	Update zh-CN.json	2022-05-10 03:10:08 -07:00
tester233	7efbdbf1ed	Update zh-CN.json & fix typo	2022-05-10 03:10:08 -07:00
Bi Jiakai	f26fe213a2	Fixed account delete can not delete all related data (#767 )	2022-05-10 03:09:47 -07:00
gentlespoon	fb3c3b71c8	Temporarily set statue auto use to 1 and 100%.	2022-05-10 02:14:09 -07:00
gentlespoon	0ea0eab6b6	Stamina will be set to full if Stamina is disabled.	2022-05-10 02:13:49 -07:00
Melledy	c424d15b32	Remove previous fix for falling to death in godmode This fix is more efficient	2022-05-10 01:50:04 -07:00
gentlespoon	a601e13d80	No more fallen to death in god mode	2022-05-10 01:50:04 -07:00
Secretboy-SMR	5a37acde2b	Fix the following issues: 1. HashMap non-thread-safe issus 2. Fix the same problem in pr621, but use a better implementation Add the following functions: 1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located	2022-05-09 23:15:58 -07:00
FpguDhk	d179b5c7dc	Fix the decision statement of adding map marker. (#763 ) * Fix the Chinese messy code problem. * Fix the decision statement of adding map marker.	2022-05-09 23:15:17 -07:00
hatsune-miku	f5509d1e7d	Disable falling damage for godmode	2022-05-09 13:44:16 -07:00
Kinesis	c2230485c1	fixed error KillCharacter description in the help command	2022-05-09 12:51:08 -07:00
ImmuState	1c8207500c	Remove commented method and unused import.	2022-05-09 12:50:47 -07:00
ImmuState	19e798a28b	Change ccount delete to delete all referenced items in the database.	2022-05-09 12:50:47 -07:00
Melledy	85f5a753e1	Merge pull request #746 from Akka0/tower fix the Monster spawn between stage challenges	2022-05-09 12:50:33 -07:00
筱傑	bdc9e483ae	Fixed MissingFormatArgumentException (#727 ) Format string is `"given_level": "Given %s with level %s %s times to %s"`	2022-05-09 12:50:23 -07:00
Akka	66b17cad26	little fix	2022-05-10 00:14:50 +08:00
Akka	2e69a4d8f7	Merge remote-tracking branch 'origin/development' into tower	2022-05-10 00:07:10 +08:00
Akka	faa3cde575	fix the Monster spawn between stage challenges	2022-05-10 00:05:01 +08:00
Mateoust	9a7d78e0b7	Update translation keys to fix issues 648 677 fix issues 648 677	2022-05-09 04:18:12 -07:00
Mateoust	c432ace5d8	Updating language files fixed the issue 648 677 fix issue 648 677	2022-05-09 04:18:12 -07:00
AnimeGitB	63efef8d05	Fix /talent saving to level instead of id	2022-05-09 04:18:04 -07:00
gentlespoon	5d917f185f	Move "if Grasscutter.getConfig().OpenStamina" to the correct place.	2022-05-09 03:46:18 -07:00
Akka	eb2b23928b	Fix #719	2022-05-09 02:28:41 -07:00
gentlespoon	ccdc3d1214	Only handle motion notify for current entity.	2022-05-09 02:28:13 -07:00
Akka	45b45c4beb	Merge remote-tracking branch 'fork/tower' into tower	2022-05-09 17:01:26 +08:00
Akka	722e710c7b	Fix #719	2022-05-09 17:01:08 +08:00
Melledy	f0aa8c2c53	Merge pull request #718 from Akka0/tower Support Team Toggle in Tower & Refactor MonsterTide	2022-05-09 01:15:02 -07:00
AnimeGitB	713b2698d0	Fix perm field order consistency on GiveCommand	2022-05-09 01:12:47 -07:00
AnimeGitB	f08a89711c	Account permission wildcards	2022-05-09 01:12:47 -07:00
AnimeGitB	80db118f72	Add permissionTargeted to applicable commands Change target perm from target.perm to x.perm.others	2022-05-09 01:12:47 -07:00
Akka	47ea466054	Merge remote-tracking branch 'origin/development' into tower	2022-05-09 15:43:52 +08:00
Akka	65c93a747c	Support Team Toggle in Tower & Refactor MonsterTide	2022-05-09 15:39:49 +08:00
Shirakami Ling	056b5b80c8	Change the license type in zh-CN.json.	2022-05-08 16:02:09 -07:00
ImmuState	9869e4368d	-Make the _tier suffix optional.	2022-05-08 15:59:09 -07:00
ImmuState	935bb4b523	Fix incorrect @Command annotation.	2022-05-08 15:59:09 -07:00
ImmuState	72e8a976ea	Fix invalid translation key.	2022-05-08 15:59:09 -07:00
ImmuState	5f8011f0ec	Added to ability to specify main and substats for /giveart via names instead of IDs.	2022-05-08 15:59:09 -07:00
Melledy	06f531fe18	Merge branch 'stable' into development	2022-05-08 15:52:16 -07:00
KingRainbow44	d43f431506	Add warning for language fallback	2022-05-08 13:19:23 -07:00
KingRainbow44	137ea1e294	Fallback to the fallback fallback	2022-05-08 13:19:23 -07:00
HotaruYS	9a0a15a462	Merge branch 'development' into patch-3	2022-05-08 15:34:17 +02:00
Yazawazi	5d1f49579b	feature(task): Implement pause, resume and cancel Use as `pauseTask(taskName)`. They return boolean values to tell the developer if a timed task can be paused/resumed/cancelled properly. A little bit of testing shows that pausing and then resuming may execute the task multiple times.	2022-05-08 06:28:13 -07:00
Akka	9fc4b916c8	Persist Tower Data && Set The Tower Schedule	2022-05-08 06:06:32 -07:00
Akka	9ad44f5c10	Monsters tide turn by turn && Ban User Skill && Lua functions	2022-05-08 06:06:32 -07:00
Melledy	55389d3a5c	Optimize invoke packet handling	2022-05-08 06:05:50 -07:00
Melledy	2dfdc62743	Implement energy balls (orbs)	2022-05-08 06:05:50 -07:00
Melledy	897f082b12	Implement AbilityManager	2022-05-08 06:05:50 -07:00
Akka	219a850818	Merge remote-tracking branch 'origin/development' into tower	2022-05-08 20:56:50 +08:00
Michaellan	176f3e91f1	fill description	2022-05-08 05:51:13 -07:00
HotaruYS	beea95fdae	Improve logging pattern by including caller class name	2022-05-08 14:30:48 +02:00
gentlespoon	d78348522e	Update StaminaManager	2022-05-08 04:39:25 -07:00
gentlespoon	a09723f07d	Fix: timer is already cancelled.	2022-05-08 04:39:25 -07:00
HotaruYS	7c35c51a6a	Override server logging level with environment variable (#653 ) Use `LOG_LEVEL` environment variable to override logging level for `emu.grasscutter` (which also contains all loggers under it). This might help with debugging various issues reported by users. Previously, the only way to override these levels would be to use `-Dlogback.configurationFile`	2022-05-08 03:48:06 -07:00
Akka	4b6842f006	Persist Tower Data && Set The Tower Schedule	2022-05-08 17:11:02 +08:00
方块君	3a5503de72	Using annotation key translation	2022-05-08 01:47:26 -07:00
方块君	ef3579da82	add Command description	2022-05-08 01:47:26 -07:00
方块君	a46d58e5f6	Add command description multilingual	2022-05-08 01:47:26 -07:00
芊枫	4c911d6f55	Update zh-CN.json	2022-05-07 23:14:56 -07:00
芊枫	d7a82e1c9f	Update zh-CN.json	2022-05-07 23:14:56 -07:00
芊枫	21cd002fbd	Fix typo && update zh-CN.json	2022-05-07 23:14:56 -07:00
Mateoust	06564da009	fix issues 646	2022-05-07 23:13:45 -07:00
gentlespoon	94a6a79b4a	Fix null reference on stamina timer when paused player disconnects.	2022-05-07 23:13:35 -07:00
KingRainbow44	549471b76e	Fix language fallback'ing	2022-05-07 23:44:35 -04:00
Zakhil	50307ea3a9	Added polish locale (#655 )	2022-05-07 18:19:24 -07:00
Akka	eb94adb296	Monsters tide turn by turn && Ban User Skill && Lua functions	2022-05-07 18:18:27 -07:00
gentlespoon	29f9d6506a	Make stamina consumption classes public so others can use.	2022-05-07 18:18:20 -07:00
gentlespoon	836e0150b5	Stop stamina consumption on game pause	2022-05-07 18:18:20 -07:00
gentlespoon	8e99cb4f35	More reliable stamina calculation by separately handling immediate one-time cost and cost over time.	2022-05-07 18:18:20 -07:00
Kimi	43c27c4679	Update zh-TW.json	2022-05-07 15:49:22 -07:00
Kimi	88bc5c4c54	another translation patches because i fucked it up i hate myself	2022-05-07 15:49:22 -07:00
KingRainbow44	57cc111350	Simplify the language fallback system	2022-05-07 18:12:53 -04:00
Magix	730c993873	Merge pull request #628 from exzork/development PluginManager: Use the same class loader and add getPlugin method	2022-05-07 17:58:42 -04:00
Magix	84c1cd7aa7	Update PluginManager.java	2022-05-07 17:58:18 -04:00
HotaruYS	ab5131e9fd	Respect FrontHTTPS when creating URI for gacha record	2022-05-07 14:54:15 -07:00
Piotr Blecharski	34228dc9cd	Command list with descriptions in handbook	2022-05-07 14:45:42 -07:00
zhaodice	e85eb2f48a	fix issue 635 fix #635	2022-05-07 14:42:25 -07:00
zhaodice	7e5696211c	fix issues 629 fix #629	2022-05-07 14:39:34 -07:00
Kimi	14da6214d3	Traditional Chinese \| Translation Patches yeah i fucked up that one line of translation oops also added two lines of translation too	2022-05-07 14:37:48 -07:00
Akka	39e8f810d2	Merge pull request #5 from Grasscutters/development Development	2022-05-07 21:49:22 +08:00
Akka	6148ee8742	Monsters tide turn by turn && Ban User Skill && Lua functions	2022-05-07 21:47:13 +08:00
muhammadeko	f8bc471d4d	PluginManager: Use the same class loader and add getPlugin method	2022-05-07 19:48:51 +07:00
kaitl	dc3c744778	Update zh-CN.json	2022-05-07 00:47:38 -07:00
gentlespoon	6bba3c8477	Kamisato Ayaka and Mona talent moving costs stamina	2022-05-07 00:47:19 -07:00
gentlespoon	9b3ca239c9	Prepare MovementManager.updateStamina() for external calls.	2022-05-07 00:47:19 -07:00
mingjun97	ff52255ac7	Fix gacha mapping generation login * Fix `System#out` usage pointed by magix at https://github.com/Grasscutters/Grasscutter/pull/568#pullrequestreview-965271278 * Fix typos for interchange `-` and `_`. * Fix gacha mapping autogeneration path	2022-05-06 23:28:07 -07:00
gentlespoon	34df864e1c	Flight stamina cost -20% when Amber or Venti in team - Reduced stamina not tested in MP. - Stop MovementManager ticker when player goes offline.	2022-05-06 23:27:07 -07:00
真心	00d15a5c89	Create zh-CN.json	2022-05-06 23:24:47 -07:00
Secretboy	bf0d01778e	Update Language.java	2022-05-06 21:54:07 -07:00
Secretboy	f9b5478c9d	Update Config.java	2022-05-06 21:54:07 -07:00
FpguDhk	a9a027bbc6	Fix the Chinese messy code problem.	2022-05-06 21:23:03 -07:00
lhhxxxxx	0690e23116	Handle with undetermined locale language config (#611 ) * Update GiveAllCommand.java giveall command nomore give arts * Update Grasscutter.java * Update Grasscutter.java	2022-05-06 21:20:44 -07:00
Melledy	af39613d4f	Move server profile away from GameConstants	2022-05-06 19:16:36 -07:00
Melledy	759cd6ae37	Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development	2022-05-06 19:12:58 -07:00
Melledy	f894b96edf	Fix crash on login if the player didnt have a TowerManager	2022-05-06 19:12:54 -07:00
KingRainbow44	32d2a21153	Merge remote-tracking branch 'origin/development' into development	2022-05-06 21:53:03 -04:00
KingRainbow44	043c731575	Fix for translation errors	2022-05-06 21:52:10 -04:00
Magix	e29c2dc122	Merge branch 'stable' into development	2022-05-06 21:39:30 -04:00
Magix	1ed0511cd7	Update Tools.java	2022-05-06 18:25:35 -07:00
mingjun97	1ee9cc80bb	Auto fill name of the event from TextMap	2022-05-06 18:25:35 -07:00
mingjun97	1d6fd52552	Prompt for user language option for the `Tools` * GM Handbook * Gacha Map	2022-05-06 18:25:35 -07:00
Magix	711ae2f554	Merge branch 'development' into development	2022-05-06 21:08:19 -04:00
Magix	38fd7bb76a	Merge pull request #567 from Grasscutters/localization Implement a proper language system	2022-05-06 21:05:29 -04:00
KingRainbow44	c11e83c48f	Bug fixes	2022-05-06 21:04:39 -04:00
KingRainbow44	f1079953c1	Rename `en-US` locale	2022-05-06 20:18:50 -04:00
Bwly999	79babcc53e	roll back to timer	2022-05-07 08:00:31 +08:00
KingRainbow44	aa292b1fef	Update `Utils.java`	2022-05-06 19:47:30 -04:00
KingRainbow44	0d7f58fc25	Merge `development` into `localization`	2022-05-06 19:40:32 -04:00
gentlespoon	6d678557ff	fix/runningAndDashingStamina	2022-05-06 16:11:51 -07:00
KingRainbow44	362cfe1e7b	Ensure we have a fallback for localization	2022-05-06 18:57:49 -04:00
KingRainbow44	f39cc9e01f	Add the `zh-TW` language.	2022-05-06 18:56:19 -04:00
KingRainbow44	647922ff01	Add the `en-US` language.	2022-05-06 18:50:43 -04:00
KingRainbow44	b3a917007b	Convert to the superior language system. (pt. 3)	2022-05-06 18:50:18 -04:00
gentlespoon	58cb60299c	Fix #593 : Accidental death of character	2022-05-06 15:22:00 -07:00
gentlespoon	3f91fdcb71	Allow walking away from the statue within 2.5s to stop auto heal.	2022-05-06 14:49:33 -07:00
wulf	542a3cfc9b	fix scence block loading bug	2022-05-06 13:43:42 -07:00
Scald	afa3747fad	Add config option to change console server's signature, namecard, level and world level (#586 ) * Add files via upload * Add files via upload * Update GameConstants.java * Update Config.java * Update PacketGetPlayerFriendListRsp.java	2022-05-06 13:41:29 -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	ad84635540	Merge pull request #594 from Akka0/tower Tower Dungeons Handoff between levels	2022-05-06 13:37:30 -07:00
Kinesis	8abd3ace6c	Implement Avatar Expedition System Co-Authored-By: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com> Co-Authored-By: KanyeWestc <104547412+KanyeWestc@users.noreply.github.com> Co-Authored-By: QAQ 天小络 <72185326+XTL676@users.noreply.github.com> Co-Authored-By: nkxingxh <25559053+nkxingxh@users.noreply.github.com> Co-Authored-By: Yazawazi <47273265+Yazawazi@users.noreply.github.com> Co-Authored-By: wuwuwu223 <81224214+wuwuwu223@users.noreply.github.com> Co-Authored-By: omg-xtao <100690902+omg-xtao@users.noreply.github.com> Co-Authored-By: Sakura <104815797+Sakura@users.noreply.github.com> Co-Authored-By: NewNeko-2022 <104819344+NewNeko-2022@users.noreply.github.com> Co-Authored-By: JimWails <30657653+JimWails@users.noreply.github.com> Co-Authored-By: buttercookies <19878609+ButterCookies@users.noreply.github.com>	2022-05-06 13:28:26 -07:00
Muhammad Eko Prasetyo	deee32a0a1	add config option to enable cors for dispatchserver (#579 )	2022-05-06 13:23:26 -07:00
Akka	f2231349bd	a little fix	2022-05-07 00:31:48 +08:00
Akka	c2d2a37fc5	Merge branch 'tower' into development	2022-05-07 00:19:51 +08:00
Akka	17242a24ed	Add some lua functions	2022-05-07 00:15:23 +08:00
Akka	b58bcda0c8	Tower Dungeons Handoff between level and floor	2022-05-07 00:11:54 +08:00
Bwly999	6149c6f0e3	Merge branch 'development' of github.com:Grasscutters/Grasscutter into development	2022-05-06 22:38:04 +08:00
4Benj_	3ede7523b0	Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582 )	2022-05-06 15:48:16 +02:00
gentlespoon	2e68578525	The statues will now automatically regen their HP volume over time. Max is currently set to 85000 for everyone. Will update after implementing statue levels.	2022-05-06 03:26:38 -07:00
Bwly999	2d325e1847	fix the problem that the reference of serverHook in Plugin object is null	2022-05-06 18:16:07 +08:00
Melledy	b760fb1b26	Fix morphia error when saving player to db	2022-05-06 01:19:39 -07:00
Melledy	000b10983b	Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development	2022-05-06 01:17:19 -07:00
Melledy	796201e8b7	Remove the red exclamation mark from achievements	2022-05-06 01:17:16 -07:00
gentlespoon	221668570e	fix: lower logging level in SotSManager	2022-05-06 00:49:08 -07:00
gentlespoon	198214ec53	Implementes auto HP recovery at the statues. - Respects player setting. - SP + MP. - Statue has unlimited HP volume (to be updated)	2022-05-06 00:17:18 -07:00
Akka	2ad6f5934b	Add @Transient for temporary team	2022-05-06 00:12:33 -07:00
Akka	c912b8d857	Choose Avatar & Enter Tower	2022-05-06 00:12:33 -07:00
Akka	f683b222fc	Add @Transient for temporary team	2022-05-06 14:46:10 +08:00
gentlespoon	93b3265d72	Add drowning. Better movement ticking.	2022-05-05 23:42:34 -07:00
Akka	833ea1b791	Merge pull request #1 from Akka0/development Updated	2022-05-06 14:16:44 +08:00
Akka	3d3f36cf56	Choose Avatar & Enter Tower	2022-05-06 14:10:23 +08:00
KingRainbow44	c0b1ec1b9e	Convert to the superior language system. (pt. 2)	2022-05-06 00:57:45 -04:00
KingRainbow44	7a084100c6	Convert to the superior language system. (pt. 1)	2022-05-05 23:57:55 -04:00
memetrollsXD	81998b9cf9	Customise sender and title too. Add statement of use	2022-05-05 19:49:28 -07:00
Melledy	a045142a41	Kick player if they use an invalid resources folder	2022-05-05 17:17:27 -07:00
gentlespoon	bafde8693d	Fixes #529 : fixed stamina abnormal. added fall to death. Stamina is still WIP. - Currently stamina consumption is not affected by the use of foods, talents, or the environment. - Charged attacks do no require stamina yet. - Will be fixed tomorrow.	2022-05-05 15:37:15 -07:00
Scirese	128f767002	Update CNLanguage to match with the latest EN version	2022-05-05 09:03:23 -07:00
Akka	3f34aa0460	Support of Enter Room Scene	2022-05-05 09:02:54 -07:00
Benjamin Elsdon	782c9bfb6b	No misleading 404 error	2022-05-05 09:02:10 -07:00
Benjamin Elsdon	db1ddd0630	I honestly don't know what happened....	2022-05-05 09:02:10 -07:00
Benjamin Elsdon	3395c76dbc	Removed GCStatic. Cleaned up GachaRecordHandler.	2022-05-05 09:02:10 -07:00
Akka	a21fc116ee	Support of Enter Room Scene	2022-05-05 22:00:11 +08:00
Luke H-W	15dca5a04d	GiveCommand: fix edge case with unspaced multiple args (#539 ) Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>	2022-05-05 15:23:48 +02:00
Melledy	e693612ed1	Fix clear command causing a concurrency error	2022-05-05 02:29:43 -07:00
AnimeGitB	3a28e741d0	Add R# LVL# X# arg syntax to GiveCommand	2022-05-05 00:14:17 -07:00
gentlespoon	7d85c53e68	Restrict to MP prop only.	2022-05-05 00:03:42 -07:00
gentlespoon	5c275c2e3c	SetPlayerPropReq Handler and player.setProperty() sanity check.	2022-05-05 00:03:42 -07:00
AnimeGitB	37c2ee5e2c	Command Targeting overhaul fixes	2022-05-05 00:03:10 -07:00
AnimeGitB	d8b2e787e5	Commands Targeting rework	2022-05-05 00:03:10 -07:00
AnimeGitB	5aba7da7ef	Move command prefix stripping to ChatManager	2022-05-05 00:03:10 -07:00
AnimeGitB	82ec63c4e4	[WIP] Command Targeting overhaul	2022-05-05 00:03:10 -07:00
hanbao233xD	4e0ebe56a6	Update CNLanguage.java	2022-05-04 22:57:33 -07:00
hanbao233xD	3f02afb46b	Update CNLanguage.java	2022-05-04 22:57:33 -07:00
hanbao233xD	fb05a3711d	Update CNLanguage.java	2022-05-04 22:57:33 -07:00
Secretboy	a7b9b1f923	Update Config.java	2022-05-04 22:57:06 -07:00
Secretboy	08c01ab15d	Update Grasscutter.java	2022-05-04 22:57:06 -07:00
gentlespoon	6fc4065fa0	Add missing PacketOpcodes.	2022-05-04 22:54:52 -07:00
Angda Song	5a2d25e4eb	Update teleport docs and allow overriding Y coord when teleporting	2022-05-04 14:50:49 -07:00
BaiSugar	2074933e96	Add the god statue's blood return display and stamina system (#520 ) * Fix announcement display * Approaching StatuesOfTheSeven will restore all health of the current team * Added god statue's blood return display and stamina system * fix error fix error * fix file	2022-05-04 11:45:20 -07:00
ShigemoriHakura	aa06583a45	fix achievement proto (#507 ) * fix achievement proto TakeAchievementRewardReq tells client the achievements achieved or not and it's progress. * add import	2022-05-04 10:06:33 -07:00
Akka	48d1e026ef	Add Support of Item Combine (#513 ) * Add Support of Item Combine * Add Support of Item Combine Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>	2022-05-04 10:06:13 -07:00
Angda Song	06983e9e84	Implement map marking features Teleport still exists on fish hook mark. Added mapMark-related protos. Map marking data is stored in players collection.	2022-05-04 10:01:46 -07:00
Scirese	4220b6b88d	Fix CNLanguage.java (#505 ) * Fix CNLanguage.java @Melledy Keep an eye on the file encodeing next time,please. * Update CNLanguage.java * Fix a little bug	2022-05-04 16:56:50 +02:00
EtherealAO	5e0e65123e	Dungeon challenge success/fail notify should only be triggered once (when server spawned mob more than score)	2022-05-04 01:48:56 -07:00
Melledy	3d52964112	Fix equip swapping	2022-05-04 01:45:41 -07:00
Melledy	787f3fd45e	Fix damage number not showing up if it was the killing blow	2022-05-04 01:21:34 -07:00
Melledy	57285885dc	Move languages to languages package	2022-05-04 00:44:33 -07:00
Melledy	1b97b4afa0	Fixed dungeon challenge scoreboard and implement dungeon drops Also fixed a few dungeon script handlers	2022-05-03 23:24:43 -07:00
Melledy	ae31e4fd98	Weapons/artifacts should not have a count of more than 1	2022-05-03 23:24:18 -07:00
Melledy	de75b56d6c	Fix jline in eclipse	2022-05-03 23:24:02 -07:00
Scirese	09125f8e91	Optimize Chinese Translations (#498 ) * Add Chinese Translation * Optimize Chinese Translations * Fix a dumb error	2022-05-03 23:15:04 -07:00
方块君	09b306f6a0	Modify Chinese language files	2022-05-03 22:17:41 -07:00
方块君	e297a29adb	Add some text to language file	2022-05-03 22:17:41 -07:00
方块君	b8f5299995	Optimize multilingualism (using variables) Optimize multilingualism (using variables)	2022-05-03 22:17:41 -07:00
DancingSnow	f6d5fb1945	fix giveart command when times about 200, account will crash	2022-05-03 10:45:11 -07:00
AnimeGitB	29eedb5075	Refactor SetStatsCommand, add target UID and all FightProperty stats	2022-05-03 10:37:32 -07:00
BaiSugar	1288273c12	Approaching StatuesOfTheSeven will restore all health of the current team	2022-05-03 10:24:10 -07:00
mzfqy	c0acf8b1ba	fix path	2022-05-03 10:23:29 -07:00
mzfqy	70507c34c9	add zh_cn translate.	2022-05-03 10:23:29 -07:00
Presiareen	050784dfab	improve server side command line input (#415 ) * improve server side command line input * prevent multiline logs from covering typed commands * reduce text in console * resolve conflicts caused by multilanguage Co-authored-by: Magix <kobedo11@gmail.com>	2022-05-03 14:44:52 +02:00
Melledy	c930c637e4	Add languages folder to config as well	2022-05-03 03:19:43 -07:00
方块君	0eab44f51f	Add multilingual support Add multilingual support	2022-05-03 02:38:37 -07:00
xtaodada	86e6eef4e2	Support giftPackage BatchUse Co-authored-by: pris <lilch1022@hotmail.com>	2022-05-03 02:29:04 -07:00
Melledy	a93d7c579f	Fix extra skill charges being removed if you teleport Close #404	2022-05-03 02:27:18 -07:00
Melledy	7395a268ef	Fix mail not sending to offline players	2022-05-03 02:27:18 -07:00
mingjun97	509f62e7cd	Carry to new line for messages in MessageHandler	2022-05-03 02:16:44 -07:00
mingjun97	0421d912fd	Enable plugins to hook server message response * Add message handler so that the plugin can hook inside the `dropMessage` method for `Player` instance.	2022-05-03 02:16:44 -07:00
krrr	5b6da38160	avoid compile error caused by encoding	2022-05-02 22:05:21 -07:00
xtaodada	b253e779a2	Implement food heal function Co-authored-by: pris <lilch1022@hotmail.com>	2022-05-02 22:02:11 -07:00
KingRainbow44	765f569e55	Initialize `ServerHook`	2022-05-02 21:20:24 -04:00
dogdie233	16f77ee520	Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd	2022-05-02 10:50:08 -07:00
LDA	1d36fd8f2a	load photo mode pose and expression fetters	2022-05-02 10:47:27 -07:00
4Benj_	f7b8d9b45f	Removed debug message and fixed NullPtrException (#434 ) * Removed a debug message from Auth Handler changes Kill me * Also forgot to use the getter :/	2022-05-02 12:47:29 +02:00
mingjun97	a102613313	Utils for gacha history record subsystem * Auto generate mapping files with command `java -jar grasscutter.jar -gachamap` * Static file provider * For gacha record webpage * All static files should be stored at `GRASSCUTTER_RESOURCE/gcstatic/` * Can benefit other subsystem in future when webpages involved	2022-05-02 02:53:28 -07:00
BaiSugar	6a20e383f7	Fix announcement display	2022-05-02 02:50:32 -07:00
xtaodada	7b591a2da0	implement shopMail giftPackage function Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>	2022-05-02 02:50:24 -07:00
Benjamin Elsdon	73fc9fe4cc	Custom Authentication Handler	2022-05-02 02:50:14 -07:00
DancingSnow	186c6bcf89	fix World level not in 0-8	2022-05-02 02:26:11 -07:00
Melledy	fba26d2da9	Fix gacha rate for weapons	2022-05-02 02:01:24 -07:00
Melledy	19396a63c7	Move player mail to MailHandler class This is so we dont have to save the entire player to the db every time we send mail	2022-05-02 02:01:01 -07:00
KingRainbow44	afa8fb7a51	Merge remote-tracking branch 'origin/development' into development	2022-05-01 20:15:27 -04:00
mingjun97	98122f3c55	Implement gacha history record subsystem * Frontend is not very beautiful yet * Didn't include too much `some anime game` data in the page to avoid being DMCA'd	2022-05-01 13:47:17 -07:00
xtaodada	eb703f9f72	Fix goods limit bug	2022-05-01 13:42:01 -07:00
xtaodada	bd560785ba	Show shopmall	2022-05-01 13:42:01 -07:00
筱傑	3cc1139aa1	Add `/setstats mhp` to set Max HP (#407 ) * Fixed `/setstats hp` without changing the max hp. The Max HP should be modified. * Add `/setstats mhp` to set Max HP	2022-05-01 20:22:29 +02:00
JimWails	4adc983832	Fixed can set avatar level more than 90 and cause game to freeze Limit the avatar level given by "/givechar" command. If avatar level >90, the game will freeze if open the character interface.	2022-05-01 10:05:28 -07:00
coooookies	a8b808ba2e	Improve registration methods.	2022-05-01 10:02:57 -07:00
coooookies	dde5a609fb	GameServerPacketHandler need to be added a registration interface for plugin developers	2022-05-01 10:02:57 -07:00
Kinesis	677aa2d2c4	fix McoinExchangeHcoinRsp packet structure	2022-05-01 10:02:47 -07:00
筱傑	b9e27828b8	Fixed can set talent level to 16 bug (#408 ) Level should be lower than 16	2022-05-01 16:42:02 +02:00
4Benj_	0d262e2d07	Cleaned up dispatch iOS fixes (#396 ) * Attempting to fix crashing on iOS devices plus I forgot a thing in string.format * Removed unnecessary things	2022-04-30 23:31:39 -07:00
KingRainbow44	72b5ec210c	Merge remote-tracking branch 'origin/development' into development	2022-05-01 02:14:35 -04:00
mingjun97	049086b21a	Should fix all crashes when login for iOS client	2022-04-30 23:03:47 -07:00
mingjun97	d3ac090daa	Fix crash and revise route * Fix another point which will trigger iOS client to crash * Revise `compareProtocolVersion` route to handle all method	2022-04-30 23:03:47 -07:00
Melledy	10bfb6976d	Change RunMode and DebugMode to enums	2022-04-30 22:52:09 -07:00
Melledy	eac82f3c01	Fix possible exploit with mcoin exchange	2022-04-30 22:51:21 -07:00
Kinesis	da3eb3d26c	implement McoinExchange packet Handler	2022-04-30 22:03:44 -07:00
mingjun97	fb547c17ca	Revert changes for debugging purpose	2022-04-30 21:43:46 -07:00
mingjun97	8b8777e932	Fix crash when login * Prevent email to be `null` to avoid crash in certain client setup.	2022-04-30 21:43:46 -07:00
Melledy	3169e87c60	Fix constellations that give an extra charge to skills Fix #228	2022-04-30 19:34:50 -07:00
KingRainbow44	e898384532	QoL changes	2022-04-30 21:52:30 -04:00
KingRainbow44	a044448af7	Implement a handler for logging routes	2022-04-30 20:38:18 -04:00
muhammadeko	80659f27a8	Add getter for innerclass RegionData	2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo	55793867d3	Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388 )	2022-05-01 00:43:50 +02:00
Magix	be507310a5	Merge branch 'development' into api	2022-04-30 16:22:00 -04:00
Magix	a62520f922	Merge pull request #381 from Coooookies/development Show the player's UID with the `/list` command	2022-04-30 16:16:18 -04:00
Magix	8ce79ed3ca	Forgot to add to null execution	2022-04-30 16:15:39 -04:00
Magix	f4de4a6aeb	Change to `()` and add space	2022-04-30 16:14:40 -04:00
KingRainbow44	86b8f4549f	Merge remote-tracking branch 'origin/api' into api	2022-04-30 16:11:12 -04:00
KingRainbow44	b5c277234c	Move join & quit to player event	2022-04-30 16:11:00 -04:00
Magix	63d41fd79e	Merge branch 'development' into api	2022-04-30 16:07:54 -04:00
KingRainbow44	f73a713fac	Create player creation event & move join event to player	2022-04-30 16:07:12 -04:00
coooookies	ba97dfe7d9	Uids will not be showed until the parameter <uid> is added, like this: /list uid	2022-05-01 03:43:41 +08:00
LDA	d133e55666	Implement viewing character details in character showcase	2022-04-30 10:49:45 -07:00
Benjamin Elsdon	28025a8198	Small fix	2022-05-01 00:51:09 +08:00
Benjamin Elsdon	947d3e5745	Complete rework of Dispatch, Added DebugMode	2022-05-01 00:30:56 +08:00
coooookies	c0b7859f93	List command should show player uid	2022-05-01 00:17:08 +08:00
赤座あかり	eac9c04e4e	Give Artifact: Fix error & Rename alias (#370 ) * Give Artifact: Fix error & Rename alias * Update README.md	2022-04-30 13:19:22 +02:00
Aru	d6fa05915f	Monsters should drop items in world (#373 ) * Monsters should drop items in world fix the typo introduced in `f1934c3a47` * Determine whether in dungeon scene	2022-04-30 13:18:09 +02:00
筱傑	7b991d7b4e	Update Welcome Mail Items Type (#369 )	2022-04-30 11:46:23 +02:00
Scirese	fb991d845e	Add Android Client fix by @BaiSugar (#105 )	2022-04-30 11:45:24 +02:00
omg-xtao	23800745e2	Merge branch 'development' into tp	2022-04-30 16:48:24 +08:00
lhhxxxxx	eef216aea8	Update Account.hasPermission() Add wildcard characters to permission nodes under the same namespace. (simple implementation)	2022-04-30 01:30:38 -07:00
Melledy	286ab545e9	Monsters should not drop items inside dungeons	2022-04-30 01:20:44 -07:00
Melledy	7e377dff59	Implement script region check	2022-04-30 01:20:44 -07:00
Melledy	1ed46df6e8	Move script constants to globals	2022-04-30 01:20:44 -07:00
Melledy	3f76ac4cac	Temporary fix for scripts that call require	2022-04-30 01:20:44 -07:00
Melledy	f8f4d89cd0	Optimize GetOnlinePlayerListRsp	2022-04-30 01:20:44 -07:00
Melledy	66c2743d6e	Update how scene/dungeon map points are handled	2022-04-30 01:20:44 -07:00
lhhxxxxx	c2b8a20e03	Update GiveAllCommand.java giveall command nomore give arts	2022-04-30 01:04:10 -07:00
筱傑	d8e458cd33	Fix Give Command Promote Level Bug Should be <=40, just change the order	2022-04-30 01:02:39 -07:00
muhammadeko	8a9dab7d74	Give Artifact: Clear random props first before adding all picked props	2022-04-29 17:11:12 -07:00
KingRainbow44	4db1724d06	Merge branch 'development' into api # Conflicts: # src/main/java/emu/grasscutter/Grasscutter.java	2022-04-29 19:31:33 -04:00
lilmayofuksu	59ff79e23a	Limit the amount of vehicles that a player can spawn (#340 )	2022-04-29 21:01:07 +02:00
BaiSugar	7e6b20de1a	Added interface display for multiplayer games (#360 )	2022-04-29 18:20:46 +02:00
赤座あかり	79165aa402	Add command to get reliquary with specific props (#300 )	2022-04-29 16:31:22 +02:00
omg-xtao	7fdf74986c	Merge branch 'development' into tp	2022-04-29 21:38:45 +08:00
真心	48aea3f5e4	Add 'refinement' option to 'give' command	2022-04-29 15:20:28 +02:00
真心	d0ccc48642	Add 'refinement' option to 'give' command	2022-04-29 15:20:28 +02:00
真心	9892cd8480	Delete GiveWeaponCommand.java	2022-04-29 15:20:28 +02:00
真心	2d04758f1c	Add GiveWeaponCommand	2022-04-29 15:20:28 +02:00
xtaodada	eaed1aa038	Change NickName to ServerNickname	2022-04-29 19:37:51 +08:00
yangjiahao	e1c0b4a955	改进了clear命令的逻辑，使他在不输入uid时默认为当前玩家。	2022-04-29 13:07:30 +02:00
memetrollsXD	352801b8a3	Merge pull request #344 from BaiSugar/development Command giveall to remove useless items	2022-04-29 13:04:25 +02:00
LDA	c67e324a2e	Fix sitting in chairs	2022-04-29 12:59:50 +02:00
xtaodada	62f0be4966	Support custom server in-game nickname	2022-04-29 18:59:24 +08:00
memetrollsXD	2f39aff4a6	Merge pull request #355 from Grasscutters/dungeon-scripts Implemented Dungeon Support	2022-04-29 12:58:01 +02:00
Melledy	6d98743025	Prevent console error spam when attacking gadgets	2022-04-29 03:33:14 -07:00
Melledy	d877d7eebc	Remove player from challenge if they are leaving the scene	2022-04-29 03:24:36 -07:00
Melledy	cb15a5dec9	Deregister scenes if no one is in them instead of deregistering when no entities are in them	2022-04-29 03:09:17 -07:00
Melledy	ffc1f801e6	Implement spawning monsters by suite	2022-04-29 03:06:33 -07:00
xtaodada	0136425628	Support custom server avatar	2022-04-29 18:04:20 +08:00
xtaodada	74ad63573a	Support Teleport from console	2022-04-29 17:53:42 +08:00
Melledy	ae3d9a4dc1	Add a few more functions for the script engine to call	2022-04-29 02:38:25 -07:00
muhammadeko	789e5f57b8	skip loading module-info.class	2022-04-29 02:32:35 -07:00
Melledy	1a5d4cf466	Implement lazy loading of scripts when they enter a new block	2022-04-29 02:07:25 -07:00
Melledy	3af5d20473	Prevent weird crashing if there was an error loading scripts	2022-04-29 01:15:40 -07:00
Melledy	14b6d3ce55	Fix monster levels in dungeons	2022-04-29 01:03:16 -07:00
Melledy	d690590ecf	Implement AddExtraGroupSuite	2022-04-29 00:52:40 -07:00
Melledy	72e9a21ce3	Allow the player to finish dungeons	2022-04-29 00:49:05 -07:00
Melledy	8ab2b446cd	Clean script events	2022-04-29 00:00:23 -07:00
BaiSugar	1bd8d871bb	remove useless items	2022-04-29 14:18:32 +08:00
BaiSugar	76098cdb71	remove useless items	2022-04-29 14:13:09 +08:00
Melledy	30886da0ad	Fix compile error caused by merge	2022-04-28 23:09:07 -07:00
Melledy	60cfa40d7f	Merge branch 'development' into dungeon-scripts	2022-04-28 22:21:26 -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
KingRainbow44	d359e5111a	Player events + mail receive event	2022-04-28 22:21:55 -04:00
KingRainbow44	d701613831	Formatting changes	2022-04-28 22:21:30 -04:00
KingRainbow44	e666dede7e	Move events (imports)	2022-04-28 22:13:19 -04:00
KingRainbow44	68cc386baa	Move events	2022-04-28 22:12:57 -04:00
KingRainbow44	9d9c6566ed	Player join & quit event	2022-04-28 22:12:41 -04:00
KingRainbow44	dc26f9e232	Add plugin data folders	2022-04-28 22:01:40 -04:00
KingRainbow44	91a2a55ed9	Bug fixes & class updates	2022-04-28 21:54:51 -04:00
KingRainbow44	694b5c1548	Merge branch 'development' into api	2022-04-28 21:53:58 -04:00
memetrollsXD	31764fe5d9	Merge branch 'development' into startMail	2022-04-28 22:45:23 +02:00
memetrollsXD	5c02fee7e2	Customisable welcome mail	2022-04-28 22:42:59 +02:00
Kengxxiao	fcb4894387	fix shop config issue	2022-04-28 13:30:50 -07:00
Kengxxiao	275fcc7dd6	shop improvement	2022-04-28 13:30:50 -07:00
Kengxxiao	0559cc4e0b	official shop support	2022-04-28 13:30:50 -07:00
Kengxxiao	027bd28afb	Add command /coop and /tpall	2022-04-28 21:23:20 +02:00
ayy lmao	0c02ce9f63	Implement HandlerVehicleInteractReq & Rsp and HandlerVehicleSpawnReq & Rsp Also added opcodes related to vehicles, added LODPatternName to GadgetData and added EntityVehicle class	2022-04-28 21:21:08 +02:00
omg-xtao	31b0dd30e2	Ignore item not found error	2022-04-28 08:43:17 -07:00
Melledy	53cc1822f6	Implement dungeon entry	2022-04-28 08:20:37 -07:00
Kengxxiao	9133742eb0	fix companionship exp my IDEA lint is not happy on my change	2022-04-28 06:50:37 -07:00
Kengxxiao	7bacd8ab70	do not save virtual item	2022-04-28 06:50:37 -07:00
Kengxxiao	ed98ab152d	fix exp drop issue	2022-04-28 06:50:37 -07:00
BaiSugar	a5601e8409	Update the command format of the usage (including source code)	2022-04-28 13:47:32 +02:00
Melledy	9d75c25085	Fix missing player tick function	2022-04-27 19:37:25 -07:00
Melledy	d3925e8c6e	Merge pull request #318 from Yazawazi/development Implementing the `Player Show Avatars`	2022-04-27 15:50:53 -07:00
memetrollsXD	96dbc2fbfd	God damn forgot I was in java for a sec	2022-04-27 15:42:25 -07:00
memetrollsXD	b80b8aedd9	Remove default permissions from account command	2022-04-27 15:42:25 -07:00
memetrollsXD	eaf2982ebc	Apply to account command	2022-04-27 15:42:25 -07:00
memetrollsXD	0c665d940e	Add default permissions	2022-04-27 15:42:25 -07:00
Yazawazi	0cbfcddae4	Should be OK	2022-04-28 06:40:25 +08:00
memetrollsXD	28a0844860	God damn forgot I was in java for a sec	2022-04-28 00:30:04 +02:00
memetrollsXD	8d332614b7	Remove default permissions from account command	2022-04-28 00:28:16 +02:00
memetrollsXD	90df06edd7	Apply to account command	2022-04-28 00:18:59 +02:00
memetrollsXD	5e9f497614	Add default permissions	2022-04-28 00:10:46 +02:00
Yazawazi	02ce62422f	kill me plz	2022-04-28 03:46:24 +08:00
Yazawazi	982cbbe5d2	no headimage okay	2022-04-28 03:45:17 +08:00
Yazawazi	e55160dad6	Headimage	2022-04-28 03:40:32 +08:00
Yazawazi	363dae9fa6	Next time I'll never use github.dev again	2022-04-28 03:37:09 +08:00
Yazawazi	9092c9b3f9	import	2022-04-28 03:31:36 +08:00
Yazawazi	f16d33b413	Player show avatar list	2022-04-28 03:21:51 +08:00
Melledy	f6db39926d	Fix co-op requests not showing up	2022-04-27 11:23:33 -07:00
Melledy	10e5851a59	Add message about the server being free	2022-04-27 11:23:33 -07:00
Melledy	555937d2aa	Fixed concurrency issue in killall	2022-04-27 11:23:33 -07:00
Melledy	8bf17a8bdc	Fixed genesis crystals not being given to player	2022-04-27 11:23:33 -07:00
Melledy	1586bab5d7	Gacha banner tweaks Removed min/maxItemType Added configurable base weight values for banners	2022-04-27 11:23:33 -07:00
Melledy	1130138a4f	Fix internal server error when changing characters	2022-04-27 11:23:33 -07:00
KingRainbow44	d32f706cf3	Merge branch 'development' into api # Conflicts: # src/main/java/emu/grasscutter/plugin/api/ServerHook.java	2022-04-27 14:05:34 -04:00
Yazawazi	2ba16cf8b2	comment & mooncard	2022-04-27 08:42:48 -07:00
Yazawazi	32d322b0be	onEnable & onDisable	2022-04-27 08:42:48 -07:00
Yazawazi	5b6ecc7219	Task Improvement	2022-04-27 08:42:48 -07:00
Kengxxiao	669e58d9f3	Merge branch 'development' into dev-feature-drop	2022-04-27 22:54:59 +08:00
Kengxxiao	ee3a0c32fc	use better shop config structure	2022-04-27 07:35:31 -07:00
Kengxxiao	3e0ccbbbde	implement npc shop	2022-04-27 07:35:31 -07:00
ayy lmao	0e3a80407e	Added missing isGiftMail section to GetAllMailRsp	2022-04-27 15:11:57 +02:00
Kengxxiao	57e408012b	reset drop table in reload command	2022-04-27 17:44:12 +08:00
Kengxxiao	8b614d8df8	implement simple drop system	2022-04-27 17:42:02 +08:00
Magix	d19bc12761	Update Grasscutter.java why do i have to fix stable	2022-04-27 11:33:36 +02: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
Melledy	6b8902bee2	Deprecate getServer() in DispatchServer, use getHttpServer() instead	2022-04-26 21:27:35 -07:00
Melledy	9afa32928a	Cleanup https server creation in dispatch server	2022-04-26 21:27:35 -07:00
Melledy	cdb08195ee	Fix cherry pick issues from drown packets	2022-04-26 21:27:35 -07:00
TheLostTree	a0ed13182c	git doesnt like me	2022-04-26 21:27:35 -07:00
TheLostTree	687bc7ce87	drowning added	2022-04-26 21:27:35 -07:00
Melledy	d81895543f	Call PacketItemAddHintNotify from addItem	2022-04-26 21:27:35 -07:00
Melledy	4420918f9c	Rename handler	2022-04-26 21:27:35 -07:00
Melledy	7cf0e448cd	World level updates without needing to restart	2022-04-26 21:27:35 -07:00
Melledy	9b7293272b	Fix white screen after logging in	2022-04-26 21:27:35 -07:00
KingRainbow44	47d8fd3c43	Add `get` methods to the server hook	2022-04-26 21:24:37 -04:00
KingRainbow44	d4f9820e44	Added getting resources from the JAR	2022-04-26 21:24:09 -04:00
Benjamin Elsdon	cebc140228	GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions	2022-04-27 09:03:26 +08:00
KingRainbow44	f3061a366e	gave up, Pass class as argument to constructor	2022-04-26 20:54:56 -04:00
KingRainbow44	ae6a6abcd1	woo back to generics	2022-04-26 20:47:45 -04:00
KingRainbow44	749293350d	Add dispatch to server hook & create instance	2022-04-26 20:47:28 -04:00
Benjamin Elsdon	0917f516ea	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-27 08:41:10 +08:00
Benjamin Elsdon	ed3f88f013	Removed debug messages, readded protos, fixed gradle	2022-04-27 08:36:13 +08:00
KingRainbow44	88bdaf155f	Use a custom consumer instead of the built-in one	2022-04-26 20:28:13 -04:00
KingRainbow44	993255235e	Fix handler invocation	2022-04-26 19:58:03 -04:00
KingRainbow44	0e514b9002	Fix handler creation	2022-04-26 19:57:32 -04:00
Melledy	2935f0a6d3	Merge pull request #270 from Yazawazi/development Add `bless of moon` feature	2022-04-26 16:39:57 -07:00
Benjamin Elsdon	b9f7c657ac	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-27 07:37:05 +08:00
Yazawazi	aa4b88d762	cron expression comments	2022-04-27 07:19:30 +08:00
Yazawazi	e8b34b6179	comments del	2022-04-27 07:14:02 +08:00
Yazawazi	ac796675f2	comments	2022-04-27 07:08:33 +08:00
Yazawazi	420f544d68	DateHelper	2022-04-27 07:01:05 +08:00
Magix	71524b0b66	Merge pull request #178 from BaiSugar/development Added command to get all items	2022-04-26 18:45:08 -04:00
Yazawazi	aab6627203	del outerclass	2022-04-27 06:25:00 +08:00
Yazawazi	49854e4514	utils	2022-04-27 06:15:59 +08:00
Yazawazi	43470a384d	date helper	2022-04-27 06:12:35 +08:00
Yazawazi	748e64a60c	Moon Card	2022-04-27 06:04:21 +08: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
KingRainbow44	46d897ac92	Fix handlers	2022-04-26 14:09:00 -04:00
KingRainbow44	35ff35039b	Fix Javadoc & Update version	2022-04-26 14:08:48 -04:00
KingRainbow44	82bca7a612	Overhaul event handling (designed by WetABQ#3417)	2022-04-26 13:52:10 -04:00
Magix	627a2f1ee8	Merge branch 'api' into development	2022-04-26 11:17:02 -04:00
Magix	fe055af5e0	Merge pull request #262 from exzork/plugin-system load all classes from plugin	2022-04-26 10:27:36 -04:00
muhammadeko	9fb5b69ddd	load all classes from plugin	2022-04-26 19:45:23 +07:00
BaiSugar	3c5f3d4157	remove test avatar	2022-04-26 16:35:06 +08:00
Benjamin Elsdon	3db1a86609	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-26 15:45:58 +08:00
KingRainbow44	e27bdd9bb6	Add more events	2022-04-26 02:07:00 -04:00
KingRainbow44	502fe7ed13	Reimplement the region list event	2022-04-26 00:45:42 -04:00
KingRainbow44	e681453a15	Begin on plugin API	2022-04-26 00:39:43 -04:00
KingRainbow44	d23050ffa5	Bug fix & Cleanup	2022-04-26 00:39:30 -04:00
KingRainbow44	2369f92cb4	Fix command issue	2022-04-26 00:39:05 -04:00
KingRainbow44	03988414ce	Refactor classes	2022-04-26 00:04:03 -04:00
Benjamin Elsdon	a2069c0084	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-26 11:59:16 +08:00
Benjamin Elsdon	a5677a8e34	Improvements and send all mail fix Mail ID no longer exists and is handled by it's position in the mail array	2022-04-26 11:57:55 +08:00
Melledy	b2f1142116	Add getter for DispatchServer's HttpServer	2022-04-25 14:34:37 -07:00
Melledy	614477181f	Fix concurrency related error while spawning monsters	2022-04-25 14:28:45 -07:00
Melledy	2228332f9d	Call checkSpawns from World instead of from Player	2022-04-25 14:28:45 -07:00
Melledy	c3f9fd3ce3	Synchronize scene entity map	2022-04-25 14:28:45 -07:00
Melledy	1c691748f5	Make monsters scale off world level	2022-04-25 14:28:45 -07:00
Melledy	f28f21b061	Dont deregister scenes if the player is going to tp back into them	2022-04-25 14:28:44 -07:00
Melledy	711e6eabd0	Natural spawn test (without luas)	2022-04-25 14:28:44 -07:00
Magix	dce13cf6af	Merge branch 'development' into plugin-system	2022-04-25 17:08:18 -04:00
xtaodada	b6fedcf262	Support kill from console	2022-04-25 11:01:18 -07:00
xtaodada	dc6702eb5c	Add a new alias to the command `killcharacter`	2022-04-25 11:01:18 -07:00
xtaodada	00a40a84bb	Add killcharacter command	2022-04-25 11:01:18 -07:00
alt3ri	5dd5f70903	Merged /clearartifacts and /clearweapons I merged ClearArtifactsCommand and ClearWeaponsCommand to ClearCommand with UID parameter. Still no send from console cuz I forgor 💀 Usage: /clear <wp \| art \| mat \| all> [uid]	2022-04-25 11:00:10 -07:00
alt3ri	56eb711055	Delete ClearArtifactsCommand.java	2022-04-25 11:00:10 -07:00
alt3ri	c1ef679e30	Delete ClearWeaponsCommand.java	2022-04-25 11:00:10 -07:00
Benjamin Elsdon	c68c75e8ce	Send Mail Command! Almost done! Wooooo!	2022-04-25 21:53:10 +08:00
Benjamin Elsdon	e30352a667	Forgot to implement levels into GetMailItemRsp Also added promoteLevels	2022-04-25 16:42:56 +08:00
Benjamin Elsdon	3f11cc41b2	More weird git stuff	2022-04-25 16:32:26 +08:00
Benjamin Elsdon	b29bcb553a	Weird git stuff	2022-04-25 16:25:33 +08:00
Benjamin Elsdon	c4de030496	Added ChangeMailStarNotify (change importance level)	2022-04-25 16:23:23 +08:00
Benjamin Elsdon	8d427f2317	Mail read notify	2022-04-25 16:23:23 +08:00
Benjamin Elsdon	67b4c274ec	Deleting mail + a bit of cleanup	2022-04-25 16:23:22 +08:00
Benjamin Elsdon	9bf94f9539	Receiving items in mail	2022-04-25 16:22:13 +08:00
Benjamin Elsdon	a548fe6c52	THE MAILBOX ACTUALLY WORKS CORRECTLY NOW	2022-04-25 16:22:12 +08:00
Benjamin Elsdon	29a3e64db0	Java-16 compatiable mail system (whoops)	2022-04-25 16:22:12 +08:00
Benjamin Elsdon	69779a0321	Added database support for mail Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file	2022-04-25 16:22:12 +08:00
Benjamin Elsdon	e24de95d29	Added GetMailItemReq/Rsp & PacketMailChangeNotify Mail still doesn't work for whatever reason. I also added a temporary SendMailCommand just to receive PacketMailChangeNotify. I feel like I'm about to lose my mind.	2022-04-25 16:18:23 +08:00
Benjamin Elsdon	346652cf5b	Initial work on mail	2022-04-25 16:18:23 +08:00
Benjamin Elsdon	3787cfad59	Added ChangeMailStarNotify (change importance level)	2022-04-25 16:11:57 +08:00
Melledy	d9e1ed5083	Merge branch 'stable' into development	2022-04-25 00:58:53 -07:00
Asnxthaony	480374fb39	fix indent by using smart tabs	2022-04-25 00:54:11 -07:00
Asnxthaony	4e5d72a99a	sanity check	2022-04-25 00:54:11 -07:00
Asnxthaony	122568ad27	fix SetPlayerBirthdayRsp	2022-04-25 00:54:11 -07:00
Benjamin Elsdon	4c7bd69eb0	Mail read notify	2022-04-25 15:41:18 +08:00
BaiSugar	c6bd1fa5d4	remove test avatar	2022-04-25 15:17:55 +08:00
Benjamin Elsdon	721d8b7223	Deleting mail + a bit of cleanup	2022-04-25 14:30:56 +08:00
Benjamin Elsdon	785effe8da	Receiving items in mail	2022-04-25 13:51:19 +08:00
Yan	2238a7c3aa	fix setting electro dmg stat	2022-04-24 17:57:42 -07:00
alangy98	21b3ac103a	Revert "bugfix: portbind error when falling back to http server" This reverts commit `4817ed9c52`. the bugfix is inappropriate	2022-04-24 17:57:18 -07:00
alt3ri	4837ccb983	Added UID parameter Now you can delete other player's weapons with UID Usage: /clearwp [uid]	2022-04-24 17:56:49 -07:00
Yazawazi	5010b8ac75	add setfriendship aliases	2022-04-24 10:32:47 -07:00
Alangy	4817ed9c52	bugfix: portbind error when falling back to http server	2022-04-24 23:05:08 +08:00
BaiSugar	1c15dd3c32	fix	2022-04-24 22:49:33 +08:00
BaiSugar	5eeea84f8e	Corrected format	2022-04-24 22:46:43 +08:00
BaiSugar	885e2d078c	Corrected format	2022-04-24 22:45:30 +08:00
BaiSugar	f3d561cd06	Revert "Corrected format" This reverts commit `60319ee9eb`.	2022-04-24 22:42:44 +08:00
BaiSugar	60319ee9eb	Corrected format	2022-04-24 22:38:53 +08:00
Melledy	929bb38f2e	Merge pull request #180 from Yazawazi/development Fix the property prompt issue in fetter system	2022-04-24 07:21:34 -07:00
Melledy	edd0bccf5a	Merge pull request #167 from memetrollsXD/development Try to fix "No SSL cert found bind exception"	2022-04-24 07:16:05 -07:00
BaiSugar	0796957751	Added command to get all items	2022-04-24 21:52:50 +08:00
Benjamin Elsdon	94a75cf903	THE MAILBOX ACTUALLY WORKS CORRECTLY NOW	2022-04-24 19:06:52 +08:00
memetrollsXD	8066b16417	Add .vscode to gitignore and use @fumbling644o's implementation	2022-04-24 12:24:41 +02:00
Benjamin Elsdon	f556bff333	Java-16 compatiable mail system (whoops)	2022-04-24 18:17:08 +08:00
Benjamin Elsdon	c25e809f5c	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-24 18:01:32 +08:00
Yazawazi	23f0406b57	command fix too	2022-04-24 15:10:25 +08:00
Yazawazi	5c0c4fe67e	Merge branch 'Grasscutters:development' into development	2022-04-24 15:03:58 +08:00
Melledy	b6d8dd0db4	Merge pull request #175 from omg-xtao/suicide GodMode command supports playerId	2022-04-24 00:03:21 -07:00
Yazawazi	8d8866aa63	Fix fetter system	2022-04-24 15:02:31 +08:00
BaiSugar	02ef9d84c7	Added command to get all items	2022-04-24 14:01:03 +08:00
Yazawazi	56a1ab64ab	Player Level Reward Update Notify Support!	2022-04-24 13:22:26 +08:00
xtaodada	2f5ae6c784	GodMode command supports playerId	2022-04-24 11:40:10 +08:00
Yazawazi	b2840b1740	Player level reward	2022-04-24 11:25:13 +08:00
memetrollsXD	79d646d358	Remove last catch and init another variable as placeholder	2022-04-24 04:50:22 +02:00
memetrollsXD	bed3181252	Forgot the toCharArray	2022-04-24 04:41:06 +02:00
memetrollsXD	2045dd2832	Notify user that new pw was used	2022-04-24 04:36:11 +02:00
memetrollsXD	8f81195336	Try to fix "No SSL cert found bind exception"	2022-04-24 04:34:17 +02:00
Melledy	81ee9a00a2	Merge pull request #164 from miyucchi/development Fix counter (Create a new account if exists issue)	2022-04-23 15:26:14 -07:00
Melledy	7a4de2f0d6	Merge pull request #128 from memetrollsXD/development Use count for level for equips (dev branch)	2022-04-23 15:15:22 -07:00
Miyucchi	7792c5c73f	Fix counter	2022-04-24 00:10:26 +02:00
Yazawazi	9e523da18e	tp with relative coordinates	2022-04-24 05:20:59 +08:00
Yazawazi	0c4d975409	Merge branch 'Grasscutters:development' into development	2022-04-24 05:03:55 +08:00
memetrollsXD	fd1890b072	Merge branch 'Grasscutters:development' into development	2022-04-23 22:37:48 +02:00
xtaodada	2dd8932144	Add Teleport command	2022-04-24 03:10:07 +08:00
Yazawazi	3baef42aac	Name Card Done!!!!!!!!!!!	2022-04-23 23:48:06 +08:00
Benjamin Elsdon	9e7c9f4670	Merge remote-tracking branch 'upstream/development' into dev-mail	2022-04-23 23:07:38 +08:00
Benjamin Elsdon	cb03b654bc	Added database support for mail Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file	2022-04-23 23:07:18 +08:00
Yazawazi	ad1c3f9a3b	Will	2022-04-23 22:16:59 +08:00
Yazawazi	aa4489497e	Merge branch 'Grasscutters:development' into development	2022-04-23 22:16:21 +08:00
memetrollsXD	57e3637251	Add promoteLevel and count	2022-04-23 16:11:45 +02:00
xtaodada	301d0a174c	Add another way to set talent level	2022-04-23 21:13:45 +08:00
Yazawazi	3bc249f042	Try to give name card	2022-04-23 21:03:29 +08:00
Yazawazi	042bdc2ff2	Merge branch 'Grasscutters:development' into development	2022-04-23 19:58:17 +08:00
Melledy	9fab2682ee	Merge pull request #153 from TheLostTree/main Handle drowning	2022-04-23 04:39:02 -07:00
Melledy	16a7c9dd67	Revert "Drowning packets handled"	2022-04-23 04:36:34 -07:00
TheLostTree	3d9b71dc4d	git doesnt like me	2022-04-23 03:32:08 -07:00
TheLostTree	91894380cb	drowning added	2022-04-23 03:19:33 -07:00
Jaida Wu	3eabd40345	Make some control panel happy Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-23 16:47:13 +08:00
Melledy	df1dca8d87	Merge pull request #141 from Grasscutters/bind-failure Push a helpful error message to the console on bind failure	2022-04-23 01:14:51 -07:00
Jaida Wu	cd08c52b35	Fix PlayerBirthday exception Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-23 15:39:56 +08:00
KingRainbow44	8afcc0b89a	Add message for bind failure (HTTP)	2022-04-23 02:20:18 -04:00
KingRainbow44	832c460a83	Implement packet send/receive events	2022-04-23 02:08:31 -04:00
KingRainbow44	600decbc09	Implement region events	2022-04-23 01:59:06 -04:00
KingRainbow44	6056e962d6	Implement an event handler	2022-04-23 01:58:37 -04:00
KingRainbow44	7a3fbcdcf7	Plugin enabling & disabling	2022-04-23 01:17:35 -04:00
KingRainbow44	3ba8c42b42	Merge `origin/development` into `plugin-system`	2022-04-23 00:55:31 -04:00
KingRainbow44	15da839503	Update Grasscutter for Java 16 & Plugins	2022-04-23 00:53:11 -04:00
Melledy	a957379afb	Merge pull request #131 from Raeliana/patch-1 Create ClearWeaponsCommand.java	2022-04-22 21:36:52 -07:00
Melledy	02c852716a	Merge pull request #136 from miyucchi/development Save birthday date	2022-04-22 21:35:58 -07:00
Melledy	3ed6a99445	Merge pull request #127 from yarik0chka/development Implemented sitting	2022-04-22 21:34:36 -07:00
Magix	0992fc11b4	Add keystore password	2022-04-22 23:53:37 -04:00
Yazawazi	5ea5ea238c	OpenCond for unlocking judgment	2022-04-23 10:51:22 +08:00
Yazawazi	b11009f724	Merge branch 'Grasscutters:development' into development	2022-04-23 10:43:27 +08:00
Melledy	716380a078	Merge branch 'development' into java-16	2022-04-22 19:23:32 -07:00
KingRainbow44	e3d6b86dd9	Basic plugin manager	2022-04-22 21:45:44 -04:00
Miyucchi	539970fd50	Feature: SetBirthdayDate	2022-04-23 03:29:08 +02:00
Miyucchi	7fd0b371d0	Profile set birthday feature	2022-04-23 03:22:32 +02:00
KingRainbow44	1a056d2d13	Move manifest to resources	2022-04-22 20:42:55 -04:00
Raeliana	cdf6c697f1	Create ClearWeaponsCommand.java A command to clear unlocked and unequipped artifacts	2022-04-23 02:48:04 +03:00
Melledy	dffffc8d49	Merge branch 'stable' into development	2022-04-22 16:34:41 -07:00
Yazawazi	7ccecda07c	AvatarFetterLevelReward	2022-04-23 06:08:37 +08:00
memetrollsXD	a52eaf9bbc	Use count for level for equips	2022-04-22 23:19:58 +02:00
PasserbyAlpha	6cc0fdaeed	use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o]	2022-04-23 02:28:34 +08:00
yarik0chka	3ca181e76d	Implemented sitting	2022-04-22 23:24:51 +05:00
xtaodada	4605c6506e	Add PublicPort field to server	2022-04-23 01:42:04 +08:00
Yazawazi	48db644692	command fix	2022-04-23 01:36:48 +08:00
xtaodada	104d10352b	Add PublicPort field to Dispatch server	2022-04-23 01:16:55 +08:00
Yazawazi	eb70904660	setfetterlevel command	2022-04-22 23:46:24 +08:00
PasserbyAlpha	68218cbb49	fixed encoding problem when generating gm handbook	2022-04-22 23:11:29 +08:00
Yazawazi	159b10af72	AvatarFetterLevel	2022-04-22 22:27:40 +08:00
Jaida Wu	e02917a527	Add FrontHTTPS field to Dispatch server Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 21:25:58 +08:00
Melledy	9b23bfa556	Revert "Explicitly load and save UTF-8 for the handbook" This reverts commit `215ee2a3b2`.	2022-04-22 05:20:02 -07:00
Melledy	f4f8a86a8c	Merge pull request #113 from 01101sam/patch-1 [typo] Fix resources folder tips	2022-04-22 04:38:04 -07:00
Melledy	acd59d1788	Merge pull request #114 from alt3ri/development Added /talent command	2022-04-22 04:35:10 -07:00
Melledy	95c6b9486d	Merge pull request #108 from fumbling644o/development GM handbook: Explicitly load and save UTF-8	2022-04-22 04:33:05 -07:00
Benjamin Elsdon	a326581efd	Added GetMailItemReq/Rsp & PacketMailChangeNotify Mail still doesn't work for whatever reason. I also added a temporary SendMailCommand just to receive PacketMailChangeNotify. I feel like I'm about to lose my mind.	2022-04-22 19:02:05 +08:00
alt3ri	63898a18df	Deleted 2 lines	2022-04-22 17:38:58 +07:00
alt3ri	370483fae2	Added /talent command Set current character talent level by using /talent command. > /talent getid - Gets current character talent ID > /talent set <talent ID> <level> - Sets current character's talent level	2022-04-22 17:28:52 +07:00
Sam	2aaf70c031	[typo-upd] Add missing folder	2022-04-22 17:43:06 +08:00
Sam	b629e8c652	[typo] Fix resources folder tips	2022-04-22 17:36:24 +08:00
Benjamin Elsdon	04a85d1ebb	Initial work on mail	2022-04-22 15:52:31 +08:00
fumbling	215ee2a3b2	Explicitly load and save UTF-8 for the handbook This fixes potential output issues for non-Latin scripts when exporting the handbook by changing the filename in the code.	2022-04-22 02:32:27 -04:00
Benjamin Elsdon	46b527df4d	Log files	2022-04-22 13:05:06 +08:00
Magix	1cf1a951dd	Merge pull request #94 from Yazawazi/development Try to show characters' stories and voices	2022-04-21 23:12:02 -04:00
Yazawazi	123fc263ba	cache fetters	2022-04-22 10:39:25 +08:00
fumbling	06101f1b9c	Morphia call fixes; add `@Entity` to more classes 1. During the conversion of Morphia calls to the new API, some of the `Filter.eq()` calls had their `field` set to `playerId` due to a copy/paste typo. 2. Morphia 2 switches to the codec system, so anything that will be serialized in the pipeline requires the `@Entity` annotation.	2022-04-21 22:19:47 -04:00
fengyuecanzhu	b31dab04eb	change fhp to heal	2022-04-22 08:45:46 +08:00
Yazawazi	376c668dd9	no more NullPointerException pls	2022-04-22 08:30:02 +08:00
fengyuecanzhu	ff778914cb	remove revive command	2022-04-22 08:26:48 +08:00
fengyuecanzhu	28db79876b	add fullfp command	2022-04-22 08:08:47 +08:00
Yazawazi	2350f0ebe2	ee, forget to change variables when copying from local	2022-04-22 07:49:35 +08:00
Yazawazi	044c2a3086	typo	2022-04-22 07:42:17 +08:00
Yazawazi	eedab79253	fetter try	2022-04-22 07:37:25 +08:00
Melledy	16318b3793	Merge pull request #74 from 4Benj/development Server run modes and multi-server dispatch support	2022-04-21 15:06:57 -07:00
Melledy	04791b68be	Refactor Revive Command + fix syntax error No idea how I missed the syntax error while reviewing	2022-04-21 14:47:04 -07:00
Melledy	e884970ac4	Merge branch 'development' into account-fix	2022-04-21 14:46:07 -07:00
Melledy	58535dd1ce	Save config everytime you load so the new options show up	2022-04-21 14:44:55 -07:00
Melledy	db1c4cd462	Merge pull request #88 from alt3ri/development Added /revive command	2022-04-21 14:05:09 -07:00
Melledy	e10bad5b17	Fix account dupe key error after selecting starting character	2022-04-21 14:02:17 -07:00
alt3ri	abe05a9b5d	Added /revive command Now it's more convenient to revive character without food :>	2022-04-22 02:28:52 +07:00
Melledy	c8100394d9	Merge pull request #86 from alt3ri/patch-7 Fix typo	2022-04-21 11:47:30 -07:00
Melledy	4431469334	Merge pull request #84 from yarik0chka/development Add a changing weather id	2022-04-21 11:47:13 -07:00
Yazawazi	069cb1c6d3	Teleport Small Fix	2022-04-22 02:23:02 +08: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
yarik0chka	0480f10a1a	Add a changing weather id	2022-04-21 22:21:24 +05:00
Benjamin Elsdon	23caf994c7	Forgot a dispatch prefix on error while merging	2022-04-22 01:15:05 +08:00
Benjamin Elsdon	9eca5123a5	Merge remote-tracking branch 'upstream/development' into development	2022-04-22 01:04:03 +08:00
Melledy	0e7976f906	Merge pull request #78 from MlgmXyysd/dispatch-refactor Refact dispatch server	2022-04-21 09:03:53 -07:00
Jaida Wu	54856147ef	Listens to all addresses by default Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:02:03 +08:00
Jaida Wu	d11413c017	Add dispatch server log prefix Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:02:02 +08:00
Jaida Wu	1143886b09	Add some log to dispatch server Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:02:00 +08:00
Jaida Wu	12674f6cec	Fallback to HTTP if no SSL cert Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:01:59 +08:00
Jaida Wu	23226ad464	Refact code Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-22 00:01:54 +08:00
Melledy	dccee2dfde	Merge pull request #77 from xmplay/patch-1 bring back the jade chamber and other old scene tags	2022-04-21 09:01:43 -07:00
Melledy	bf61d6fb10	Merge pull request #79 from zamlty/development Fix artifact & weapon generation by give command	2022-04-21 09:00:30 -07:00
Benjamin Elsdon	beb8675190	Should probably remove this as well...	2022-04-21 23:04:02 +08:00
Benjamin Elsdon	2c509237a5	Removed class left over from testing	2022-04-21 23:00:36 +08:00
Jaida Wu	9867ce7369	Add list command Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-21 22:55:32 +08:00
Benjamin Elsdon	1969d38e06	DatabaseManager clean up	2022-04-21 22:50:06 +08:00
Benjamin Elsdon	77fcce6510	Fixed null pointer exception in game only mode PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.	2022-04-21 22:38:01 +08:00
zamlty	bce3e256cf	Fix artifact & weapon generation by give command	2022-04-21 22:21:39 +08:00
xmplay	77b33377d8	bring back the jade chamber and other old scene tags	2022-04-21 15:04:47 +01:00
Jaida Wu	e242e72b2d	Drop independent log server Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>	2022-04-21 21:41:30 +08:00
Benjamin Elsdon	1275592747	Fixed null pointer exception in hybrid mode.	2022-04-21 19:20:49 +08:00
Benjamin Elsdon	1500d2e885	Merge branch 'development' of https://github.com/Melledy/Grasscutter into development	2022-04-21 18:11:51 +08:00
Benjamin Elsdon	9ce436022d	Multi-server dispatch support and server run modes	2022-04-21 18:04:00 +08:00
Melledy	4c1dc34c1f	Merge pull request #70 from Grasscutters/dev-fixes Dev fixes	2022-04-21 00:31:01 -07:00
Melledy	bc07fa77b2	Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players	2022-04-21 00:29:06 -07:00
Melledy	29f6d77e2f	Add config entry for OverseaLogPort (default: 8888)	2022-04-21 00:28:28 -07:00
Melledy	9cebd7be9a	Merge pull request #69 from Grasscutters/dev-fixes Dev fixes	2022-04-21 00:09:12 -07:00
KingRainbow44	0a96012f2c	why is `Account#onLoad` THE DAMN REASON FOR HOURS OF TESTING	2022-04-21 02:07:05 -04:00
Benjamin Elsdon	83fe5818dc	Restructured the config file in preperation for server run modes	2022-04-21 13:53:50 +08:00
Melledy	74bce2fe18	Merge pull request #66 from labalityowo/development Remove stella constellation appeareance in gacha pull	2022-04-20 22:09:56 -07:00
Melledy	24b1fd2045	Merge pull request #65 from fengyuecanzhu/development args check for setstats command	2022-04-20 22:05:58 -07:00
Melledy	af1ecca963	More refactoring (player id -> player uid)	2022-04-20 21:50:33 -07:00
fengyuecanzhu	7fcaa97a6a	add args check	2022-04-21 12:49:23 +08:00
labalityowo	2b0831b7de	Remove the stella appearance	2022-04-21 11:42:21 +07:00
Melledy	b99ca4e02f	Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries	2022-04-20 21:33:58 -07:00
Melledy	1250194480	Fix weapon skills (and artifact sets) not working when you equip them	2022-04-20 21:03:18 -07:00
KingRainbow44	b902fa6f48	Fix command detection	2022-04-20 23:56:27 -04:00
fengyuecanzhu	f3ede17d4d	change description	2022-04-21 11:52:53 +08:00
fengyuecanzhu	4ab12f418e	add description and permission to setstats command	2022-04-21 11:43:31 +08:00
Yazawazi	f6df468e47	folder check	2022-04-21 10:37:24 +08:00
Melledy	8a8906098e	Fix not being able to join friend's world	2022-04-20 18:48:26 -07:00
Melledy	7f2de4fab8	Fix player location updates in co-op	2022-04-20 18:44:02 -07:00
Melledy	b9876fc056	Fix water and the visual map in archipelago	2022-04-20 18:37:07 -07:00
KingRainbow44	d7328dda50	Update Morphia to 2.x	2022-04-20 21:11:57 -04:00
KingRainbow44	415f22d956	Fix merge conflict	2022-04-20 18:55:01 -04:00
KingRainbow44	652a2154ce	Magix sanity.	2022-04-20 18:48:24 -04:00
Melledy	a506117053	Merge pull request #60 from Yazawazi/development Adding a `Teleport to Waypoint` Function	2022-04-20 14:31:14 -07:00
Yazawazi	ec438dc16e	session send sorry	2022-04-21 04:59:42 +08:00
alt3ri	d33ab09e5f	Added Elemental Bonus Usage: /stats <epyro \| ecryo \| ehydro \| egeo \| edend \| eelec \| ephys> <amount> for elemental bonus	2022-04-21 03:47:17 +07:00
Yazawazi	6f43c0765f	teleports	2022-04-21 04:45:38 +08:00
alt3ri	d0529641b3	Adding Elemental DMG Bonus Added Elemental DMG Bonus command. > /stats <epyro \| ecryo \| ehydro \| egeo \| edend \| eelec \| ephys> <amount>	2022-04-21 03:43:57 +07:00
Melledy	19572f46e3	Merge pull request #55 from memetrollsXD/development Custom Y position on MarkMapReq	2022-04-20 12:36:42 -07:00
Benjamin Elsdon	482c174ee7	Reload command now reloads gacha config (again)	2022-04-21 00:28:14 +08:00
Benjamin Elsdon	41b4965aef	Merge remote-tracking branch 'upstream/development'	2022-04-21 00:25:47 +08:00
KingRainbow44	69aa6130e9	Fix command map	2022-04-20 12:17:56 -04:00

... 16 17 18 19 20 ...

1858 Commits