Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00
parent 991fb8335c fca3f200b3
commit 06bfa8770e
131 changed files with 1020 additions and 743 deletions
@@ -721,6 +721,13 @@ GLOBAL_PROTECT(AdminProcCall)

 	usr << browse(dat, "window=dellog")

+/client/proc/cmd_display_init_log()
+	set category = "Debug"
+	set name = "Display Initialzie() Log"
+	set desc = "Displays a list of things that didn't handle Initialize() properly"
+
+	usr << browse(replacetext(SSatoms.InitLog(), "\n", "<br>"), "window=initlog")
+
 /client/proc/debug_huds(i as num)
 	set category = "Debug"
 	set name = "Debug HUDs"