Christoph Oelckers
844f79e04a
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-30 17:50:30 +02:00
Christoph Oelckers
4eb6f74e36
Merge branch 'maint'
2013-07-30 16:53:00 +02:00
Christoph Oelckers
3480d40484
- fixed: AActor::Die may only randomize the death state's duration if it is positive. Otherwise -1 (infinite) gets clobbered.
2013-07-30 16:52:36 +02:00
Christoph Oelckers
2cd1fd9658
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-30 15:25:09 +02:00
Christoph Oelckers
ef6fca823e
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/version.h
2013-07-30 15:20:38 +02:00
Christoph Oelckers
9c08a029b1
Merge branch 'maint'
2013-07-30 15:14:10 +02:00
Christoph Oelckers
a13af5cc65
Merge branch 'maint' of https://github.com/edward-san/zdoom into maint
2013-07-30 15:08:44 +02:00
Edoardo Prezioso
7e21eafc2f
- Fixed mismatched alloc/dealloc in FTextureManager.
...
The 'TextureFrames', which is attached to all the 'mAnimatedDoors', were deleted with one-pointer 'delete' and they were allocated with 'new[]'.
2013-07-30 13:36:56 +02:00
Christoph Oelckers
e01c4e0201
Merge branch 'maint'
2013-07-30 13:18:08 +02:00
Christoph Oelckers
16456bec56
- added separate colors for the various types of 2-sided walls for the overlay automap. They previously all mapped to the same CVAR.
2013-07-30 13:17:20 +02:00
Edoardo Prezioso
4ce0574b3f
- Use a more conformant C++ preprocessor macro identifier for Unix systems.
...
The 'unix' identifier isn't defined when '-std' is passed to the compiler (tested with gcc and clang), so use '__unix__' which is well enough documented.
2013-07-30 11:46:14 +02:00
Christoph Oelckers
81334809c4
- changed autoloading of *.deh lumps: it is now controlled by a CVAR with 3 options: never load *.deh lumps, load all of them or only load the last one. *.deh loading is disabled by default.
2013-07-30 09:32:33 +02:00
Christoph Oelckers
27de9f45af
- commented out autoloading of .DEH lumps for maint branch.
2013-07-30 09:25:07 +02:00
Christoph Oelckers
805de60aa4
- fixed: ChangeSpy didn't check if a player's camera's player pointer was valid before using it to get an index into the players table.
2013-07-30 09:16:27 +02:00
Braden Obrzut
c4af738bf6
- Fixed: crash when closing ZDoom in the save menu and a memory leak.
2013-07-30 00:20:21 -05:00
Christoph Oelckers
6dee878b2e
- used TEXTCOLOR_ #defines for colorizing CCMD list, remove use of strbin1.
2013-07-30 00:20:21 -05:00
slatenails
0c850e8ddd
Results for console tab-completion are now color-coded. CCMDs appear blue, CVars green and aliases red.
2013-07-30 00:20:20 -05:00
Braden Obrzut
bc71d4537e
Merge branch 'maint'
2013-07-29 18:55:29 -04:00
Braden Obrzut
eb5d57be06
- Fixed: crash when closing ZDoom in the save menu and a memory leak.
2013-07-29 18:35:19 -04:00
Randy Heit
c810b4d724
Use new degree FLOPs for DECORATE expressions.
...
- Now that the VM supports degrees, use those instructions when emitting
code for cos and sin DECORATE expressions. (This looks like it also
fixed a bug where sqrt also did the degree to radian conversion.)
2013-07-28 20:31:23 -05:00
Randy Heit
ff7b1f6e5e
Add degree variants of FLOP operations
...
- Added versions of the trig operations supported by FLOP that can work
with degrees directly instead of radians.
- Reorder FLOPs into more sensible groupings.
2013-07-28 20:22:47 -05:00
Randy Heit
0468b1f9ce
Delete default expressions for action definitions
...
- After StateParams was removed in commit 4a1fbdb
, the expressions for
default paramaters that ParseActionDef() created went nowhere and were
lost. Properly throw them away by deleting them as soon as they've been
parsed.
2013-07-28 20:05:07 -05:00
Randy Heit
241622300e
Removed some EvalExpression implementations
...
- Removed EvalExpression() implementations from some subclasses of
FxExpression that don't make any sense in the context of evaluating a
constant value.
2013-07-28 19:40:48 -05:00
Randy Heit
2c24e7f9c6
Remove self pointer from FxExpression::EvalExpression()
...
- Every place that calls this now (which are all in thingdef_parse.cpp)
passed NULL for the self pointer, so it was superfluous to have around.
2013-07-28 19:28:14 -05:00
Christoph Oelckers
cf31ccbbaf
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-28 18:23:50 +02:00
Christoph Oelckers
c7d167d278
- used TEXTCOLOR_ #defines for colorizing CCMD list, remove use of strbin1.
2013-07-28 17:15:47 +02:00
Christoph Oelckers
6f4b09cc77
Merge branch 'master' of https://github.com/slatenails/zdoom
2013-07-28 16:42:36 +02:00
Christoph Oelckers
c253d40fbb
- externalize labels for automap statistics display to the string table.
2013-07-28 16:18:57 +02:00
slatenails
48a29b769f
Results for console tab-completion are now color-coded. CCMDs appear blue, CVars green and aliases red.
2013-07-28 14:58:30 +03:00
Christoph Oelckers
909ec2e35a
Merge branch 'maint' into scripting
2013-07-28 10:47:17 +02:00
Christoph Oelckers
b534cba113
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-28 10:19:08 +02:00
Christoph Oelckers
775ecdeebb
- fall back to drawing triangles on automap when encountering actors with non-displayable sprites
2013-07-28 10:14:46 +02:00
Randy Heit
4a1fbdb32a
Remove all state expression/param stuff
...
- This all became vestigial code after the relevant information was all
moved into FStateTempCall. Now that the MBF code pointer code has been
converted, I can be sure it wasn't still used anywhere.
2013-07-27 22:34:44 -05:00
Randy Heit
9485752b55
Reimplement MBF code pointer parameters
...
- Where the old code mucked about with parameter lists to convert misc1
and misc2 values to action function parameters, we now create new script
functions using a VMFunctionBuilder to pass the parameters to an action
function. This code is completely untested, as I have no BEX patches to
test it with, but at least it compiles without error.
2013-07-27 22:07:37 -05:00
Randy Heit
6cf0916f72
Use VMFunctionBuilder::EmitParamInt in thingdef_expression.cpp
2013-07-27 22:06:14 -05:00
Randy Heit
0603295822
Added EmitParamInt to VMFunctionBuilder
2013-07-27 22:06:14 -05:00
Randy Heit
57bb9c2f7a
Better disassembly of FLOP instructions.
...
- Annotate FLOP instructions with the name of the floating point operation
indicated by the C field.
2013-07-25 22:29:59 -05:00
Randy Heit
070c0a9e30
Stop leaking function damage expressions.
...
- Function damage expressions parsed from DECORATE are now stored in a
single array and deleted at the end of FinishThingdef().
2013-07-25 21:42:30 -05:00
Randy Heit
e3e32d7cca
Added DeleteAndClear method to TDeletingArray.
...
- Normally, TDeletingArray only deletes its contents when it is destroyed.
Now you can do it earlier if you want.
2013-07-25 21:41:18 -05:00
Christoph Oelckers
992ba0bbf4
- added handling of MF3_FOILINVUL for A_BFGSpray. This function needs special treatment because the shooting player is considered the inflictor of the spray damage.
2013-07-26 00:52:12 +02:00
Christoph Oelckers
b499742d46
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-25 17:31:27 +02:00
Christoph Oelckers
897a17309b
- added menu option for sprite display on automap.
2013-07-25 17:22:45 +02:00
Christoph Oelckers
7006df8d96
- fixed sprite rotation in automap submission
2013-07-25 17:19:36 +02:00
Christoph Oelckers
9ed829c3af
Merge branch 'map_sprites' of https://github.com/alexey-lysiuk/gzdoom
2013-07-25 16:39:53 +02:00
Christoph Oelckers
81cf5f8d38
Merge branch 'maint'
2013-07-25 16:39:32 +02:00
alexey.lysiuk
76e1e87456
+ things as sprites on map, controlled with am_showthingsprites CVAR
...
drawing of sprites instead of things/players markers with am_cheat >= 2
possible am_showthingsprites values are:
0 - sprites disabled
1 - static front sprites
2 - animated front sprites
3 - animated sprites with actual things angles
2013-07-25 17:01:07 +03:00
Christoph Oelckers
6dd956c0dc
- fixed: Speaker names in dialogues were not able to use the string table.
2013-07-25 15:58:47 +02:00
Randy Heit
f6bbd5abf7
Simplify AST dumps.
...
- More forced line breaks.
- Don't use extra parentheses in places where it can still be unambiguous
without them.
- Don't print the UserType for basic-types that aren't ZCC_UserType.
2013-07-24 21:35:02 -05:00
Randy Heit
7d304a4cb6
Partially revert commit 46c0127
...
- Being able to omit optional function arguments is not such a nonsensical
thing after all. However, the previous grammar was still inadequate for
representing this in a useful way.
2013-07-24 20:59:29 -05:00
Christoph Oelckers
cf3d1aa2e3
Merge branch 'maint'
2013-07-24 23:10:32 +02:00