 jakciehan
|
d263c7bf48
|
Merge feature/add_skin into master: resolve all conflicts
- GameGlobal.js: keep upstream SERVER_URL with /ws suffix
- en.js/zh.js: merge both settings.nickname and settings.profile keys
- SettingsScene.js: keep both nickname row and profile button
- server/index.js: merge express app + content security proxy with
noServer WebSocket mode and path validation
- Add .gitignore for node_modules and .codebuddy
|
2026-05-12 07:05:20 +08:00 |
|