]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/uid2name_dialog' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 3 Jul 2016 23:09:30 +0000 (23:09 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 3 Jul 2016 23:09:30 +0000 (23:09 +0000)
uid2name dialog

Implement the uid2name dialog in the menu, but keep the existing one implemented in the HUD vote panel for compatibility sake, so clients with an older menu can still see it

Menu dialog:
![uid2name_dialog_menu](/uploads/3508d2ae94c24ebc9c66d77bc2bfa744/uid2name_dialog_menu.jpg)

See merge request !332

.gitlab-ci.yml

index 3cdd43f30510917818e9a8ab0b4365574d83d84d..7909c3286a6dcbd28402519f993afc9a33a59f16 100644 (file)
@@ -24,7 +24,7 @@ test_sv_game:
     - wget -O data/maps/g-23.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.waypoints.cache
     - wget -O data/maps/g-23.waypoints.hardwired https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.waypoints.hardwired
     - make
-    - EXPECT=4bd5b0276cdd100c831c73f0400eca71
+    - EXPECT=9b2513f29762de886296f998ac8725c9
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'