Remove 5 unused variables from make-macosx scripts
Merge branch 'master' of https://github.com/ioquake/ioq3
Fix server shutdown caused by vid_restart

Don't allocate net fields on the hunk, it gets clears at vid_restart.
Merge CGame and UI VMs (issue 41)

Merge ui VM into cgame VM.
Fix ui_load command.
Remove lerpFrame_t from ui_local.h files, include cg_local.h instead.
Remove UI_DrawProportionalString from cg_drawtools.c, use UI code directly. Team Arena connect screen uses new font now.
Merge BG_RegisterClientCvars with CG_RegisterCvars

CG_RegisterCvars gets called before UI_Init now that cgame and ui VMs are merged, so BG_RegisterClientCvars isn't needed anymore.
Move client model command to cgame

Now usable for all local players. 2model, 3model, 4model.
Cannot be used in menu anymore though as cg_consolecmds.c commands aren't registered yet.

Also, allow vm commands to override vm cvars in Cmd_ExecuteString.
Revert making cg_thirdPerson cheat protected

Accidentally added CVAR_CHEAT to cg_thirdPerson in commit that merged BG_RegisterClientCvars with CG_RegisterCvars.
Update READM for vm_ui removal
Replace tabs in README with spaces
Remove FS_UI_REF and some UI VM references in comments
Remove FS_CGAME_REF and FS_ClearPakReferences

FS_CGAME_REF was used by pure system code that I removed. It was used for sending checksum of pk3 that cgame.qvm is in to server.
Made referenced a qboolean, not storing flags anymore.
All of the FS_ClearPakReferences usages don't make sense.
- FS_Restart called it after freeing all the pk3s, so didn't do anything.
- sv_init.c called it before FS_Restart, which free all the pk3s and then tries to clear referenced flags.
- CL_Vid_Restart_f called it to clear cgame flag, which Spearmint doesn't care about.
Fix OpenAL music stop issues using stream stop code

S_AL_StopBackgroundTrack would sometimes generate AL errors.
S_AL_MusicSourceFree needs to kill source or next track may have short looping buffer.
Fix "bind <key>" message for unbound keys

"bind X cmd; unbind X; bind X" now says '"x" is unbound' instead of '"x" = ""'
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	make-macosx-ub.sh
Add FTX image loading support

The FTX format has a 3 int header followed by RGBA byte data. Used by FAKK2 and Alice.
Add support for Elite Force's depthfunc disable

It's the same as depthfunc lequal.
Fix cgame per-player vmCvars to update each frame

I put them in a table like other cvars so it's simpler to add new ones.
Add trap_Mouse_SetState and trap_Mouse_GetState to CGame

Updating mouse position and/or calling CG_MOUSE_EVENT is now per-player and separate from Key_Catcher.
Useful for having players have separate in-game menus and/or menus that use limited interaction while user is playing.
Fix moving mouse in main menu

Remove unneeded Key_SetCatcher calls from q3_ui.
Restore cl_pause 1 in Team Arena.
Draw over whole screen in q3_ui fullscreen menus

Fixes issue of wide screen resolutions not updating edges.

This use to be done in the client before the cgame-ui merger.