Ronald Kinard
8472075960
Prepend ASM sources with the current source directory in CMake.
...
This fixes generation with USEASM enabled.
2015-03-08 04:16:16 -05:00
Ronald Kinard
a713509493
Refactor CMake to allow source grouping and separation of interfaces.
...
Core and SDL2 are two separate targets now. Core is a static library
that is linked into SRB2SDL2. The sources for both are separated.
When using an IDE like Visual Studio or Xcode, the source code
organized into groups that explain what that group of sources does.
In the future, "Main" could be split into a few more groups based on
file prefixes, but I think the way it is set up works for now.
Makefile targets are not affected by source_groups and typing `make`
will automatically compile both the "Core" library and SRB2SDL2
itself.
2015-03-08 03:26:54 -05:00
Ronald Kinard
3d5d61ee87
Remove MSVC netplay warning.
2015-03-04 20:37:37 -06:00
Ronald Kinard
f28b050c07
Append current branch name to comp version string.
2015-03-04 20:15:57 -06:00
Ronald Kinard
e223084982
Use bin output directory.
2015-03-04 20:07:51 -06:00
JTE
7964f3b044
Removed the need to add "Status = 1" to all new Character select entries for it to become active.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9002 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:44:32 -05:00
JTE
c1bfde0027
Fixed WGL code "device mode" breaking.
...
The devil is in the details.
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9001 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:44:32 -05:00
JTE
8d7b5941a8
Changed super colors to make them pulse instead of flash. Removed alt. supercolors from replay ghost stuff, because that's stupid. :/
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8999 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:43:11 -05:00
JTE
092134ad0c
Title screen cheat "devmode".
...
Access the benefits of -debug, console devmode, and a complete gamedata.dat (all secrets unlocked) all in one go.
Moved "#if 0" and "#if 1" to "#ifdef DEVMODE" so the existance of this cheat and MD5 validation and all that can be toggled in one place too.
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8998 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:43:09 -05:00
MonsterIestyn
9b0e09877e
gametype command now prints gametype NAMES instead of numbers. Even prints "Single player" when appropriate!
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8997 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:42:12 -05:00
JTE
0dff0d84de
New HD SRB2 icon by VAdaPEga.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8994 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:07:56 -05:00
MonsterIestyn
ffc1d3cb64
Correcting a most minor math mistake
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8992 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
MonsterIestyn
2d8868feca
Made HWR_InitMD2 and HWR_AddSpriteMD2/HWR_AddPlayerMD2 slightly less stupid with MD2-related searches in md2.dat: *Don't go barmy and search for a player skin called "THOK" when you already found the sprite called "THOK" beforehand! (or any other sprite prefix for that matter) *Don't make errors appear only for the last sprite/skin when it doesn't make sense to do so!!
...
Todo: Stop the redundancy that currently goes on with adding MD2s on game start-up (note that HWR_AddSpriteMD2/HWR_AddPlayerMD2 are run for all sprites/skins BEFORE HWR_InitMD2 is called)
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8988 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
Matt Walsh
f3e6770e9a
Well that shows you how much we care about the old special stages *or* race!
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8985 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
Matt Walsh
0a7f3751f6
Add in missing super check
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8984 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
MonsterIestyn
8232dbca10
*Fixed OpenGL's handling of cv_translucency effects (should not remove shadows if off, but perhaps make them use default alpha?), someone was a bit hasty! *De-stupified the MD2 status checks regarding drawing of sprites - if they're already checked before calling HWR_DrawSprite, there's no point doing them WITHIN the function as well *Split off sprite shadow code into HWR_DrawSpriteShadow for convenience
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8983 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
Alam Ed Arias
6513954789
whitespace cleanup
2015-03-01 19:30:22 -05:00
Wolfy
627889eec1
Have super sparks scale with the player
...
Fixes https://mb.srb2.org/showthread.php?t=40279
Should work fine, but do keep in mind that this fix is untested.
2015-03-01 19:28:57 -05:00
Ronald Kinard
15f0670c43
Merge branch 'fix_each_time' into next
...
Conflicts:
src/p_floor.c
2015-03-01 02:13:46 -06:00
Alam Ed Arias
fdee54626e
Merge branch 'master' into next
2015-02-06 10:22:39 -05:00
Alam Ed Arias
2609745b51
it was me, Duo!
2015-02-06 10:22:16 -05:00
Alam Ed Arias
dbb1d8088e
Merge branch 'master' into next
2015-02-05 17:33:00 -05:00
Alam Ed Arias
ed0d70feca
do not typedef off_t when we do not need to
2015-02-05 17:32:27 -05:00
Alam Ed Arias
542295c863
remove comptime.h from cmake file list
2015-02-05 17:32:26 -05:00
Alam Ed Arias
776dafa0bb
Merge branch 'master' into next
2015-02-05 17:05:20 -05:00
Alam Ed Arias
01d441e6c0
Merge remote-tracking branch 'Furyhunter/ipv6-osx-fix'
2015-02-05 17:04:54 -05:00
Alam Ed Arias
8cccfa558a
do not include anything in assets folder unless forced
2015-02-05 17:04:24 -05:00
Ronald Kinard
062a746fdd
Further fix IPv4 when IPv6 is available
2015-02-05 15:36:07 -06:00
Ronald Kinard
ae05613460
Fix IPv4 connectivity when IPv6 is enabled
2015-02-05 00:32:54 -06:00
Alam Ed Arias
e0f90d83ee
Merge branch 'master' into next
2015-02-02 15:22:14 -05:00
Alam Ed Arias
3d498fe894
VERSIONSTRINGW is funny
2015-02-02 15:21:58 -05:00
Alam Ed Arias
963276e8ca
Merge branch 'master' into next
2015-02-02 14:59:00 -05:00
Alam Ed Arias
7cf1a1aab8
fixup cmake merge
2015-02-02 14:58:51 -05:00
Alam Ed Arias
5c8a6e3917
Merge branch 'master' into next
2015-02-02 12:53:06 -05:00
Alam Ed Arias
244fb0b2b5
Merge remote-tracking branch 'Furyhunter/cmake-update'
2015-02-02 12:52:51 -05:00
Ronald Kinard
e08bd45227
cmake: Separate debug symbols on gcc
...
Only when actually making the debug target though!
2015-02-01 22:14:52 -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
194ce626e1
cmake: Add nasm support
...
Enables ASM-NASM and adds tmap*.nas to sdl target.
No idea if this actually works.
2015-02-01 19:18:25 -06:00
Ronald Kinard
8d3b948e1b
cmake: Fix compilation for MSVC 2015
...
snprintf is now available in MSVC 2015!
2015-02-01 19:02:08 -06:00
Ronald Kinard
ec79756c42
cmake: copy DLLs to build directory in MSVC
...
this is done as a POST_BUILD step
2015-01-31 22:40:36 -06:00
Ronald Kinard
4d3a7dd8fb
cmake: fix NDEBUG on Debug
...
wow i'm stupid
2015-01-29 00:17:47 -06:00
Ronald Kinard
70f046a320
cmake: on mac, check Resources in bundle first.
...
on non debug, check assets folder in src as well
2015-01-28 23:38:40 -06:00
Ronald Kinard
e54338ef01
cmake: fix Windows linking
2015-01-28 23:20:21 -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
68f8a5b0f9
cmake: build bundle and dmg on install/package
2015-01-28 19:29:16 -06: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
53799eb390
cmake: Add CPack Package Generation
...
Generates zips only at the moment
2015-01-28 16:42:05 -06:00
Ronald Kinard
1c9de50ad2
cmake: Search SDL2_main separately for MSVC
2015-01-28 15:33:29 -06:00
Ronald Kinard
20d6a7e675
cmake: exe icon on windows
2015-01-28 02:12:14 -06:00
Ronald Kinard
2f1367aab6
cmake: Fixes to allow MSVC to compile
...
running is another story
2015-01-28 02:09:03 -06:00
