Christoph Oelckers
6a3a159e09
Merge branch 'master' into GLEW_VERSION
2014-04-15 09:37:58 +02:00
Christoph Oelckers
dbefac81d8
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-15 09:26:05 +02:00
Christoph Oelckers
4e683d360d
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-04-15 09:22:50 +02:00
Christoph Oelckers
2205ca606f
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-15 09:18:04 +02:00
Edward Richardson
4270838613
CANRAISE state definition
...
CANRAISE state for allowing a monster to be resurrected without an
infinite frame
2014-04-12 22:02:19 +12:00
Gaerzi
101107b1e5
Updated documentation
2014-04-12 10:55:10 +02:00
Gaerzi
4cac599b88
Less flags, more generic properties
2014-04-11 00:58:59 +02:00
Gaerzi
580094a792
More editing flags
...
PSX-inspired flags to change the render styles of monsters (and other
things).
2014-04-10 12:32:23 +02:00
Christoph Oelckers
bbb41e869c
Merge branch 'master' of https://github.com/Edward850/zdoom
2014-04-07 19:54:30 +02:00
Edward Richardson
ca93e04de3
Added GetActorPowerupTics ACS function
2014-04-07 23:23:55 +12:00
Christoph Oelckers
69af73d9b9
- alternative configuration using GLEW to get extension functions. This requires GL 2.0, though so it won't be promoted to the mainline for the time being.
...
- removed all pre GL 2.0 support.
2014-04-06 14:35:44 +02:00
alexey.lysiuk
878dcdc0a4
Fix loading of lumps from directory on OS X
...
Use POSIX-compliant opendir() / readdir() functions instead fts_open() / fts_read()
Unlike Linux version, on OS X fts_read() inserts extra slash character between source directory and traversed entry paths
2014-04-06 12:56:51 +03:00
Christoph Oelckers
d74f045004
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
game-music-emu/game-music-emu.vcproj
2014-04-05 15:37:10 +02:00
Randy Heit
940794929c
Remove more VC++ warnings
2014-04-03 17:51:15 -05:00
Randy Heit
f429510cd1
We're building GME static, so don't do any DLL magic on Win32
2014-04-03 17:26:59 -05:00
Randy Heit
1d52d75fab
Add new GME files to VC++ 2005 project
2014-04-03 17:23:18 -05:00
Randy Heit
138e7ff749
Redo GME warning-silencing that was undone by commit fbddfbe57
2014-04-03 17:16:40 -05:00
Randy Heit
fc97584c69
Disable warning C4200 on VC++
...
- This warning is about using zero-sized arrays in structs (aka flexible
member arrays). It's standard-enough for our purposes, so don't warn
about it, since neither GCC nor Clang do.
2014-04-03 16:50:20 -05:00
Randy Heit
43fe317dbe
Use flexible array members for structs that end with var-sized arrays
...
- Since Clang++, G++, and VC++ all support this extension (even though it's
technically officially only part of C99), use it. It lets Clang's array-
bounds checker know that these are meant to be accessed out of their so-called
"bounds".
2014-04-03 16:33:33 -05:00
Christoph Oelckers
47406a3406
- I don't think it's a good idea to put a 64 MB lookup table into the static data segment, if it's for a piece of code most people will never use...
2014-04-03 23:02:43 +02:00
Christoph Oelckers
e446a8eb30
Merge branch 'master' of https://github.com/coelckers/gzdoom
2014-04-03 22:56:50 +02:00
Gaerzi
0aba6e09f3
Disambiguate which abs type we want.
2014-04-03 20:14:38 +02:00
Randy Heit
fbddfbe576
Upgrade game-music-emu to version 0.6.0
2014-04-03 09:19:51 -05:00
Randy Heit
1d1289722f
Change , to && in 2 for loops in Oktalyzer loader
...
- For something like i < n_chnnels, j < 4 , the first condition is completely unused, so why put it in the for loop at all? I assume these are supposed to be binary-and and not sequences.
2014-04-03 08:50:09 -05:00
Randy Heit
4406578522
Fixed: DSMF loader wrote outside filename array's bounds
2014-04-03 08:46:47 -05:00
Randy Heit
3670acbe63
Don't compile some unused DUMB tables spotted by Clang
2014-04-03 08:44:33 -05:00
Christoph Oelckers
072db7920d
Merge branch 'master' of https://github.com/rheit/zdoom
2014-04-02 23:51:24 +02:00
Christoph Oelckers
59eede6e6c
Merge branch 'master' of https://github.com/coelckers/gzdoom
2014-04-02 23:49:34 +02:00
Gaerzi
7261af1d9f
Don't define HQX_API to anything on Windows
2014-04-02 20:23:17 +02:00
Edward Richardson
546ae759fd
Cleanup old prediction fix development code
2014-04-02 21:25:45 +13:00
Edward Richardson
be33d2894a
Fixed prediction thinglist order restoration
...
Prediction didn't take sector_thinglist and thinglist order into
account.
This notably broke the order in which things were damaged.
2014-04-02 21:25:12 +13:00
Gaerzi
3e41685536
Merge pull request #6 from galtgendo/for-upstream
...
use portable hqx code
2014-04-01 23:57:42 +02:00
Christoph Oelckers
a9bea7d774
Merge branch 'getsectorz_take2' of https://github.com/crimsondusk/zdoom
2014-03-31 19:12:47 +02:00
Christoph Oelckers
edcc257667
fixed: APROP_StencilColor was not implemented for CheckActorProperty.
2014-03-31 16:39:34 +02:00
Christoph Oelckers
bd3bd0ed22
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-03-31 16:36:54 +02:00
Christoph Oelckers
e983649731
Merge branch 'master' of https://github.com/rheit/zdoom
2014-03-31 16:02:43 +02:00
Christoph Oelckers
639367df8d
Merge branch 'upstream2' of https://github.com/Edward850/zdoom
2014-03-31 16:00:11 +02:00
Christoph Oelckers
55844e00e5
Merge branch 'master' of https://github.com/crimsondusk/zdoom
2014-03-31 15:59:21 +02:00
Edward Richardson
016cc7ba96
Missed space in flags7 line.
2014-03-31 23:57:43 +13:00
Edward Richardson
79f6e77e2b
Remove garbage characters from info CCMD
2014-03-31 23:51:18 +13:00
crimsondusk
c47d77228d
- increased updaterevision's buffer sizes to prevent GIT_BRANCH from cut short
2014-03-30 21:27:05 +03:00
alexey.lysiuk
a97b068ed7
Enable fighting between different types of gargoyles and golems
...
In vanilla Heretic:
- Gargoyles are able to fight with Fire Gargoyles
- Golems are able to fight with Nitro Golems, both regular and ghosted versions
2014-03-30 13:27:27 +03:00
Christoph Oelckers
6e87ee80e4
Merge branch 'for-upstream' of https://github.com/galtgendo/gzdoom
2014-03-29 12:04:38 +01:00
galtgendo
8f97e96af1
silence a noisy warning
2014-03-28 01:54:42 +01:00
galtgendo
bf0b850088
look for gme header in the proper location
2014-03-28 01:54:20 +01:00
galtgendo
4909aa750f
Use more portable hqx code from googlecode hqx
...
Conflicts:
src/CMakeLists.txt
2014-03-28 01:49:53 +01:00
crimsondusk
d7a2435703
- the ACS functions GetSectorFloorZ and GetSectorCeilingZ now interpret tag=0 as 'any sector' and return the z height of whatever sector is at those coordinates.
2014-03-27 16:34:32 +02:00
Edward Richardson
697ef02871
Added StencilColor to Set/GetActorProperty
2014-03-28 00:23:12 +13:00
alexey.lysiuk
6a958b032c
Add NOBLOOD flag to Heresiarch actor
...
Heresiarch entity in vanilla Hexen doesn't spawn blood when hit
2014-03-18 12:29:14 +02:00
Christoph Oelckers
d7e81d2cb4
Merge branch 'fnodebuilder_new_delete_fix' of https://github.com/edward-san/zdoom
2014-03-16 13:27:21 +01:00