Permalink
Browse files

Merge branch 'master' into connectionless_packet

  • Loading branch information...
mbasaglia committed Feb 13, 2016
2 parents befeb3e + 157baa5 commit 038f0cb4f9677fb0a679d6c2183a03a011b6d27e
Showing with 251 additions and 1,984 deletions.
  1. +1 −1 .travis.yml
  2. +8 −8 appveyor.yml
  3. +3 −2 daemon/CMakeLists.txt
  4. +6 −0 daemon/src/common/Color.h
  5. +2 −0 daemon/src/common/Command.h
  6. +0 −1 daemon/src/common/Common.h
  7. +2 −0 daemon/src/common/FileSystem.h
  8. +1 −0 daemon/src/common/IPC/CommonSyscalls.h
  9. +2 −0 daemon/src/common/Math.h
  10. +2 −0 daemon/src/common/String.h
  11. +3 −0 daemon/src/common/Util.h
  12. +2 −0 daemon/src/common/cm/cm_load.cpp
  13. +1 −0 daemon/src/engine/audio/Audio.cpp
  14. +1 −0 daemon/src/engine/audio/OggCodec.cpp
  15. +1 −0 daemon/src/engine/audio/OpusCodec.cpp
  16. +1 −0 daemon/src/engine/audio/SoundCodec.cpp
  17. +1 −0 daemon/src/engine/audio/WavCodec.cpp
  18. +0 −5 daemon/src/engine/client/cg_api.h
  19. +0 −25 daemon/src/engine/client/cin_ogm.cpp
  20. +1 −1 daemon/src/engine/client/cl_cgame.cpp
  21. +127 −1,560 daemon/src/engine/client/cl_cin.cpp
  22. +0 −4 daemon/src/engine/client/cl_main.cpp
  23. +0 −3 daemon/src/engine/client/client.h
  24. +11 −9 daemon/src/engine/crash_server/crash_server_linux.cpp
  25. +4 −0 daemon/src/engine/framework/Application.h
  26. +2 −0 daemon/src/engine/framework/BaseCommands.cpp
  27. +3 −0 daemon/src/engine/framework/CommandSystem.h
  28. +1 −0 daemon/src/engine/framework/ConsoleHistory.cpp
  29. +39 −30 daemon/src/engine/framework/CrashDump.cpp
  30. +5 −4 daemon/src/engine/framework/CrashDump.h
  31. +1 −0 daemon/src/engine/framework/LogSystem.cpp
  32. +2 −3 daemon/src/engine/framework/System.cpp
  33. +1 −0 daemon/src/engine/framework/VirtualMachine.h
  34. +1 −146 daemon/src/engine/qcommon/common.cpp
  35. +1 −0 daemon/src/engine/qcommon/files.cpp
  36. +1 −0 daemon/src/engine/qcommon/net_ip.cpp
  37. +0 −40 daemon/src/engine/qcommon/q_math.cpp
  38. +0 −25 daemon/src/engine/qcommon/q_shared.cpp
  39. +0 −107 daemon/src/engine/qcommon/q_shared.h
  40. +3 −2 daemon/src/engine/renderer/gl_shader.cpp
  41. +1 −0 daemon/src/engine/renderer/tr_image.cpp
  42. +1 −1 daemon/src/engine/renderer/tr_main.cpp
  43. +0 −4 daemon/src/engine/renderer/tr_public.h
  44. +1 −0 daemon/src/engine/server/ServerApplication.cpp
  45. +1 −1 daemon/src/engine/server/sv_sgame.cpp
  46. +1 −0 daemon/src/engine/sys/sdl_compat.cpp
  47. +2 −2 daemon/src/engine/sys/sdl_glimp.cpp
  48. +2 −0 src/cgame/rocket/rocket.h
  49. +1 −0 src/cgame/rocket/rocketIncludeElement.h
  50. +1 −0 src/sgame/sg_cmds.cpp
View
@@ -46,7 +46,7 @@ script:
- mkdir -p build
- cd build
- cmake --version
- CXXFLAGS="-D__extern_always_inline=inline" cmake
- CXXFLAGS="-D__extern_always_inline=inline" cmake -DUSE_PRECOMPILED_HEADER=0
-DBUILD_CLIENT=$(($MODE == 0)) -DBUILD_TTY_CLIENT=$(($MODE == 0)) -DBUILD_SERVER=$(($MODE == 0))
-DBUILD_CGAME=$(($MODE >= 1)) -DBUILD_SGAME=$(($MODE >= 1))
-DBUILD_GAME_NATIVE_DLL=$(($MODE == 1)) -DBUILD_GAME_NATIVE_EXE=$(($MODE == 1))
View
@@ -17,18 +17,18 @@ environment:
# COMPILER_VERSION: "5.1.0"
# MINGW_VERSION: "v4-rev0"
# GENERATOR: "MinGW Makefiles"
- COMPILER: msvc
COMPILER_VERSION: "12.0"
TARGET: x86
GENERATOR: "NMake Makefiles"
# - COMPILER: msvc
# COMPILER_VERSION: "12.0"
# TARGET: x86_amd64
# TARGET: x86
# GENERATOR: "NMake Makefiles"
# - COMPILER: msvc
# COMPILER_VERSION: "14.0"
# TARGET: x86
# COMPILER_VERSION: "12.0"
# TARGET: x86_amd64
# GENERATOR: "NMake Makefiles"
- COMPILER: msvc
COMPILER_VERSION: "14.0"
TARGET: x86
GENERATOR: "NMake Makefiles"
# - COMPILER: msvc
# TARGET: x86_amd64
# COMPILER_VERSION: "14.0"
@@ -80,5 +80,5 @@ build_script:
$env:CC="gcc"
$env:CXX="g++"
}
cmake -DUSE_WERROR=1 -DBE_VERBOSE=1 -G "${env:GENERATOR}" -DBUILD_GAME_NACL=0 -DCMAKE_BUILD_TYPE=Debug ..
cmake -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -G "${env:GENERATOR}" -DBUILD_GAME_NACL=0 -DCMAKE_BUILD_TYPE=Debug ..
cmake --build .
View
@@ -24,7 +24,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmake_minimum_required (VERSION 3.0)
cmake_minimum_required (VERSION 2.8.12)
if (POLICY CMP0017)
cmake_policy(SET CMP0017 NEW)
endif()
@@ -567,7 +567,8 @@ if (USE_BREAKPAD)
endif()
endforeach(breaklib)
add_executable(crash_server src/engine/crash_server/crash_server_windows.cpp)
# WIN32 option prevents a console from being created for the process
add_executable(crash_server WIN32 src/engine/crash_server/crash_server_windows.cpp)
target_link_libraries(crash_server
srclibs-breakpad-crash_generation_server srclibs-breakpad-common)
target_compile_definitions(crash_server PRIVATE UNICODE)
@@ -31,6 +31,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef COMMON_COLOR_H_
#define COMMON_COLOR_H_
#include <limits>
#include <type_traits>
#include "Compiler.h"
#include "Math.h"
namespace Color {
/*
@@ -31,6 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef COMMON_COMMAND_H_
#define COMMON_COMMAND_H_
#include <engine/qcommon/q_shared.h>
namespace Cmd {
/**
@@ -46,7 +46,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "Color.h"
#include "System.h"
#include "Serialize.h"
#include "FileSystem.h"
#include "DisjointSets.h"
using Math::Vec2;
@@ -31,6 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef COMMON_FILESYSTEM_H_
#define COMMON_FILESYSTEM_H_
#include "Command.h"
#ifdef BUILD_ENGINE
#include "IPC/Channel.h"
#endif
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define COMMON_COMMON_SYSCALLS_H_
#include "Primitives.h"
#include <common/FileSystem.h>
namespace VM {
View
@@ -31,6 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef COMMON_MATH_H_
#define COMMON_MATH_H_
#include <algorithm>
namespace Math {
template<typename T> static inline T Clamp(T value, T min, T max)
@@ -31,6 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef COMMON_STRING_H_
#define COMMON_STRING_H_
#include <algorithm>
#include "tinyformat/tinyformat.h"
namespace Str {
View
@@ -31,6 +31,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef COMMON_UTIL_H_
#define COMMON_UTIL_H_
#include <algorithm>
#include <tuple>
// Various utilities
// Workaround for broken tuples in GCC 4.6
@@ -34,6 +34,8 @@ Maryland 20850 USA.
#include "cm_local.h"
#include <common/FileSystem.h>
// to allow boxes to be treated as brush models, we allocate
// some extra indexes along with those needed by the map
#define BOX_LEAF_BRUSHES 1 // ydnar
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================
*/
#include <common/FileSystem.h>
#include "AudioPrivate.h"
#include "AudioData.h"
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "SoundCodec.h"
#include "AudioPrivate.h"
#include <common/FileSystem.h>
#include <errno.h>
#define OV_EXCLUDE_STATIC_CALLBACKS
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "SoundCodec.h"
#include "AudioPrivate.h"
#include <common/FileSystem.h>
#include <errno.h>
#include <opusfile.h>
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "SoundCodec.h"
#include "AudioPrivate.h"
#include <common/FileSystem.h>
namespace Audio {
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "SoundCodec.h"
#include "AudioPrivate.h"
#include <common/FileSystem.h>
/*
*The following assumptions made:
@@ -220,11 +220,6 @@ void trap_Key_ClearStates( void );
std::vector<int> trap_Key_KeysDown( const std::vector<int>& keys );
void trap_SetMouseMode( MouseMode mode );
void trap_S_StopBackgroundTrack();
int trap_CIN_PlayCinematic( const char *arg0, int xpos, int ypos, int width, int height, int bits );
e_status trap_CIN_StopCinematic( int handle );
e_status trap_CIN_RunCinematic( int handle );
void trap_CIN_DrawCinematic( int handle );
void trap_CIN_SetExtents( int handle, int x, int y, int w, int h );
void trap_R_RemapShader( const char *oldShader, const char *newShader, const char *timeOffset );
bool trap_GetEntityToken( char *buffer, int bufferSize );
void trap_UI_Popup( int arg0 );
@@ -359,30 +359,6 @@ static int loadVideoFrameTheora()
g_ogm.th_yuvbuffer.uv_stride, yWShift, uvWShift, yHShift, uvHShift,
( unsigned int * ) g_ogm.outputBuffer );
/* unsigned char* pixelPtr = g_ogm.outputBuffer;
unsigned int* pixPtr;
pixPtr = (unsigned int*)g_ogm.outputBuffer;
//TODO: use one yuv->rgb function for the whole frame (large amount of stack movement (yuv->rgb calls) can't be good ;))
for(j=0;j<g_ogm.th_info.height;++j) {
for(i=0;i<g_ogm.th_info.width;++i) {
#if 1
// simple grayscale-output ^^
pixelPtr[0] =
pixelPtr[1] =
pixelPtr[2] = g_ogm.th_yuvbuffer.y[i+j*g_ogm.th_yuvbuffer.y_stride];
pixelPtr+=4;
#else
// using RoQ yuv->rgb code
*pixPtr++ = yuv_to_rgb24( g_ogm.th_yuvbuffer.y[(i>>yWShift)+(j>>yHShift)*g_ogm.th_yuvbuffer.y_stride],
g_ogm.th_yuvbuffer.u[(i>>uvWShift)+(j>>uvHShift)*g_ogm.th_yuvbuffer.uv_stride],
g_ogm.th_yuvbuffer.v[(i>>uvWShift)+(j>>uvHShift)*g_ogm.th_yuvbuffer.uv_stride]);
#endif
}
}
*/
r = 1;
g_ogm.VFrameCount = th_frame;
}
@@ -458,7 +434,6 @@ static bool loadFrame()
}
}
// if needPage
if ( needVOutputData || audioWantsMoreData )
{
// try to transfer Pages to the audio- and video-Stream
@@ -1303,7 +1303,7 @@ void CGameVM::QVMSyscall(int index, Util::Reader& reader, IPC::Channel& channel)
case CG_CRASH_DUMP:
IPC::HandleMsg<CrashDumpMsg>(channel, std::move(reader), [this](std::vector<uint8_t> dump) {
Sys::NaclCrashDump(dump);
Sys::NaclCrashDump(dump, "cgame");
});
break;
Oops, something went wrong.

0 comments on commit 038f0cb

Please sign in to comment.