Braden Obrzut
5904df7f56
Merge branch 'maint'
2013-12-13 03:05:06 -05:00
Braden Obrzut
12d45bbc33
- Use setenv for LC_NUMERIC since setlocale gets reset by the libraries on some systems.
2013-12-13 03:00:35 -05:00
Braden Obrzut
10c312f55c
- Silence GCC PCD_PRINTBINARY warning since we've been able to since GCC 4.6.
2013-12-13 02:51:15 -05:00
Christoph Oelckers
74dee4cd63
- removed ddraw.lib from CMake files because that library is not used anymore.
2013-12-09 11:24:58 +01:00
Christoph Oelckers
31c9a0b0e8
- Subtract should respect alpha.
2013-12-05 15:36:20 +01:00
Christoph Oelckers
c959b3f250
- added 'subtract' render style to DECORATE parser. This is actually 'reverse subtract'
2013-12-05 15:28:09 +01:00
Christoph Oelckers
86d7a326be
- allowdecals logic was nonfunctional.
2013-12-01 21:11:33 +01:00
Christoph Oelckers
25f60779fd
- fixed: The 'allowdecals' check in animated doors was wrong.
2013-12-01 20:20:26 +01:00
Christoph Oelckers
8b92597508
Merge branch 'master' of https://github.com/Edward850/zdoom
2013-12-01 18:29:46 +01:00
Edward Richardson
7045f195f3
Removed excess value from stall debug output
...
The debug output for a stalled Arbitrator had an excess Net_Arbitrator
value, bumping the gametic+counts value off the output.
2013-12-02 06:23:22 +13:00
Christoph Oelckers
c5b2c95572
- fixed placement and handling of 'allowdecals' for animated doors.
2013-12-01 15:11:41 +01:00
Christoph Oelckers
a89ecdad50
Merge branch 'master' of https://github.com/Edward850/zdoom
2013-12-01 10:27:40 +01:00
Edward Richardson
662bc7a3ac
cl_bloodtype could break playsim sync
...
Corrected entries were blood would spawn inconsistently because of
cl_bloodtype. Blood now always spawns but is marked invisible according
to cl_bloodtype.
2013-12-01 22:06:48 +13:00
Christoph Oelckers
7e062f394b
- fixed: animated door textures defined by index were not added to the sequence.
...
- fixed: animated doors should set 'no decals' for the texture.
- added 'allowdecals' option to override the above.
2013-12-01 01:26:30 +01:00
Christoph Oelckers
698495efc5
- fixed: missing return in playerinfo CCMD added.
2013-12-01 01:21:43 +01:00
Christoph Oelckers
e7225bced6
- check negative XScale on sprites to allow mirroring.
2013-12-01 01:15:10 +01:00
Braden Obrzut
974619d5be
- According to Graf, we should just let zipdir determine if the pk3 needs updating.
2013-11-29 17:13:34 -05:00
Braden Obrzut
c04a800e2b
- When doing OLDSTYLE builds we can use the RUNTIME_OUTPUT_DIRECTORY_<CONFIG> properties to force the output location properly.
2013-11-29 17:10:29 -05:00
Braden Obrzut
90e9482067
- Get as many files as possible as dependencies for pk3 building. (Kind of feels like CMake changes the behavior of depending on directories every now and then, but maybe it's just me.)
2013-11-29 14:41:03 -05:00
Christoph Oelckers
cbed4624fa
- added a user-settable factor for earthquake intensity. Value can be between 0 (no shaking) and 1 (normal shaking.)
2013-11-29 13:24:38 +01:00
Christoph Oelckers
b9c032461e
- add a CMake option to enable/disable SSE2 with Visual C++. This is necessary because since VC 2012 SSE2 is the default instruction set.
2013-11-29 12:35:45 +01:00
Braden Obrzut
a8090dc22c
- Remove a hardcoded "zdoom" so that the name passed into the copy operation should always match that passed to /MAP.
2013-11-29 02:09:27 -05:00
Braden Obrzut
c21beb0b6c
- Fixed: Some versions of Visual Studio put the map file in a different location.
2013-11-29 01:54:46 -05:00
Braden Obrzut
c6c6487a30
- Fixed: Got a little hyper corrective in c763217
.
2013-11-28 14:41:40 -05:00
Edward Richardson
447ce068f9
Merge pull request #3 from rheit/master
...
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-28 02:33:00 -08:00
Christoph Oelckers
7cb70f60b3
- removed duplicate #define warning in fmodsound.cpp.
...
- commented out output of Cr0NpxState for floating point state because this variable was renamed in most recent Windows headers.
- added CMAKE option to generate assembly output for release builds.
- added my CMake-based project directory to .gitignore.
2013-11-28 11:03:19 +01:00
Edward Richardson
97490a3b65
Merge pull request #2 from rheit/master
...
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-27 22:24:01 -08:00
Braden Obrzut
0c1d92834a
- Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH
2013-11-26 17:58:55 -05:00
Braden Obrzut
c7632174d8
- Fixed error in manifest embedding that stopped the binary from working on Windows XP.
...
- Tweaked PK3 copying commands so that it shouldn't be possible to end up with files named Debug/Release.
2013-11-26 12:49:23 -05:00
Christoph Oelckers
9cd59ddfcd
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-24 10:27:35 +01:00
Christoph Oelckers
8bf5872fc0
- always add DelayImp.lib for MSVC.
2013-11-24 10:27:08 +01:00
Braden Obrzut
1710e92c3a
- Fix issues with building XCode projects with CMake.
2013-11-21 01:54:56 -05:00
Edward Richardson
75968f54f8
Merge pull request #1 from rheit/master
...
Merge branch 'master' of https://github.com/rheit/zdoom
2013-11-19 20:42:15 -08:00
Randy Heit
fe67ae5e54
Merge branch 'maint'
2013-11-19 21:01:15 -06:00
Randy Heit
f4e9edccb9
Don't display the cost in dialogues twice
...
- Fixed: Commit 75dd5503
, which was to enable the use of LANGUAGE
substitutions for conversation items with a cost attached, neglected to
remove the original code that attached the cost to the end of the item,
so the cost got added twice.
2013-11-19 19:55:57 -06:00
Randy Heit
d4304c3bde
Change tspeed += 2 to *= 2
...
- Fixed: The initial keyboard turn rate used the running initial rate whether
+speed was down or not.
2013-11-19 19:49:17 -06:00
Randy Heit
62ffe7e4e2
Add NOGRAVITY to every Raven actor with FLOATBOB
...
- Fixed: Heretic and Hexen completely skip all normal Z processing on
mobjs with FLOATBOB set. To emulate that, we need to add NOGRAVITY to
everything with that flag set.
2013-11-19 19:42:13 -06:00
Braden Obrzut
c7099744bd
- Minor changes to the CMake since it looks like VS2005 doesn't support a few things that were added.
2013-11-11 23:56:58 -05:00
Edward Richardson
a967b05290
Improvements to restoring stalled netgames
...
- The waiting message is now always cleared, regardless if it needed to
be in the first place. It's a rather simple for-loop so I doubt it
matters.
- Nodes are also cleared from the list if they catch up while other
nodes are still behind.
- "lastglobalrecvtime" is now bumped after the waiting loop if a tic was
successful, rather then bumping it every time a packet was received. It
appears that you can receive a packet before the game knows it stalled,
thus stalling it anyway.
- Instead of comparing the nettics to the local node, all nodes are
tested against gametic+counts (the real reason why the game has
stopped).
- More then one node can be marked as late at any one time.
- In a packet-server game, the arbitrator is now assumed slow, rather
then testing it. There is no point, seeing as we already know the game
has stalled because of it.
2013-11-11 20:42:54 +13:00
Braden Obrzut
34457ce737
- Applied VoidMage's patch to strip color codes from system console on SDL platforms.
2013-11-06 13:42:05 -05:00
Braden Obrzut
f0b946c3cf
- Allow use of system GME library. It defaults to forcing the use of the internal library at least for now though.
2013-11-06 13:37:34 -05:00
Braden Obrzut
2142e857a9
- Applied VoidMage's OpenAL patch.
2013-10-23 19:41:58 -04:00
Braden Obrzut
97d7b1e59e
Merge branch 'origin/maint'
...
Conflicts:
src/sound/fmodsound.cpp
2013-10-23 19:39:22 -04:00
Braden Obrzut
7dbf4ec38f
- Slight cleanup and I accidentally inverted the map generation flag.
2013-10-12 01:58:39 -04:00
Braden Obrzut
0759a4b438
- Actually, lets not use /Gm since it's incompatible with /MP which will be much faster on multi-core machines.
...
- Added ZDOOM_GENERATE_MAPFILE which enables linker map file generation.
2013-10-12 01:44:57 -04:00
Braden Obrzut
03b75ae7c1
- Fixed a few flags for Visual Studio compilation.
2013-10-12 00:56:49 -04:00
Braden Obrzut
3e90b65014
- Use release compiler flags for debug builds of third party libraries.
2013-10-12 00:24:04 -04:00
Braden Obrzut
b9a1528747
- DYN_FLUIDSYNTH now defaults to ON.
...
- Added ZDOOM_OUTPUT_OLDSTYLE (could probably use a more descriptive name) which causes CMake to vary the executable name by build type and place the exes and pk3s into the directory specified in ZDOOM_OUTPUT_DIR.
- ALL_BUILD will now launch ZDoom.
2013-10-10 17:40:15 -07:00
Randy Heit
d76dbcaa9d
Merge branch 'maint'
2013-10-09 22:33:58 -05:00
Randy Heit
02514dc9b2
- Fixed: AFSwordMissile::DoSpecialDamage had a unique prototype
...
so it would never actually be called.
2013-10-09 22:32:52 -05:00