589 Commits

• Merge pull request #594 from Akka0/tower

  Tower Dungeons Handoff between levels

  Melledy · 2022-05-06 13:37:30 -07:00
  ad84635540
• 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>

  Kinesis · 2022-05-06 13:28:26 -07:00
  8abd3ace6c
• add config option to enable cors for dispatchserver (#579)
  Muhammad Eko Prasetyo · 2022-05-06 13:23:26 -07:00
  deee32a0a1
• a little fix
  Akka · 2022-05-07 00:31:48 +08:00
  f2231349bd
• Merge branch 'tower' into development
  Akka · 2022-05-07 00:19:51 +08:00
  c2d2a37fc5
• Add some lua functions
  Akka · 2022-05-07 00:15:23 +08:00
  17242a24ed
• Tower Dungeons Handoff between level and floor
  Akka · 2022-05-07 00:11:54 +08:00
  b58bcda0c8
• Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582)
  4Benj_ · 2022-05-06 15:48:16 +02:00
  3ede7523b0
• 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.

  gentlespoon · 2022-05-06 03:26:38 -07:00
  2e68578525
• Fix morphia error when saving player to db
  Melledy · 2022-05-06 01:19:39 -07:00
  b760fb1b26
• Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development
  Melledy · 2022-05-06 01:17:19 -07:00
  000b10983b
• Remove the red exclamation mark from achievements
  Melledy · 2022-05-06 01:17:16 -07:00
  796201e8b7
• fix: lower logging level in SotSManager
  gentlespoon · 2022-05-06 00:49:08 -07:00
  221668570e
• Implementes auto HP recovery at the statues.

  - Respects player setting.
  - SP + MP.
  - Statue has unlimited HP volume (to be updated)

  gentlespoon · 2022-05-06 00:17:18 -07:00
  198214ec53
• Add @Transient for temporary team
  Akka · 2022-05-06 00:12:33 -07:00
  2ad6f5934b
• Choose Avatar & Enter Tower
  Akka · 2022-05-06 00:12:33 -07:00
  c912b8d857
• Add @Transient for temporary team
  Akka · 2022-05-06 14:46:10 +08:00
  f683b222fc
• Add drowning. Better movement ticking.
  gentlespoon · 2022-05-05 23:42:34 -07:00
  93b3265d72
• Merge pull request #1 from Akka0/development

  Updated

  Akka · 2022-05-06 14:16:44 +08:00
  833ea1b791
• Choose Avatar & Enter Tower
  Akka · 2022-05-06 14:10:23 +08:00
  3d3f36cf56
• Customise sender and title too. Add statement of use
  memetrollsXD · 2022-05-05 19:49:28 -07:00
  81998b9cf9
• Kick player if they use an invalid resources folder
  Melledy · 2022-05-05 17:17:27 -07:00
  a045142a41
• 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.

  gentlespoon · 2022-05-05 15:37:15 -07:00
  bafde8693d
• Update CNLanguage to match with the latest EN version
  Scirese · 2022-05-05 09:03:23 -07:00
  128f767002
• Support of Enter Room Scene
  Akka · 2022-05-05 09:02:54 -07:00
  3f34aa0460
• No misleading 404 error
  Benjamin Elsdon · 2022-05-05 09:02:10 -07:00
  782c9bfb6b
• I honestly don't know what happened....
  Benjamin Elsdon · 2022-05-05 09:02:10 -07:00
  db1ddd0630
• Removed GCStatic. Cleaned up GachaRecordHandler.
  Benjamin Elsdon · 2022-05-05 09:02:10 -07:00
  3395c76dbc
• Support of Enter Room Scene
  Akka · 2022-05-05 22:00:11 +08:00
  a21fc116ee
• GiveCommand: fix edge case with unspaced multiple args (#539)

  Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>

  Luke H-W · 2022-05-05 15:23:48 +02:00
  15dca5a04d
• Fix clear command causing a concurrency error
  Melledy · 2022-05-05 02:29:43 -07:00
  e693612ed1
• Add R# LVL# X# arg syntax to GiveCommand
  AnimeGitB · 2022-05-05 00:14:17 -07:00
  3a28e741d0
• Restrict to MP prop only.
  gentlespoon · 2022-05-05 00:03:42 -07:00
  7d85c53e68
• SetPlayerPropReq Handler and player.setProperty() sanity check.
  gentlespoon · 2022-05-05 00:03:42 -07:00
  5c275c2e3c
• Command Targeting overhaul fixes
  AnimeGitB · 2022-05-05 00:03:10 -07:00
  37c2ee5e2c
• Commands Targeting rework
  AnimeGitB · 2022-05-05 00:03:10 -07:00
  d8b2e787e5
• Move command prefix stripping to ChatManager
  AnimeGitB · 2022-05-05 00:03:10 -07:00
  5aba7da7ef
• [WIP] Command Targeting overhaul
  AnimeGitB · 2022-05-05 00:03:10 -07:00
  82ec63c4e4
• Update CNLanguage.java
  hanbao233xD · 2022-05-04 22:57:33 -07:00
  4e0ebe56a6
• Update CNLanguage.java
  hanbao233xD · 2022-05-04 22:57:33 -07:00
  3f02afb46b
• Update CNLanguage.java
  hanbao233xD · 2022-05-04 22:57:33 -07:00
  fb05a3711d
• Update Config.java
  Secretboy · 2022-05-04 22:57:06 -07:00
  a7b9b1f923
• Update Grasscutter.java
  Secretboy · 2022-05-04 22:57:06 -07:00
  08c01ab15d
• Add missing PacketOpcodes.
  gentlespoon · 2022-05-04 22:54:52 -07:00
  6fc4065fa0
• Update teleport docs and allow overriding Y coord when teleporting
  Angda Song · 2022-05-04 14:50:49 -07:00
  5a2d25e4eb
• 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

  BaiSugar · 2022-05-04 11:45:20 -07:00
  2074933e96
• fix achievement proto (#507)

  * fix achievement proto
  
  TakeAchievementRewardReq tells client the achievements achieved or not and it's progress.
  
  * add import

  ShigemoriHakura · 2022-05-04 10:06:33 -07:00
  aa06583a45
• 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>

  Akka · 2022-05-04 10:06:13 -07:00
  48d1e026ef
• Implement map marking features

  Teleport still exists on fish hook mark.
  Added mapMark-related protos.
  Map marking data is stored in players collection.

  Angda Song · 2022-05-04 10:01:46 -07:00
  06983e9e84
• 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

  Scirese · 2022-05-04 16:56:50 +02:00
  4220b6b88d