Randy Heit
|
55142078d8
|
Normalize line endings
|
2016-03-01 09:47:10 -06:00 |
|
Christoph Oelckers
|
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 |
|
ZzZombo
|
c4b742ebf0
|
- Part 2 of the sanity crusade.
|
2015-02-08 17:03:49 +08:00 |
|
Randy Heit
|
2d87eb0ba2
|
Merge branch 'master' into gonesolong
Conflicts:
src/CMakeLists.txt
src/actor.h
src/g_heretic/a_hereticmisc.cpp
src/g_heretic/a_hereticweaps.cpp
src/g_heretic/a_ironlich.cpp
src/info.h
src/namedef.h
src/p_buildmap.cpp
src/p_enemy.cpp
src/p_map.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
zdoom.vcproj
|
2014-12-20 19:13:14 -06:00 |
|
Christoph Oelckers
|
458e1b1be2
|
- changed sound lookup for ZSDF dialogues so that it first checks the svox/ namespace before using the global one.
|
2014-05-08 11:29:45 +02:00 |
|
Christoph Oelckers
|
251cdacf26
|
Merge branch 'master' into scripting
Conflicts:
src/g_shared/a_randomspawner.cpp
src/g_strife/a_strifeweapons.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/constants.txt
|
2013-09-03 09:01:28 +02:00 |
|
Christoph Oelckers
|
75dd5503cf
|
- fixed: Cost strings for dialogues must not be added in the dialogue parser but while displaying the message to properly handle stringtable entries.
|
2013-09-03 08:24:47 +02:00 |
|
Christoph Oelckers
|
bba092cc0b
|
Merge branch 'master' into scripting
Conflicts:
src/d_player.h
src/g_doom/a_archvile.cpp
src/thingdef/thingdef.h
src/thingdef/thingdef_properties.cpp
|
2013-08-09 13:03:28 +02:00 |
|
Braden Obrzut
|
7e76fb0078
|
- Fixed: Disable ifitem jumping if a link isn't specified since an invalid value can cause a crash.
|
2013-08-09 00:25:29 -04:00 |
|
Randy Heit
|
459ad5abff
|
- Updated scripting branch to latest version in trunk.
SVN r4337 (scripting)
|
2013-06-07 03:31:30 +00:00 |
|
Braden Obrzut
|
b52c3238eb
|
- Instead of implementing the wad code in three places, use the normal resource code for map loading and GL node loading.
SVN r3897 (trunk)
|
2012-10-22 01:28:11 +00:00 |
|
Randy Heit
|
562cf04db2
|
- Update scripting branch to trunk.
SVN r3758 (scripting)
|
2012-07-14 03:04:41 +00:00 |
|
Christoph Oelckers
|
17ed7aaabd
|
- moved the code from r_data.cpp to some better fitting places and deleted this file and r_data.h because the remaining parts of it were just a random collection of unrelated functions.
SVN r3248 (trunk)
|
2011-07-05 10:02:38 +00:00 |
|
Randy Heit
|
99670b708c
|
- Sync scripting branch with what was in trunk on Sunday. I believe that would be revision 2739.
SVN r2790 (scripting)
|
2010-09-16 03:14:32 +00:00 |
|
Christoph Oelckers
|
6c57441bcd
|
- fixed: The UDMF check for dialogues without owning class needs to be relaxed. A dialogue with an id and no class is a valid construct.
- fixed: Trying to assign a non-existent dialogue to an actor in UDMF partially overwrote the default dialogue.
SVN r2579 (trunk)
|
2010-08-24 13:57:17 +00:00 |
|
Christoph Oelckers
|
ec71635ca1
|
- fixed: The USDF CheckActorType function did not return the class object for ZDoom namespace.
- fixed: The binary check for dialogue lumps must only rewind the file by 4 bytes, not completely to the start.
SVN r2568 (trunk)
|
2010-08-22 17:31:42 +00:00 |
|
Christoph Oelckers
|
b452bec0ee
|
- merge USDF branch into trunk.
- add USDF spexs.
SVN r2561 (trunk)
|
2010-08-20 12:20:51 +00:00 |
|