Skip to content
Permalink
Browse files

Merge branch 'master' into lua

  • Loading branch information...
DolceTriade committed Aug 30, 2014
2 parents ab68e4a + 1e1171b commit 89ccd5783ece0f3bdb71e48b5c4f04e7b6d5c29d
Showing with 382 additions and 473 deletions.
  1. BIN main/ui/assets/alien/bar-l.png
  2. BIN main/ui/assets/alien/bar-r.png
  3. +2 −2 main/ui/hud_alien.rml
  4. +4 −4 main/ui/ingame_teamselect.rml
  5. +1 −1 main/ui/menu_ingame.rml
  6. +1 −1 main/ui/menu_main.rml
  7. +1 −1 main/ui/transition_downloading.rml
  8. +5 −5 src/engine/audio/Audio.cpp
  9. +1 −1 src/engine/audio/Emitter.cpp
  10. +3 −3 src/engine/client/cl_cgame.cpp
  11. +5 −5 src/engine/client/cl_console.cpp
  12. +52 −52 src/engine/client/cl_irc.cpp
  13. +14 −14 src/engine/client/cl_keys.cpp
  14. +66 −66 src/engine/client/cl_main.cpp
  15. +4 −4 src/engine/client/cl_parse.cpp
  16. +2 −0 src/engine/client/rocket_hud.cpp
  17. +44 −44 src/engine/framework/BaseCommands.cpp
  18. +2 −2 src/engine/framework/CommandSystem.cpp
  19. +2 −2 src/engine/framework/ConsoleHistory.cpp
  20. +20 −20 src/engine/framework/CvarSystem.cpp
  21. +1 −1 src/engine/null/null_client.cpp
  22. +2 −2 src/engine/qcommon/cmd.cpp
  23. +13 −13 src/engine/qcommon/common.cpp
  24. +6 −6 src/engine/qcommon/files.cpp
  25. +9 −9 src/engine/qcommon/msg.cpp
  26. +4 −4 src/engine/qcommon/net_ip.cpp
  27. +2 −2 src/engine/qcommon/translation.cpp
  28. +1 −1 src/engine/qcommon/vm.cpp
  29. +0 −5 src/engine/renderer/tr_cmds.cpp
  30. +0 −2 src/engine/renderer/tr_local.h
  31. +7 −42 src/engine/renderer/tr_world.cpp
  32. +11 −11 src/engine/server/sv_ccmds.cpp
  33. +18 −18 src/engine/server/sv_client.cpp
  34. +3 −3 src/engine/server/sv_init.cpp
  35. +20 −20 src/engine/server/sv_main.cpp
  36. +1 −1 src/engine/server/sv_snapshot.cpp
  37. +2 −2 src/engine/sys/sdl_glimp.cpp
  38. +2 −2 src/engine/sys/sys_unix.cpp
  39. +9 −12 src/gamelogic/cgame/cg_ents.c
  40. +15 −17 src/gamelogic/cgame/cg_predict.c
  41. +1 −48 src/gamelogic/game/g_cm_world.cpp
  42. +26 −25 src/gamelogic/shared/bg_public.h
BIN -1.95 KB (77%) main/ui/assets/alien/bar-l.png
Binary file not shown.
Binary file not shown.
@@ -63,7 +63,7 @@
position: absolute;
image: /ui/assets/alien/bar-l.png;
orientation: left;
width: 80%;
width: 65%;
height: auto;
left: 0px;
bottom: 0px;
@@ -73,7 +73,7 @@
position: absolute;
image: /ui/assets/alien/bar-r.png;
orientation: right;
width: 80%;
width: 65%;
height: auto;
right: 0px;
bottom: 0px;
@@ -58,12 +58,12 @@
</button>

<p>
The Aliens' strength is in agility. They possess only short-ranged attacks, but can dance
around their opponents and quickly spread their creep.
Aliens are highly mobile and possess a wide variety of movement-based attacks.
They are sturdy, but must rely on stealth and evasion.
</p>
<p>
The Humans are the masters of ranged technology. Although they are soft and weak, they more
than make up for it in upgrades.
Humans can equip themselves with an assortment of weapons and equipment.
They are flexible and lethal at a distance, but fragile.
</p>

<button class="alien" onClick='Events.pushevent("hide ingame_teamselect; exec team alien", event)'> Join Aliens </button>
@@ -103,7 +103,7 @@
<!-- <blocklink onClick='Events.pushevent("show options_fov", event)'> Fields of view </blocklink> -->
</indent>

<h2> Lore </h2>
<h2> Help </h2>
<indent>
<blocklink onClick='Events.pushevent("show help_gameplay", event)'> Gameplay guide </blocklink>
<blocklink onClick='Events.pushevent("show help_textentry", event)'> Colour codes and symbols </blocklink>
@@ -115,7 +115,7 @@
<!-- <blocklink onClick='Events.pushevent("show options_fov", event)'> Fields of view </blocklink> -->
</indent>

<h2> Lore </h2>
<h2> Help </h2>
<indent>
<blocklink onClick='Events.pushevent("show help_gameplay", event)'> Gameplay guide </blocklink>
<blocklink onClick='Events.pushevent("show help_textentry", event)'> Colour codes and symbols </blocklink>
@@ -57,7 +57,7 @@
<body id="download" nohide>

<div class="infobox">
<p>This Server requires additional files. One moment while they're downloading.</p>
<p>Additional files are required. Please be patient while they download.</p>
<p>Time left: <downloadTime/></p>
<p>Download rate: <downloadSpeed/></p>
<p>Size: <downloadTotalSize/></p>
@@ -492,7 +492,7 @@ namespace Audio {

class ALInfoCmd : public Cmd::StaticCmd {
public:
ALInfoCmd(): StaticCmd("printALInfo", Cmd::AUDIO, N_("Prints information about OpenAL")) {
ALInfoCmd(): StaticCmd("printALInfo", Cmd::AUDIO, "Prints information about OpenAL") {
}

virtual void Run(const Cmd::Args&) const OVERRIDE {
@@ -503,7 +503,7 @@ namespace Audio {

class ListSamplesCmd : public Cmd::StaticCmd {
public:
ListSamplesCmd(): StaticCmd("listAudioSamples", Cmd::AUDIO, N_("Lists all the loaded sound samples")) {
ListSamplesCmd(): StaticCmd("listAudioSamples", Cmd::AUDIO, "Lists all the loaded sound samples") {
}

virtual void Run(const Cmd::Args&) const OVERRIDE {
@@ -521,7 +521,7 @@ namespace Audio {

class StopSoundsCmd : public Cmd::StaticCmd {
public:
StopSoundsCmd(): StaticCmd("stopSounds", Cmd::AUDIO, N_("Stops the music and the looping sounds")) {
StopSoundsCmd(): StaticCmd("stopSounds", Cmd::AUDIO, "Stops the music and the looping sounds") {
}

virtual void Run(const Cmd::Args&) const OVERRIDE {
@@ -533,7 +533,7 @@ namespace Audio {

class StartCaptureTestCmd : public Cmd::StaticCmd {
public:
StartCaptureTestCmd(): StaticCmd("startSoundCaptureTest", Cmd::AUDIO, N_("Starts testing the sound capture")) {
StartCaptureTestCmd(): StaticCmd("startSoundCaptureTest", Cmd::AUDIO, "Starts testing the sound capture") {
}

virtual void Run(const Cmd::Args&) const OVERRIDE {
@@ -544,7 +544,7 @@ namespace Audio {

class StopCaptureTestCmd : public Cmd::StaticCmd {
public:
StopCaptureTestCmd(): StaticCmd("stopSoundCaptureTest", Cmd::AUDIO, N_("Stops the testing of the sound capture")) {
StopCaptureTestCmd(): StaticCmd("stopSoundCaptureTest", Cmd::AUDIO, "Stops the testing of the sound capture") {
}

virtual void Run(const Cmd::Args&) const OVERRIDE {
@@ -347,7 +347,7 @@ namespace Audio {

class TestReverbCmd : public Cmd::StaticCmd {
public:
TestReverbCmd(): StaticCmd("testReverb", Cmd::AUDIO, N_("Tests a reverb preset.")) {
TestReverbCmd(): StaticCmd("testReverb", Cmd::AUDIO, "Tests a reverb preset.") {
}

virtual void Run(const Cmd::Args& args) const OVERRIDE {
@@ -422,7 +422,7 @@ bool CL_HandleServerCommand(Str::StringRef text) {
mpz_t message;

if (argc == 1) {
Com_Printf("%s", _("^3Server sent a pubkey_decrypt command, but sent nothing to decrypt!\n"));
Com_Printf("%s", "^3Server sent a pubkey_decrypt command, but sent nothing to decrypt!\n");
return qfalse;
}

@@ -1292,7 +1292,7 @@ static int LAN_ServerIsVisible( int source, int n )

if ( Cmd_Argc() == 1 )
{
Com_Log(LOG_ERROR, _( "Server sent a pubkey_decrypt command, but sent nothing to decrypt!" ));
Com_Log(LOG_ERROR, "Server sent a pubkey_decrypt command, but sent nothing to decrypt!" );
return qfalse;
}

@@ -2885,7 +2885,7 @@ void CL_FirstSnapshot( void )
if ( ( cl_useMumble->integer ) && !mumble_islinked() )
{
int ret = mumble_link( CLIENT_WINDOW_TITLE );
Com_Printf("%s", ret == 0 ? _("Mumble: Linking to Mumble application okay\n") : _( "Mumble: Linking to Mumble application failed\n" ) );
Com_Printf("%s", ret == 0 ? "Mumble: Linking to Mumble application okay\n" : "Mumble: Linking to Mumble application failed\n" );
}

#ifdef USE_VOIP
@@ -234,7 +234,7 @@ void Con_Dump_f( void )

if ( l > 2 )
{
Cmd_PrintUsage(_("[<filename>]"), NULL);
Cmd_PrintUsage("[<filename>]", NULL);
return;
}

@@ -253,11 +253,11 @@ void Con_Dump_f( void )

if ( !f )
{
Com_Log(LOG_ERROR, _( "couldn't open." ));
Com_Log(LOG_ERROR, "couldn't open." );
return;
}

Com_Printf(_( "Dumped console text to %s.\n"), name );
Com_Printf( "Dumped console text to %s.\n", name );

// skip empty lines
for ( l = consoleState.currentLine - consoleState.maxScrollbackLengthInLines + 1; l <= consoleState.currentLine; l++ )
@@ -293,7 +293,7 @@ void Con_Search_f( void )

if ( c < 2 )
{
Cmd_PrintUsage(_("<string>…"), NULL);
Cmd_PrintUsage("<string>…", NULL);
return;
}

@@ -338,7 +338,7 @@ void Con_Grep_f( void )

if ( Cmd_Argc() != 2 )
{
Cmd_PrintUsage(_("<string>"), NULL);
Cmd_PrintUsage("<string>", NULL);
return;
}

0 comments on commit 89ccd57

Please sign in to comment.
You can’t perform that action at this time.