ddced06be2
Merge commit '6e45c565a0bc8d05279b0b2458a3fb718ae0924c' into scripting
...
Conflicts:
src/p_mobj.cpp
(This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)
2015-04-28 12:59:20 +02:00
0474560ac6
Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting
...
Conflicts:
src/d_main.cpp
src/info.cpp
src/p_local.h
(Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff.
2015-04-28 12:54:01 +02:00
065c0a79cd
Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting
...
Conflicts:
src/d_main.cpp
src/info.cpp
src/info.h
src/p_acs.cpp
src/p_interaction.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_properties.cpp
(scripting branch update part 5)
2015-04-28 12:48:33 +02:00
2604905b0c
- missed one compile error in last merge.
2015-04-28 12:03:06 +02:00
792cad89b3
Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting
...
Conflicts:
src/g_hexen/a_clericstaff.cpp
src/g_hexen/a_hexenspecialdecs.cpp
src/p_acs.cpp
src/p_enemy.cpp
src/p_interaction.cpp
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_expression.cpp
(Scripting branch update part 4)
2015-04-28 11:59:33 +02:00
6ebdf7396c
Merge commit '8e0151b4c1b88eaf295042ea2d545a83b4b99acc' into scripting
...
Conflicts:
src/sc_man_tokens.h
src/thingdef/thingdef_exp.h
src/thingdef/thingdef_expression.cpp
(Scripting branch update part 3)
2015-04-28 10:59:50 +02:00
a13ada3b2d
Revert "Merge commit '173dbd6bcee02a9e9c12a4a74d1fffe3e081d162' into scripting"
...
This reverts commit e9cbb0b223d6e3fc0567
2015-04-28 10:39:35 +02:00
e9cbb0b223
Merge commit '173dbd6bcee02a9e9c12a4a74d1fffe3e081d162' into scripting
2015-04-28 10:37:23 +02:00
d6e3fc0567
Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting
...
Conflicts:
src/info.cpp
src/thingdef/thingdef_expression.cpp
wadsrc/static/actors/constants.txt
(Scripting branch update part 2)
2015-04-28 09:57:01 +02:00
7898e189df
- fixed problems in CMake project files:
...
* thingdef_function.cpp no longer exists
* the build rule for zcc-parse.c was not correct.
2015-04-28 09:40:57 +02:00
56989d3422
Merge commit 'ec5817869592660af6837b9f4e20ed140972a2b2' into scripting
...
Conflicts:
src/p_enemy.cpp
src/p_enemy.h
wadsrc/static/actors/constants.txt
(Scripting branch update part 1)
2015-04-28 09:34:51 +02:00
6e45c565a0
- fixed: FResourceLump::LumpNameSetup's iname parameter can point to the FullName variable's stringbuffer so any assignment to that variable must be done indirectly.
2015-04-04 20:52:55 +02:00
a5c75c1b1a
- added some missing autoload sections (Hacx 1.2 vs. Hacx 2, Hexen vs Deathkings and Heretic vs. Shadows of the Serpent Riders.) and filter names for Strifeteaser1 and Strifeteaser2 which are needed for exporting the conversation IDs to MAPINFO
2015-04-04 20:44:27 +02:00
87229f4787
Merge branch 'fix_filter_crash' of https://github.com/alexey-lysiuk/gzdoom
2015-04-04 14:12:13 +02:00
bd96adafda
- cleanup
2015-04-04 14:12:04 +02:00
8b92c45f84
Fixed crash in lump filtering caused by uninitialized variables
2015-04-04 12:38:37 +03:00
747e160c96
Merge branch 'master' of https://github.com/rheit/zdoom
2015-04-04 10:30:37 +02:00
338a220df8
- add empty editor number mapping for GZDoom's dynamic lights so that these will no longer produce errors when loaded with ZDoom.
2015-04-04 10:30:09 +02:00
51591d10b0
- handle slope things through new definition tables as well. Since these get processed outside P_SpawnMapThing it required some restructuring so that the actual spawn data is present when slope things get processed.
...
- removed FMapThing::Serialize because it isn't used anywhere - it was rather broken anyway.
2015-04-04 10:25:01 +02:00
a5e67f7332
Split sndinfo.txt up into multiple files using filter directories.
...
- This means the original need for $ifdoom, $ifheretic, etc directives is
no more, but they need to stay for compatibility with third-party wads
that use them.
2015-04-03 22:58:58 -05:00
7b4d6e2f87
Add lump filtering for archive resources
...
- Multi-directory archives (e.g. zips) now support filtering lumps
depending on the loaded IWAD. The search rules are the same as for the
Autoload entries in the user's ini. For instance, if you are playing
Doom 2, the following filters will be applied:
* "filter/doom2/*"
* "filter/doom/*"
They will be renamed to strip out the "filter/doom2/" and "filter/doom/"
parts and will be ordered so they take precedence over any files not
inside a filter/ directory. Any files inside another filter/ directory
(e.g. "filter/hexen/*") will be ignored.
2015-04-03 22:42:22 -05:00
fc6f983c13
Fix memory leak when passing directories to -file
2015-04-03 21:50:08 -05:00
efa82cf38b
Consolidate archive sorting into FResourceFile base class
2015-04-03 20:22:18 -05:00
966d0b7034
Use FString for FResourceLump::FullName
2015-04-03 20:00:58 -05:00
a08e439551
Update VS2005 project
2015-04-03 19:21:23 -05:00
2ec8e2c2ac
- moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them.
2015-04-04 00:39:09 +02:00
4f7ec3ad89
- print proper information about non-actor mapthings.
2015-04-03 22:23:42 +02:00
9e5bf38123
- handle all special mapthing items (player starts, polyobj spots) via the new MAPINFO method instead of hard coding them in the spawn function.
...
(Note: The buildmap loading code should be adjusted to the new functionality as well eventually.)
2015-04-03 21:17:10 +02:00
15dbbc9137
- set editor numbers through MAPINFO. The DECORATE way still works ans will override any definition made in MAPINFO.
...
- use a standard TMap for finding editor numbers
2015-04-03 16:51:45 +02:00
463d495b80
- strife was broken, too...
2015-04-03 16:44:41 +02:00
8b06b24035
- took editor numbers out of DECORATE definitions.
2015-04-03 16:34:07 +02:00
9617b4afa8
- fix more search&replace mess.
2015-04-03 16:31:28 +02:00
937d793353
- fixed Hexen editor numbers.
2015-04-03 15:34:41 +02:00
bd77f83bab
- added editor number definitions to MAPINFO.
2015-04-03 13:54:38 +02:00
ccd9fb9c23
- moved FDoomEdMap to its own file to make the upcoming changes a bit nicer to handle.
2015-04-03 10:54:55 +02:00
6c603b3c78
Merge branch 'misc_code_improvements' of https://github.com/edward-san/zdoom
2015-04-03 09:33:33 +02:00
4c06e71536
Merge branch 'dmgforcedfix' of https://github.com/MajorCooke/zdoom
2015-04-03 09:32:46 +02:00
27c1434585
- Fixed: Buddha never took forced damage into account.
2015-04-02 20:52:51 -05:00
ef562c0341
Add dot sprites for Hexen beta flies
2015-04-02 17:53:15 -05:00
d37f9cbcae
Add flies (doomed #112 ) from the Hexen retail beta
...
...because it brought back memories of adding Strife support.
- The search function is radically different, but the flying mechanics are
the same.
2015-04-02 17:52:54 -05:00
7c7c3fb54e
- Make the 'crashout' CCMD available in non-win32.
2015-04-02 20:14:33 +02:00
a88f515364
- Import GAMENAMELOWERCASE macro from Zandronum.
...
This will greatly help reducing the code delta between ZDoom and the child ports.
2015-04-02 13:27:52 +02:00
e07f64a23a
- Increase the SDL crashinfo char buffer to 4 KB.
...
This helps the crash catcher when there are numerous wad files, for which it's possible that either the wad list, the map or the position is truncated. A more reliable alternative to this should be allocating the char buffer, but I never heard about a way to do this reliably during signal handling.
2015-04-02 13:19:48 +02:00
6c07d765db
- Fixed a wrong linux macro in an ifdef.
2015-04-02 13:18:37 +02:00
0a16855232
- fixed: The assignment to the 'player' variable in P_DamageMobj occured too late, skipping a few cases.
...
- changed monster unblocking logic to include players as well (i.e. a player being stuck inside another actor is allowed to move away from that other actor.)
2015-04-02 10:05:32 +02:00
e70aae91e3
- Fixed NODAMAGE not ignoring telefrag damage.
2015-04-01 10:31:47 -05:00
74f4ae86d8
- forgot to save this...
2015-04-01 11:57:10 +02:00
ad9e4413fa
- made the texture precaching code a bit more self-descriptive after finding a discrepancy in handling between ZDoom and GZDoom's versions.
2015-04-01 11:48:47 +02:00
34aeb428a1
- Removed the check for this flag from P_RadiusAttack because MF7_CAUSEPAIN cannot be used for radius attacks. Their logic is too different from regular attacks.
2015-04-01 10:01:48 +02:00
d940c6a2ee
- fixed: With the recent changes to the damage code, the check for MF5_NODAMAGE was too early. Putting it into AActor::TakeSpecialDamage is also not the best idea because that limits that function's potential.
2015-03-31 23:15:43 +02:00
Christoph Oelckers
alexey.lysiuk
Randy Heit
MajorCooke
Edoardo Prezioso