858 Commits

This Branch

This Branch

All Branches

• Merge pull request #567 from Grasscutters/localization

  Implement a proper language system

  Magix · 2022-05-06 21:05:29 -04:00
  38fd7bb76a
• Bug fixes
  KingRainbow44 · 2022-05-06 21:04:39 -04:00
  c11e83c48f
• Rename en-US locale
  KingRainbow44 · 2022-05-06 20:18:50 -04:00
  f1079953c1
• Update Utils.java
  KingRainbow44 · 2022-05-06 19:47:30 -04:00
  aa292b1fef
• Merge development into localization
  KingRainbow44 · 2022-05-06 19:40:32 -04:00
  0d7f58fc25
• fix/runningAndDashingStamina
  gentlespoon · 2022-05-06 16:11:51 -07:00
  6d678557ff
• Update .gitignore & remove files
  KingRainbow44 · 2022-05-06 18:59:26 -04:00
  08882e18aa
• Ensure we have a fallback for localization
  KingRainbow44 · 2022-05-06 18:57:49 -04:00
  362cfe1e7b
• Add the zh-TW language.
  KingRainbow44 · 2022-05-06 18:56:19 -04:00
  f39cc9e01f
• Add the en-US language.
  KingRainbow44 · 2022-05-06 18:50:43 -04:00
  647922ff01
• Convert to the superior language system. (pt. 3)
  KingRainbow44 · 2022-05-06 18:50:18 -04:00
  b3a917007b
• Fix #593: Accidental death of character
  gentlespoon · 2022-05-06 15:22:00 -07:00
  58cb60299c
• Allow walking away from the statue within 2.5s to stop auto heal.
  gentlespoon · 2022-05-06 14:49:33 -07:00
  3f91fdcb71
• fix scence block loading bug
  wulf · 2022-05-06 13:43:42 -07:00
  542a3cfc9b
• 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

  Scald · 2022-05-06 13:41:29 -07:00
  afa3747fad
• Improved fault tolerance for json file deserialization (#595)

  * 修复一个Gson发序列化json文件的空值问题
  
  * Improved fault tolerance for json file deserialization

  cfuncode · 2022-05-06 13:39:37 -07:00
  0152b146c5
• 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 pull request #3 from Akka0/development

  Development

  Akka · 2022-05-07 00:19:59 +08:00
  ff0e1c64cd
• Merge branch 'tower' into development
  Akka · 2022-05-07 00:19:51 +08:00
  c2d2a37fc5
• Merge pull request #2 from Grasscutters/development

  Development

  Akka · 2022-05-07 00:17:08 +08:00
  a7312ce054
• 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
• Convert to the superior language system. (pt. 2)
  KingRainbow44 · 2022-05-06 00:57:45 -04:00
  c0b1ec1b9e
• Convert to the superior language system. (pt. 1)
  KingRainbow44 · 2022-05-05 23:57:55 -04:00
  7a084100c6
• 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
• Add all AvatarExpedition protos

  Expedition system has almost done but still has some bug so it will be uploaded later

  ShiroSaki · 2022-05-05 16:52:48 -07:00
  b2955274ab
• 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
• Change the usage of command permission in README.md (#557)

  * Change the command `permission` usage
  
  * Change the command `permission` usage

  Ljzd-PRO · 2022-05-05 22:32:09 +02:00
  224a60de1b
• 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