Christoph Oelckers
37de4bea67
Merge branch 'master' of https://github.com/rheit/zdoom
2013-09-03 09:02:44 +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
18386e4b23
Merge branch 'maint'
2013-09-03 08:44:52 +02:00
Christoph Oelckers
11c026ee84
- fixed: displaying sprites on the automap ignored both the actor's scale and translation.
2013-09-03 08:34:55 +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
4ed27c22fd
Merge branch 'master' of https://github.com/MazterQyou/zdoom
2013-09-03 07:59:37 +02:00
Alex Qyoun-ae
b6baeecd9a
Fixed compilation with LLVM compilers
2013-09-03 03:49:39 +04:00
Christoph Oelckers
ba2a07fb26
- removed all uses of single precision floats from FraggleScript code.
2013-09-02 09:08:47 +02:00
Christoph Oelckers
4dc06cca70
- changed minimum required GL version to 1.3. The only 1.4 feature that's required is mipmap generation which on many older cards is available as an extension. The worst thing that can happen with relaxing the version requirement is that on a few ancient graphics cards the mipmapped texture filtering modes produce garbage.
2013-09-02 08:43:56 +02:00
Christoph Oelckers
bab56106c1
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-31 21:53:11 +02:00
Randy Heit
267030c759
Merge branch 'maint'
2013-08-30 23:13:32 -05:00
Randy Heit
260ce62175
Don't abort for TEXTUREx lumps that define textures with no patches
...
- A texture defined in TEXTUREx without any patches isn't necessarily an
error, so accept. This also means they shouldn't be used for determining
if a TEXTURE directory belongs to Strife instead of Doom.
2013-08-30 23:10:20 -05:00
Randy Heit
b0371e1804
Don't abort when merely checking if a non-map is a map
...
- When P_OpenMapData() is called by P_CheckMapData(), we don't actually
care if any required lumps are missing. This just means it isn't a valid
map, so don't abort with I_Error().
2013-08-30 22:38:57 -05:00
Randy Heit
33ee8f9fef
Merge branch 'maint'
2013-08-29 22:27:49 -05:00
Randy Heit
a4fcbf5e06
Merge branch 'master' of github.com:rheit/zdoom
2013-08-29 22:27:27 -05:00
Randy Heit
0f0d9da839
Reset FirstFreeEntry in ACSStringPool::ReadStrings()
...
- Fixed: When an ACS string pool was read from a savegame, FirstFreeEntry
would not be updatedt, except by the Clear() function. This left FirstFreeEntry
at 0, which meant the next string added to the pool would always go in
slot 0, whether it was free or not.
2013-08-29 22:22:30 -05:00
Randy Heit
7143ae49e1
Fixed: CheckPlayerCamera not sync safe
...
- If a player is spying through another player, CheckPlayerCamera will
return the TID of the player you are "spying", but as coopspy isn't a
net command, this wont be reflected by all nodes. So to fix this,
CheckPlayerCamera now returns -1 if a player's camera is that of any
player at all. (thanks edward850)
2013-08-29 21:45:37 -05:00
Randy Heit
aac0de3e48
Fixed: Make A_SetTics work with weapons.
...
- When A_SetTics is called from a weapon, we need to set the tics for the
psprite instead of the actor itself.
2013-08-29 21:40:01 -05:00
Randy Heit
28e5cc536a
Add some awareness of short file names
...
- Added I_GetLongPathName(). It wraps the Win32 API's GetLongPathName().
DArgs::CollectFiles() now calls this for every argument it processes, so
any arguments passed using short file names will be converted to long
file names. This is mainly of interest so that savegames will never
record the short file name, which can change based on what else is in
the directory.
2013-08-29 21:24:05 -05:00
Randy Heit
2823ea5de3
Annote AST nodes with source information
2013-08-28 22:59:03 -05:00
Randy Heit
5e0e74a47d
Fix incorrect comment
2013-08-28 22:35:29 -05:00
Christoph Oelckers
bd5777917e
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-28 11:23:00 +02:00
Christoph Oelckers
9c2454eacc
Merge branch 'maint'
2013-08-28 11:20:53 +02:00
Christoph Oelckers
26c381224c
- removed unused constants in p_map.cpp.
2013-08-28 11:16:30 +02:00
Christoph Oelckers
f8899f98fc
- fixed: The secret counter was not incremented for items that had the UDMF COUNTSECRET flag set.
2013-08-28 11:14:48 +02:00
Christoph Oelckers
737708b635
- fix c++11's compile problems.
2013-08-28 08:33:11 +02:00
Braden Obrzut
0a16e9a256
- Fixed uninitialized variable in A_AlertMonsters.
2013-08-27 20:42:35 -04:00
Braden Obrzut
0fb37ca5f1
Merge branch 'maint'
2013-08-27 20:41:10 -04:00
Braden Obrzut
5079d6c505
- Fixed: clang 32-bit compile (I hear it still doesn't run though).
...
- Applied edward's patch to remove boolean increment.
2013-08-27 20:28:38 -04:00
Christoph Oelckers
4d3f6cae2e
Merge branch 'master' of https://github.com/rheit/zdoom
2013-08-27 23:53:40 +02:00
Christoph Oelckers
61af682be9
- made some alterations to last commit after reviewing how the broken code managed to get into GZDoom.
2013-08-27 23:53:14 +02:00
Christoph Oelckers
e6f571729f
- fixed: When calculating an y-texture offset the scale was multiplied with instead of divided by.
2013-08-27 23:31:23 +02:00
Randy Heit
6e018d0c07
Merge branch 'maint'
2013-08-25 17:34:20 -05:00
Edoardo Prezioso
7b5084df44
Shut up warnings from the customized DUMB code.
2013-08-25 17:33:48 -05:00
Edoardo Prezioso
ded1715625
- Merge DUMB commit d31fb2084659b64d07eb0644d9bacfd67059d066 to zdoom.
...
Fixed C++11 compilation error on Mac OS X
2013-08-25 17:33:36 -05:00
Randy Heit
064710422b
Accept empty struct and enum definitions (useless as they may be)
2013-08-24 20:32:59 -05:00
Randy Heit
80daf736ec
Accept enums and structs defined at global scope
2013-08-24 20:28:26 -05:00
Randy Heit
956d754804
DECORATE cleanup
...
- Remove some ExpVal stuff that wasn't used.
2013-08-23 22:17:08 -05:00
Randy Heit
2f7183b937
Use PField instead of PSymbolVariable for DECORATE expressions
...
- The type systems used by PField and FxExpression are completely
incompatible, but I think I got the differences taken care of as far
as ParseNativeVariable(), ParseUserVariable(), and FxClassMember are
concerned.
- Support for declaring native bool variables has been removed for the time
being. It wasn't used anyway.
- Removed PSymbolVariable.
2013-08-23 22:02:51 -05:00
Randy Heit
0d1973a659
Make PStruct::AddField() check for duplicates
...
- PStruct::AddField() now checks the symbol table for a symbol of the same
name before adding a new field. If the name is in use, it returns NULL.
2013-08-23 21:56:18 -05:00
Randy Heit
27ddaad7ca
Set PStatePointer's TypeTableType in PType::StaticInit()
...
- It was forgotten about earlier.
2013-08-23 21:54:35 -05:00
Randy Heit
263b160905
Add PFixed and PArray types
...
- These are types that are stored as integers but otherwise handled as floating point values.
2013-08-23 21:53:54 -05:00
Randy Heit
b5d37348f6
Add code generation simplification methods to PType
...
- To assist with using PType with DECORATE expression code generation,
added GetStoreOp(), GetLoadOp(), and GetRegType() to PType.
2013-08-23 21:52:04 -05:00
Randy Heit
2ec3cbddb9
Mark PType's GetValueInt method as const
2013-08-23 21:50:33 -05:00
Randy Heit
3ea0d1b444
Add VM opcodes NOP, LANG, and SANG
...
- To simplify code generation genericizing, add three new opcodes
* NOP: No-Operation
* LANG: Load Angle - load a BAM angle into a float reg as degrees
* SANG: Save Angle - store a float reg into a BEM angle, converting from degrees
2013-08-23 21:46:40 -05:00
Randy Heit
a69089ffd7
Change disassembly dumps to be controlled from one spot
...
- Instead of changing three places to turn disassembly dumps on and off,
do it with just one place. As a side effect, this now handles the case
where the dump file can't be opened.
2013-08-23 21:43:56 -05:00
Randy Heit
3f6c3fa927
Remove unused GetVariableValue()
2013-08-21 23:19:46 -05:00
Randy Heit
d798c7896c
Remove FxGlobalVariable class
2013-08-21 23:01:41 -05:00
Randy Heit
01822c002f
Use PField instead of PSymbolVariable for A_SetUserVar/Array
2013-08-21 22:58:12 -05:00
Randy Heit
6aee7833d0
Use PField instead of PSymbolVariable for SetMapThingUserData()
2013-08-21 22:51:12 -05:00