RedEnchilada
20585bea28
Merge branch 'master' into ghost-networking
...
Conflicts:
src/d_clisrv.c
src/d_clisrv.h
src/d_main.c
src/d_net.c
src/d_net.h
src/d_netcmd.c
src/doomdef.h
src/i_net.h
src/i_tcp.c
src/i_tcp.h
src/mserv.c
src/mserv.h
src/p_inter.c
src/st_stuff.c
Holy cow!
2016-06-15 22:53:40 -05:00
Yukita Mayako
e23ba285fd
Merge branch 'boost-tickrate' into ghost-networking
2016-03-11 14:14:47 -05:00
Alam Ed Arias
81fc9df8d3
Merge branch 'master' into next
2016-03-10 18:02:23 -05:00
Monster Iestyn
4ab2c336e7
Possibly fixed the issues with LibGME mentioned in issue #14 .
...
Not even the HAVE_LIBGME macro was defined apparently, huh.
2016-03-06 19:32:07 +00:00
Inuyasha
8b7e0347fd
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
...
# Conflicts:
# src/sdl/i_system.c
2016-02-25 15:41:13 -08:00
Alam Ed Arias
b3b5521e1b
Merge branch 'master' into next
2016-02-25 18:33:29 -05:00
Alam Ed Arias
8a369d969b
whitespace clean
2016-02-25 18:31:40 -05:00
Yukita Mayako
9e8768e3a2
Added ENet library to SDL2 CMake.
2016-02-07 21:12:59 -05:00
Alam Ed Arias
83461f49c5
Merge branch 'public_todo_next' into next
...
All commits that was in private that are not SRB2 2.2 had moved to public's next
2015-04-01 12:32:34 -04:00
Ronald Kinard
649dd7bd8d
Fix SDL2 searching for main when it wasn't necessary.
2015-03-31 18:00:14 -04:00
Alam Ed Arias
515895dd30
cmake: Fixes to allow MSVC to compile
...
running is another story
Author: Ronald Kinard <furyhunter600@gmail.com>
Date: Wed Jan 28 02:09:03 2015 -0600
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9013 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
JTE
b4b19d63be
Merge branch 'cmake-use-outputdirs' of git@git.magicalgirl.moe:STJr/SRB2.git into ghost-networking
2015-03-05 02:15:14 -05:00
Ronald Kinard
f28b050c07
Append current branch name to comp version string.
2015-03-04 20:15:57 -06:00
Ronald Kinard
1fc240fb8d
Fix SDL2 searching for main when it wasn't necessary.
2015-02-24 02:19:37 -06:00
Alam Ed Arias
51b783e85a
cmake: Fixes to allow MSVC to compile
...
running is another story
Author: Ronald Kinard <furyhunter600@gmail.com>
Date: Wed Jan 28 02:09:03 2015 -0600
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9013 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:07:18 -06:00
Ronald Kinard
d7015d1492
cmake: Fix nasm/add yasm support
...
Tested to work on MSVC, mingw-gcc
2015-02-01 21:25:02 -06:00
Ronald Kinard
57037e4124
cmake: fixes to enable linux compilation
...
string.c, capitalization, find fixes
2015-01-28 20:15:24 +00:00
Ronald Kinard
0909fce2e3
cmake: Configure source via cmake
...
silently fixing a bad malloc here too shhhhhhhhh
2015-01-28 18:03:41 -06:00
Ronald Kinard
1c9de50ad2
cmake: Search SDL2_main separately for MSVC
2015-01-28 15:33:29 -06:00
Ronald Kinard
2f1367aab6
cmake: Fixes to allow MSVC to compile
...
running is another story
2015-01-28 02:09:03 -06:00
Ronald Kinard
495ea65cc5
Add GME and SDL2_mixer
...
Also support dynamic/static opengl switching
2015-01-28 01:20:43 -06:00
Ronald Kinard
05f5ec664a
Initial CMake support pass
...
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00
