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
This commit is contained in:
jakciehan
2026-05-12 07:05:20 +08:00
parent 38294c040c
commit d263c7bf48
48 changed files with 10480 additions and 25 deletions
@@ -0,0 +1,8 @@
# ============================================================
# Namespace label patch for tankwar
# This adds the kubernetes.io/metadata.name label to the tankwar
# namespace so that NetworkPolicy can reference it.
# Apply: kubectl label namespace tankwar kubernetes.io/metadata.name=tankwar --overwrite
# ============================================================
# Note: Kubernetes 1.21+ automatically adds this label to namespaces.
# Verify with: kubectl get namespace tankwar --show-labels