d941203ab0
- Fixed edward-san's typo.
...
- Cleared a warning.
2014-06-26 20:37:11 -04:00
28afd04aef
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/CMakeLists.txt
2014-06-27 01:10:09 +02:00
19415668ec
Merge branch 'gcc_aggressive_optimization' of github.com:edward-san/zdoom into edward-san-gcc_agressive_optimization
2014-06-26 18:11:32 -04:00
1ae53473ff
Merge branch 'edward-san-cmake_gcc_compatible'
2014-06-26 17:54:48 -04:00
cb9877e7ff
- Using USE_WINDOWS_DWORD on other platforms can cause problems.
2014-06-26 17:52:26 -04:00
0cb1547890
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-26 09:45:27 +02:00
270541f942
fixed compilation with latest LZMA SDK on Windows.
...
LZMA SDK recently added an #include <windows.h> to its headers, meaning it's no longer safe to include its headers globally in platform independent files.
The following changes were necessary:
- rename DWORD type in zipdir.c
- add USE_WINDOWS_DWORD and reorder includes in file_7z.cpp
- wrap LZMA decoder stream into a local struct that's declared anonymously in files.h and adjust files.cpp for this change.
2014-06-26 09:43:51 +02:00
1a3ac9d0b3
- Simplify CMake GCC and Clang checking.
...
Introduce the variable 'ZD_CMAKE_COMPILER_IS_GNUC(XX)_COMPATIBLE' and replace any occurrence of '"${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "Clang"' with it. This makes it possible to add more GCC compatible compilers in just one place.
2014-06-26 01:23:41 +02:00
8aff59e704
Merge branch 'language_sdl' of https://github.com/edward-san/zdoom
2014-06-25 22:06:24 +02:00
0be30c782c
Fix LZMA compilation on GCC with position-independent code (PIC) generation enabled
...
EBX register is used Global Offset Table in PIC
http://www.greyhat.ch/lab/downloads/pic.html
2014-06-25 20:11:05 +03:00
f4afc8cf1a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-24 12:32:29 +02:00
bdddea541f
update lzma to v9.22 beta
2014-06-24 11:22:55 +02:00
0e3bee6f30
- Enable 'language' feature on unix targets.
...
The sdl version of the function 'SetLanguageIDs' is very limited, comparing to the win32 counterpart, as it will try to accept only the language codes (ie 'enu', 'fr', 'ptb', etc). If a different string is provided, zdoom will default its language to English.
2014-06-23 20:02:40 +02:00
e15f80f640
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-23 09:27:30 +02:00
4f599b7b4d
Merge branch 'master' of https://github.com/binarycrusader/zdoom
2014-06-22 09:00:23 +02:00
e56e525d0f
- A_FireCustomMissile transfer tranlsation flag, code submission by jpalomo
2014-06-22 08:55:21 +02:00
6164807e97
- fix x64 visual studio linking for common controls
2014-06-21 22:49:42 -07:00
640a6156e5
Merge pull request #1 from rheit/master
...
Sync with zdoom trunk
2014-06-21 20:38:05 -07:00
7374cd34cf
Merge branch 'master' of https://github.com/darealshinji/gzdoom
2014-06-19 11:20:47 +02:00
d30bf6768e
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-19 11:20:38 +02:00
7757755e40
fix detection of libglew library on GNU/Linux
2014-06-19 10:43:37 +02:00
2d896d2b47
Added wi_autoadvance
...
- Prevents an absent player from stopping the intermission
2014-06-17 20:26:49 +12:00
a3a7ee569f
Multi-intermission waits for all players + changes
...
- Added a segment of code that now makes the intermission wait for all
players before advancing, instead of continuing on any player. A "ready
icon" shows to reflect this.
- The Deathmatch intermisson couldn't show the ready icon (because it
just used the ingame scoreboard), so a proper intermission was added,
which reflects the same design as the coop scoreboard.
- The colour column wasted more space then it should have needed, so it
was replaced with player colour backgrounds.
- Slight y offset adjustments to make everything fit in 320x200
properly.
2014-06-17 19:46:10 +12:00
5a0f1a882a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-15 21:57:06 +02:00
2838c4b25b
Prediction was rebuilding too much thinglist data
...
- Stopped player prediction from rebuilding more sector list data then
the player originally had.
2014-06-16 03:34:33 +12:00
67c6690689
Added a check that doesn't print empty obituary strings, as wad's that hide obituary strings in multiplayer games end up spamming a lot of empty lines.
2014-06-11 23:30:25 -04:00
3c0ba494f9
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-11 18:58:42 +02:00
2d8813a165
- fixed dynamic light definition for Hexen's blue candle.
2014-06-11 18:58:25 +02:00
842ef86e73
Don't reset the inventory of dead players
2014-06-09 19:54:40 +12:00
20adcecb1d
Remove redundant saving of GL nodes if they were loaded from cache
2014-06-02 10:54:52 +02:00
3e7b0c2916
Fix crash when GL nodes file cannot be opened for writing
...
Report errors to console if nodes file cannot be opened or written
2014-06-02 10:53:29 +02:00
9cd074ddf3
- fixed: plane equation vectors must be normalized when being loaded from UDMF.
2014-06-02 10:51:17 +02:00
96e4cb90b7
Fix crash on attempt to save cached OpenGL nodes on OS X
...
Root permissions are required to be able to create directories inside /Library/Application Support
So user's ~/Library/Application Support is used to store cached nodes
2014-06-01 15:12:41 +03:00
7fedaf9221
Merge branch 'master' of https://github.com/rheit/zdoom
2014-06-01 12:39:13 +02:00
a26fbc74f0
Fix compilation errors in latest texture-related changes
...
GCC and Clang complain about non-POD type passed to variadic function.
2014-06-01 10:27:16 +03:00
90ac160b70
Merge branch 'upstream2' of https://github.com/Edward850/zdoom
2014-06-01 09:04:37 +02:00
f1661f1419
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-06-01 09:04:09 +02:00
3817bed0b3
Weap scroll could sometimes miss sameslot weapons
...
In rear cases, when using next/prevweap, defined weapons in the same
slot couldn't cycle when looping to another when you only had weapons in
1 slot.
2014-06-01 18:13:47 +12:00
e8513a64ed
Rebuild nodes for hellfact map04
2014-06-01 15:32:43 +12:00
d925279bef
- fixed texture name handling in GL related texture classes for recent changes in ZDoom to eliminate the 8 character name limit.
2014-06-01 00:04:28 +02:00
98c25deec1
Fix LZMA compilation on GCC with position-independent code (PIC) generation enabled
...
EBX register is used Global Offset Table in PIC
http://www.greyhat.ch/lab/downloads/pic.html
2014-05-31 16:29:28 +03:00
3c5d07e9c6
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-31 11:05:44 +02:00
8f5683e23d
- moved secret found message to string table and removed the CVAR crutch that dates from a time when modifying string table content wasn't as easy as it is now.
...
- added 'showsecretsector' CVAR to show the sector number with the secret found message.
2014-05-29 17:50:14 +02:00
75cde0b221
- allow locks to check for a key's species so that newly defined keys can open previously defined locks without the need to redefine them.
2014-05-29 17:30:01 +02:00
72bbb19cc7
- Shut up GCC aggressive optimizer warnings.
...
From what I can see, GCC would miscompile the involved loops, because the index variable is 'signed int' and the multiplication with an unsigned would cause signed overflow (undefined behavior). Change the index variable type to 'unsigned int' to expect unsigned overflow (conformant to standard).
2014-05-25 10:11:09 +02:00
b285cbebe4
- Fixed compiler errors in latest TEXTURES code.
2014-05-25 01:12:16 +02:00
9d846395bc
- replaced console buffer with a significantly more efficient new version that also can hold a lot more data.
2014-05-24 21:05:00 +02:00
e813ddf251
- fixed bad comparison.
2014-05-24 16:47:34 +02:00
01e909070a
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-23 19:08:56 -07:00
360e7d17f2
Merge branch 'master' of https://github.com/rheit/zdoom
2014-05-21 15:25:56 +02:00
Braden Obrzut
Christoph Oelckers
Edoardo Prezioso
alexey.lysiuk
djcj
Shawn Walker
Shawn
Edward Richardson
WChrisK