diff --git a/source/xcode/English.lproj/MainMenu.nib/classes.nib b/source/xcode/English.lproj/MainMenu.nib/classes.nib
deleted file mode 100644
index d0980694..00000000
--- a/source/xcode/English.lproj/MainMenu.nib/classes.nib
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
- IBClasses
-
-
- ACTIONS
-
- helpAction
- id
- multiplayerAction
- id
- openUserdir
- id
- playAction
- id
- playMap
- id
- playRpg
- id
- showForum
- id
-
- CLASS
- Launcher
- LANGUAGE
- ObjC
- OUTLETS
-
- admin_password
- NSTextField
- console
- ConsoleView
- keys
- NSArrayController
- maps
- NSArrayController
- multiplayer
- NSButton
- prog
- NSProgressIndicator
- resolutions
- NSPopUpButton
- stencil
- NSButton
- tabs
- NSTabView
- view1
- NSView
- view2
- NSView
- view3
- NSView
- view4
- NSView
- view5
- NSView
- window
- NSWindow
-
- SUPERCLASS
- NSObject
-
-
- ACTIONS
-
-
- id
-
- CLASS
- FirstResponder
- LANGUAGE
- ObjC
- SUPERCLASS
- NSObject
-
-
- CLASS
- ConsoleView
- LANGUAGE
- ObjC
- SUPERCLASS
- NSView
-
-
- IBVersion
- 1
-
-
diff --git a/source/xcode/English.lproj/MainMenu.nib/designable.nib b/source/xcode/English.lproj/MainMenu.nib/designable.nib
new file mode 100644
index 00000000..a37e0897
--- /dev/null
+++ b/source/xcode/English.lproj/MainMenu.nib/designable.nib
@@ -0,0 +1,3416 @@
+
+
+
+ 1040
+ 12E55
+ 3084
+ 1187.39
+ 626.00
+
+
+ NSArrayController
+ NSBox
+ NSButton
+ NSButtonCell
+ NSCustomObject
+ NSCustomView
+ NSMatrix
+ NSMenu
+ NSMenuItem
+ NSNumberFormatter
+ NSPopUpButton
+ NSPopUpButtonCell
+ NSScrollView
+ NSScroller
+ NSSlider
+ NSSliderCell
+ NSTableColumn
+ NSTableHeaderView
+ NSTableView
+ NSTextField
+ NSTextFieldCell
+ NSUserDefaultsController
+ NSView
+ NSWindowTemplate
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+ FirstResponder
+
+
+ NSApplication
+
+
+ 4111
+ 2
+ {{178, 311}, {480, 202}}
+ 1886912512
+ AssaultCube Launcher
+ NSWindow
+
+ View
+
+
+ {219.31200000000001, 107}
+
+
+ 256
+ {480, 202}
+
+
+
+ {{0, 0}, {1440, 878}}
+ {219.31200000000001, 129}
+ {10000000000000, 10000000000000}
+ Main
+ YES
+
+
+
+ Launcher
+
+
+
+ 256
+
+
+
+ 266
+
+
+
+ 274
+
+
+
+ 268
+ {{13, 75}, {49, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Size:
+
+ LucidaGrande
+ 13
+ 1044
+
+
+
+ 6
+ System
+ controlColor
+
+ 3
+ MC42NjY2NjY2NjY3AA
+
+
+
+ 6
+ System
+ controlTextColor
+
+ 3
+ MAA
+
+
+
+ NO
+
+
+
+
+ 268
+ {{65, 16}, {87, 38}}
+
+
+ YES
+ NO
+ 2
+ 1
+
+
+ -2080374784
+ 0
+ Windowed
+
+
+ 1211912448
+ 0
+
+ NSRadioButton
+
+
+
+
+
+ 200
+ 25
+
+
+ 67108864
+ 0
+ FullScreen
+
+
+ 1
+ 1211912448
+ 0
+
+
+
+ 200
+ 25
+
+
+ {87, 18}
+ {4, 2}
+ 1143472128
+ NSActionCell
+
+ 67108864
+ 0
+ Radio
+
+ 1211912448
+ 0
+
+ 549453824
+ {18, 18}
+
+
+
+
+
+ TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
+
+
+
+
+
+ 3
+ MCAwAA
+
+
+
+ 400
+ 75
+
+
+
+
+ 3
+ MQA
+
+
+
+
+ {{2, 2}, {219, 104}}
+
+
+
+
+ {{17, 86}, {223, 121}}
+
+
+ {0, 0}
+
+ 67108864
+ 0
+ Window
+
+ LucidaGrande
+ 11
+ 3100
+
+
+ 6
+ System
+ textBackgroundColor
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxAA
+
+
+
+ 3
+ 0
+ 2
+ NO
+
+
+
+ 265
+
+
+
+ 274
+
+
+
+ 268
+ {{75, 66}, {124, 16}}
+
+
+ YES
+
+ 67108864
+ 262144
+
+
+
+
+ Helvetica
+ 12
+ 16
+
+
+ 4
+ 0.0
+ 0.0
+ 0.0
+ 5
+ 1
+ YES
+ NO
+
+ NO
+
+
+
+ 268
+ {{14, 65}, {41, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ FSAA:
+
+
+
+
+
+ NO
+
+
+
+ 268
+ {{72, 80}, {18, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Off
+
+ LucidaGrande
+ 9
+ 3614
+
+
+
+
+
+ NO
+
+
+
+ 268
+ {{130, 80}, {16, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ 2x
+
+
+
+
+
+ NO
+
+
+
+ 268
+ {{186, 80}, {16, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ 4x
+
+
+
+
+
+ NO
+
+
+
+ 268
+ {{15, 11}, {191, 18}}
+
+
+ YES
+
+ -2080374784
+ 0
+ Enable Stencil Shadows
+
+
+ 1211912448
+ 2
+
+ NSImage
+ NSSwitch
+
+
+ NSSwitch
+
+
+
+ 200
+ 25
+
+ NO
+
+
+
+ 292
+ {{15, 35}, {192, 22}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Note: due to a bug FSAA results in severe performance problems on some systems
+
+
+
+
+
+ NO
+
+
+ {{2, 2}, {219, 104}}
+
+
+
+
+ {{242, 86}, {223, 121}}
+
+
+ {0, 0}
+
+ 67108864
+ 0
+ Graphics
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxAA
+
+
+
+ 3
+ 0
+ 2
+ NO
+
+
+
+ 266
+ {{149, 60}, {313, 22}}
+
+
+ YES
+
+ -1804599231
+ 272630784
+
+
+ Command Line Options
+
+ YES
+
+
+ 6
+ System
+ textColor
+
+
+
+ NO
+
+
+
+ 268
+ {{17, 62}, {127, 17}}
+
+
+ YES
+
+ 67108864
+ 71303168
+ Advanced Options:
+
+
+
+
+
+ NO
+
+
+
+ 289
+ {{386, 12}, {82, 32}}
+
+
+ YES
+
+ 67108864
+ 134217728
+ Play
+
+
+ -2038284288
+ 1
+
+
+ DQ
+ 200
+ 25
+
+ NO
+
+
+
+ 292
+ {{143, 12}, {82, 32}}
+
+
+ YES
+
+ 67108864
+ 134217728
+ Show...
+
+
+ -2038284288
+ 1
+
+
+
+
+
+ 200
+ 25
+
+ NO
+
+
+
+ 292
+ {{35, 20}, {109, 17}}
+
+
+ YES
+
+ 67108864
+ 71303168
+ User Game Files:
+
+
+
+
+
+ NO
+
+
+ {482, 227}
+
+
+
+ NSView
+
+ NSResponder
+
+
+
+ 256
+
+
+
+ 289
+ {{386, 12}, {82, 32}}
+
+
+ YES
+
+ 67108864
+ 134217728
+ Start
+
+
+ -2038284288
+ 1
+
+
+
+
+
+ 200
+ 25
+
+ NO
+
+
+
+ 268
+ {{17, 284}, {114, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Description:
+
+
+
+
+
+ NO
+
+
+
+ 268
+ {{17, 226}, {114, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Admin Password:
+
+
+
+
+
+ NO
+
+
+
+ 268
+ {{17, 194}, {114, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Max Clients:
+
+
+
+
+
+ NO
+
+
+
+ 268
+ {{17, 160}, {129, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Advanced Options:
+
+
+
+
+
+ NO
+
+
+
+ 266
+ {{149, 282}, {183, 22}}
+
+
+ YES
+
+ -1804599231
+ 272630784
+
+
+ My AssaultCube Server
+
+ YES
+
+
+
+ NO
+
+
+
+ 266
+ {{149, 252}, {183, 22}}
+
+
+ YES
+
+ -1804599231
+ 272630784
+
+
+
+ YES
+
+
+
+ NO
+
+
+
+ 268
+ {{17, 254}, {115, 17}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Server Password:
+
+
+
+
+
+ NO
+
+
+
+ 266
+ {{149, 224}, {183, 22}}
+
+
+ YES
+
+ -1804599231
+ 272630784
+
+
+
+ YES
+
+
+
+ NO
+
+
+
+ 266
+ {{149, 192}, {183, 22}}
+
+
+ YES
+
+ -1804599231
+ -1874852864
+
+
+
+
+
+
+ 0
+
+
+ .
+
+ ,
+
+ 0
+ 1
+ NO
+ YES
+ 1
+ QAAAAAAAAAAAAAAAAAAAAA
+
+
+ 0
+ 1
+ NO
+ YES
+ 1
+ AQAAAAAAAAAAAAAAAAAAAA
+
+ -0
+ 0
+
+
+ 0
+ -0
+
+
+
+
+
+
+
+ NaN
+
+
+
+
+
+ .
+ ,
+ NO
+ YES
+ YES
+
+ 4
+
+ YES
+
+
+
+ NO
+
+
+
+ 266
+ {{149, 160}, {311, 22}}
+
+
+ YES
+
+ -1804599231
+ 272630784
+
+
+ Command Line Options
+
+ YES
+
+
+
+ NO
+
+
+
+ 292
+ {{20, 23}, {351, 11}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Note: Please read the documentation very carefully before running a server
+
+
+
+
+
+ NO
+
+
+
+ 274
+
+
+
+ 2048
+
+
+
+ 256
+ {64, 64}
+
+
+ ConsoleView
+ NSView
+
+
+ {{1, 1}, {427, 79}}
+
+
+
+
+
+ 1
+ MCAwIDAAA
+
+ 4
+
+
+
+ 256
+ {{428, 1}, {11, 79}}
+
+
+ NO
+ 256
+
+ _doScroller:
+ 1
+ 0.85000002384185791
+
+
+
+ 256
+ {{1, 80}, {427, 11}}
+
+
+ NO
+ 257
+
+ _doScroller:
+ 0.97649574279785156
+
+
+ {{20, 60}, {440, 92}}
+
+
+
+ 133170
+
+
+
+ 0.25
+ 4
+ 1
+
+
+
+ 292
+ {{337, 241}, {144, 33}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Note: if you set a server password, only people knowing the password can connect
+
+
+
+
+
+ NO
+
+
+ {482, 324}
+
+
+
+ NSView
+
+ NSResponder
+
+
+
+ 256
+
+
+
+ 274
+
+
+
+ 2304
+
+
+
+ 4352
+ {425, 185}
+
+
+ YES
+ NO
+ YES
+
+
+
+ 256
+ {{426, 0}, {16, 17}}
+
+
+
+
+
+ 93
+ 40
+ 1000
+
+
+ 337641536
+ 2048
+ Text Cell
+
+
+
+ 6
+ System
+ controlBackgroundColor
+
+
+
+
+ 3
+ YES
+
+
+
+ 51
+ 40
+ 1000
+
+
+ 337641536
+ 2048
+ Text Cell
+
+
+
+
+
+ 3
+ YES
+
+
+
+ 272.10107421875
+ 4
+ 1000
+
+
+ 337641536
+ 2048
+ Text Cell
+
+
+
+
+
+ 3
+ YES
+
+
+
+ 3
+ 2
+
+
+ 6
+ System
+ gridColor
+
+ 3
+ MC41AA
+
+
+ 17
+ -759169024
+
+
+ 4
+ 15
+ 0
+ YES
+ 0
+ 1
+
+
+ {{1, 17}, {425, 185}}
+
+
+
+
+
+ 4
+
+
+
+ 256
+ {{426, 17}, {15, 185}}
+
+
+ NO
+
+ _doScroller:
+ 0.63157892227172852
+
+
+
+ 256
+ {{1, 202}, {425, 15}}
+
+
+ NO
+ 1
+
+ _doScroller:
+ 0.97191011905670166
+
+
+
+ 2304
+
+
+
+ {{1, 0}, {425, 17}}
+
+
+
+
+
+ 4
+
+
+
+ {{20, 60}, {442, 218}}
+
+
+
+ 133170
+
+
+
+
+
+ QSAAAEEgAABBmAAAQZgAAA
+ 0.25
+ 4
+ 1
+
+
+
+ 292
+ {{20, 23}, {204, 11}}
+
+
+ YES
+
+ 67108864
+ 272629760
+ Note: Edit the config.cfg file to change these
+
+
+
+
+
+ NO
+
+
+ {482, 298}
+
+
+
+ NSView
+
+ NSResponder
+
+
+
+ resolution
+ shader
+ fsaa
+ fullscreen
+ advancedOptions
+ name
+ team
+ server_options
+ server_maxclients
+ server_password
+ server_description
+ userdir
+
+ YES
+
+
+
+ key
+ mode
+ action
+
+ YES
+
+ YES
+ YES
+ YES
+
+
+
+ name
+ hasImage
+ hasText
+ image
+ text
+ user
+
+ YES
+
+ YES
+ YES
+ YES
+
+
+
+
+
+
+ orderFrontStandardAboutPanel:
+
+
+
+ 142
+
+
+
+ unhideAllApplications:
+
+
+
+ 153
+
+
+
+ hideOtherApplications:
+
+
+
+ 146
+
+
+
+ hide:
+
+
+
+ 152
+
+
+
+ terminate:
+
+
+
+ 139
+
+
+
+ showGuessPanel:
+
+
+
+ 188
+
+
+
+ performFindPanelAction:
+
+
+
+ 202
+
+
+
+ pasteAsPlainText:
+
+
+
+ 205
+
+
+
+ undo:
+
+
+
+ 180
+
+
+
+ copy:
+
+
+
+ 181
+
+
+
+ cut:
+
+
+
+ 175
+
+
+
+ centerSelectionInVisibleArea:
+
+
+
+ 203
+
+
+
+ performFindPanelAction:
+
+
+
+ 201
+
+
+
+ toggleContinuousSpellChecking:
+
+
+
+ 192
+
+
+
+ redo:
+
+
+
+ 178
+
+
+
+ paste:
+
+
+
+ 176
+
+
+
+ delete:
+
+
+
+ 195
+
+
+
+ performFindPanelAction:
+
+
+
+ 199
+
+
+
+ checkSpelling:
+
+
+
+ 190
+
+
+
+ performFindPanelAction:
+
+
+
+ 200
+
+
+
+ selectAll:
+
+
+
+ 179
+
+
+
+ showHelp:
+
+
+
+ 740
+
+
+
+ view3
+
+
+
+ 339
+
+
+
+ window
+
+
+
+ 222
+
+
+
+ playAction:
+
+
+
+ 310
+
+
+
+ console
+
+
+
+ 313
+
+
+
+ multiplayerAction:
+
+
+
+ 311
+
+
+
+ view4
+
+
+
+ 340
+
+
+
+ multiplayer
+
+
+
+ 312
+
+
+
+ admin_password
+
+
+
+ 842
+
+
+
+ keys
+
+
+
+ 315
+
+
+
+ view1
+
+
+
+ 266
+
+
+
+ openUserdir:
+
+
+
+ 377
+
+
+
+ maps
+
+
+
+ 343
+
+
+
+ resolutions
+
+
+
+ 291
+
+
+
+ stencil
+
+
+
+ 794
+
+
+
+ selectedIndex: values.resolution
+
+
+
+
+
+ selectedIndex: values.resolution
+ selectedIndex
+ values.resolution
+ 2
+
+
+ 299
+
+
+
+ value: values.fsaa
+
+
+
+
+
+ value: values.fsaa
+ value
+ values.fsaa
+ 2
+
+
+ 304
+
+
+
+ selectedIndex: values.fullscreen
+
+
+
+
+
+ selectedIndex: values.fullscreen
+ selectedIndex
+ values.fullscreen
+ 2
+
+
+ 306
+
+
+
+ value: values.advancedOptions
+
+
+
+
+
+ value: values.advancedOptions
+ value
+ values.advancedOptions
+ 2
+
+
+ 308
+
+
+
+ value: arrangedObjects.key
+
+
+
+
+
+ value: arrangedObjects.key
+ value
+ arrangedObjects.key
+ 2
+
+
+ 295
+
+
+
+ value: arrangedObjects.mode
+
+
+
+
+
+ value: arrangedObjects.mode
+ value
+ arrangedObjects.mode
+ 2
+
+
+ 296
+
+
+
+ value: arrangedObjects.action
+
+
+
+
+
+ value: arrangedObjects.action
+ value
+ arrangedObjects.action
+ 2
+
+
+ 297
+
+
+
+ value: values.server_description
+
+
+
+
+
+ value: values.server_description
+ value
+ values.server_description
+ 2
+
+
+ 335
+
+
+
+ value: values.server_password
+
+
+
+
+
+ value: values.server_password
+ value
+ values.server_password
+ 2
+
+
+ 332
+
+
+
+ value: values.server_maxclients
+
+
+
+
+
+ value: values.server_maxclients
+ value
+ values.server_maxclients
+ 2
+
+
+ 324
+
+
+
+ value: values.server_options
+
+
+
+
+
+ value: values.server_options
+ value
+ values.server_options
+ 2
+
+
+ 322
+
+
+
+
+
+ 0
+
+
+
+
+
+ -2
+
+
+ File's Owner
+
+
+ -1
+
+
+ First Responder
+
+
+ -3
+
+
+ Application
+
+
+ 21
+
+
+
+
+
+ Window
+
+
+ 2
+
+
+
+
+ 29
+
+
+
+
+
+
+
+ MainMenu
+
+
+ 56
+
+
+
+
+
+
+
+ 57
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 58
+
+
+
+
+ 129
+
+
+
+
+ 131
+
+
+
+
+
+
+
+ 130
+
+
+
+
+ 134
+
+
+
+
+ 136
+
+
+
+
+ 143
+
+
+
+
+ 144
+
+
+
+
+ 145
+
+
+
+
+ 149
+
+
+
+
+ 150
+
+
+
+
+ 196
+
+
+
+
+ 103
+
+
+
+
+
+
+
+ 106
+
+
+
+
+
+
+
+ 111
+
+
+
+
+ 163
+
+
+
+
+
+
+
+ 169
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 156
+
+
+
+
+ 157
+
+
+
+
+ 158
+
+
+
+
+ 160
+
+
+
+
+ 164
+
+
+
+
+ 168
+
+
+
+
+
+
+
+ 159
+
+
+
+
+
+
+
+
+
+
+
+ 154
+
+
+
+
+ 155
+
+
+
+
+ 161
+
+
+
+
+ 162
+
+
+
+
+ 167
+
+
+
+
+ 171
+
+
+
+
+ 172
+
+
+
+
+ 173
+
+
+
+
+ 174
+
+
+
+
+ 184
+
+
+
+
+
+
+
+ 185
+
+
+
+
+
+
+
+
+
+ 187
+
+
+
+
+ 189
+
+
+
+
+ 191
+
+
+
+
+ 204
+
+
+
+
+ 206
+
+
+ AppController
+
+
+ 208
+
+
+
+
+
+
+
+
+
+
+
+ Main
+
+
+ 223
+
+
+
+
+
+
+
+
+
+ 240
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 261
+
+
+
+
+
+
+
+ 262
+
+
+
+
+
+
+
+ 263
+
+
+
+
+
+
+
+ 376
+
+
+
+
+
+
+
+ 633
+
+
+
+
+
+
+
+ 213
+
+
+
+
+
+
+ Keys
+
+
+ 273
+
+
+
+
+
+
+
+
+
+
+ 274
+
+
+
+
+
+
+
+
+
+ 275
+
+
+
+
+
+
+
+ 276
+
+
+
+
+
+
+
+ 277
+
+
+
+
+
+
+
+ 278
+
+
+
+
+
+
+
+ 264
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Server
+
+
+ 280
+
+
+
+
+
+
+
+ 281
+
+
+
+
+
+
+
+ 282
+
+
+
+
+
+
+
+ 283
+
+
+
+
+
+
+
+ 284
+
+
+
+
+
+
+
+ 285
+
+
+
+
+
+
+
+ 286
+
+
+
+
+
+
+
+ 287
+
+
+
+
+
+
+
+ 288
+
+
+
+
+
+
+
+ 289
+
+
+
+
+
+
+
+ 292
+
+
+
+
+
+
+
+
+
+ 290
+
+
+
+
+ 836
+
+
+
+
+
+
+
+ 837
+
+
+
+
+
+
+
+ 840
+
+
+
+
+
+
+
+ 293
+
+
+ Shared Defaults
+
+
+ 294
+
+
+ KeysController
+
+
+ 342
+
+
+ MapsController
+
+
+ 899
+
+
+
+
+ 900
+
+
+
+
+ 901
+
+
+
+
+ 902
+
+
+
+
+ 903
+
+
+
+
+ 904
+
+
+
+
+ 905
+
+
+
+
+ 906
+
+
+
+
+ 907
+
+
+
+
+ 908
+
+
+
+
+ 909
+
+
+
+
+ 910
+
+
+
+
+ 911
+
+
+
+
+ 912
+
+
+
+
+
+
+
+ 913
+
+
+
+
+ 914
+
+
+
+
+ 915
+
+
+
+
+ 916
+
+
+
+
+ 917
+
+
+
+
+ 919
+
+
+
+
+ 920
+
+
+
+
+ 921
+
+
+
+
+ 309
+
+
+
+
+ 922
+
+
+
+
+ 923
+
+
+
+
+ 924
+
+
+
+
+ 925
+
+
+
+
+ 926
+
+
+
+
+ 228
+
+
+
+
+
+
+
+ 890
+
+
+
+
+ 229
+
+
+
+
+
+
+
+ 891
+
+
+
+
+
+
+
+ 230
+
+
+
+
+
+
+
+
+
+ 231
+
+
+
+
+ 232
+
+
+
+
+ 233
+
+
+
+
+ 258
+
+
+
+
+
+
+
+
+
+ 918
+
+
+
+
+ 260
+
+
+
+
+ 259
+
+
+
+
+ 243
+
+
+
+
+
+
+
+ 892
+
+
+
+
+ 248
+
+
+
+
+
+
+
+ 893
+
+
+
+
+ 249
+
+
+
+
+
+
+
+ 894
+
+
+
+
+ 250
+
+
+
+
+
+
+
+ 895
+
+
+
+
+ 251
+
+
+
+
+
+
+
+ 896
+
+
+
+
+ 792
+
+
+
+
+
+
+
+ 897
+
+
+
+
+ 887
+
+
+
+
+
+
+
+ 898
+
+
+
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Smoothness - higher is slower
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Options separated by a space
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ As seen on server list
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Options separated by a space
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+ 926
+
+
+
+
+ ConsoleView
+ NSView
+
+ IBProjectSource
+ ./Classes/ConsoleView.h
+
+
+
+ Launcher
+ NSObject
+
+ id
+ id
+ id
+ id
+
+
+
+ multiplayerAction:
+ id
+
+
+ openUserdir:
+ id
+
+
+ playAction:
+ id
+
+
+ playMap:
+ id
+
+
+
+ NSTextField
+ ConsoleView
+ NSArrayController
+ NSArrayController
+ NSButton
+ NSProgressIndicator
+ NSPopUpButton
+ NSButton
+ NSView
+ NSView
+ NSWindow
+
+
+
+ admin_password
+ NSTextField
+
+
+ console
+ ConsoleView
+
+
+ keys
+ NSArrayController
+
+
+ maps
+ NSArrayController
+
+
+ multiplayer
+ NSButton
+
+
+ prog
+ NSProgressIndicator
+
+
+ resolutions
+ NSPopUpButton
+
+
+ stencil
+ NSButton
+
+
+ view1
+ NSView
+
+
+ view4
+ NSView
+
+
+ window
+ NSWindow
+
+
+
+ IBProjectSource
+ ./Classes/Launcher.h
+
+
+
+
+ 0
+ IBCocoaFramework
+
+ com.apple.InterfaceBuilder.CocoaPlugin.macosx
+
+
+ YES
+ 3
+
+ {11, 11}
+ {10, 3}
+ {15, 15}
+
+
+
diff --git a/source/xcode/English.lproj/MainMenu.nib/info.nib b/source/xcode/English.lproj/MainMenu.nib/info.nib
deleted file mode 100644
index df817608..00000000
--- a/source/xcode/English.lproj/MainMenu.nib/info.nib
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- IBFramework Version
- 677
- IBLastKnownRelativeProjectPath
- ../actioncube.xcodeproj
- IBOldestOS
- 4
- IBOpenObjects
-
- 21
- 264
- 792
- 213
- 29
-
- IBSystem Version
- 9J61
- targetFramework
- IBCocoaFramework
-
-
diff --git a/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib b/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib
index e9f65c5f..52312165 100644
Binary files a/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib and b/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/source/xcode/Launcher.h b/source/xcode/Launcher.h
index b00f81d2..172fbe2e 100644
--- a/source/xcode/Launcher.h
+++ b/source/xcode/Launcher.h
@@ -9,7 +9,8 @@
//able to leave these disconnected
IBOutlet NSView *view1; //Main
- IBOutlet NSView *view3; //Keys
+ //20/7/13: RR Removing keys submenu
+// IBOutlet NSView *view3; //Keys
IBOutlet NSView *view4; //Server
diff --git a/source/xcode/Launcher.m b/source/xcode/Launcher.m
index d3fd04a9..faf33e66 100644
--- a/source/xcode/Launcher.m
+++ b/source/xcode/Launcher.m
@@ -125,7 +125,9 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
- (void)switchViews:(NSToolbarItem *)item
{
- NSView *views[] = {view1, view3, view4};
+ //20/7/13: RR Removing keys submenu
+// NSView *views[] = {view1, view3, view4};
+ NSView *views[] = {view1, view4};
NSView *prefsView = views[[item tag]-1];
//to stop flicker, we make a temp blank view.
@@ -159,7 +161,9 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
SEL action = @selector(displayHelp:);
id target = self;
if(tag) {
- NSString *names[] = {tkMAIN, tkKEYS, tkSERVER};
+ //20/7/13: RR Removing keys submenu
+// NSString *names[] = {tkMAIN, tkKEYS, tkSERVER};
+ NSString *names[] = {tkMAIN, tkSERVER};
name = names[tag-1];
action = @selector(switchViews:);
target = self;
@@ -209,7 +213,9 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
- (NSArray *)toolbarSelectableItemIdentifiers: (NSToolbar *)toolbar
{
NSMutableArray *array = [NSMutableArray array];
- NSView *views[] = {view1, view3, view4};
+ //20/7/13: RR Removing keys submenu
+// NSView *views[] = {view1, view3, view4};
+ NSView *views[] = {view1, view4};
int i;
for(i = 0; i < sizeof(views)/sizeof(NSView*); i++) if(views[i]) [array addObject:[NSString stringWithFormat:@"%d", i+1]];
return array;