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
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
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
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
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
Christoph Oelckers
cf3d1aa2e3
Merge branch 'maint'
2013-07-24 23:10:32 +02:00
Christoph Oelckers
cbc0b70e7c
- TransferStencilColor A_SpawnItemEx patch / by Ryan Cordell.
2013-07-24 20:15:17 +02:00
Christoph Oelckers
627dec1b77
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-23 12:36:55 +02:00
Christoph Oelckers
f8d69b1974
Merge branch 'maint'
2013-07-23 12:33:49 +02:00
Christoph Oelckers
af470b3d56
- fixed: The global variables holding the view's fixed colormap must be preserved when rendering to a camera texture.
2013-07-23 12:32:33 +02:00
Christoph Oelckers
181181a865
- removed player_t destructor call in CopyPlayer.
2013-07-23 12:31:44 +02:00
Christoph Oelckers
ba2faee125
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-22 23:01:58 +02:00
Christoph Oelckers
5d30be0bbd
Merge branch 'maint'
2013-07-22 22:57:04 +02:00
Christoph Oelckers
f3d8790995
Merge branch 'maint' of https://github.com/rheit/zdoom into maint
2013-07-22 22:54:45 +02:00
Christoph Oelckers
cb3275cb40
- added NORANDOMPUFFZ flag for LineAttack - by Blue Shadow.
2013-07-22 22:47:13 +02:00
Christoph Oelckers
83bd8ba1b8
- added NeuralStunner's player.userange submission, but changed it to use the value directly from the PlayerPawn data.
...
- bumped savegame version for addition of APlayerPawn::userange.
2013-07-22 22:37:50 +02:00
Christoph Oelckers
db562142f0
- Fix c++11 literal suffix warnings / patch by Edward-san.
2013-07-22 22:25:44 +02:00
Christoph Oelckers
3f3cbbe7f5
Merge branch 'maint_1.8'
2013-07-22 17:30:51 +02:00
Christoph Oelckers
4e4eb7189a
- fixed: negative extra light levels should not be treated like inverse flashes, that's only the case for INT_MIN.
2013-07-22 17:30:08 +02:00
Braden Obrzut
00f567e128
Merge branch 'maint'
2013-07-22 02:10:20 -04:00
Braden Obrzut
7723613293
- Fixed: ACS function pointer instructions were not updated when library tag size changed.
...
- Fixed: undefined sequence compiler warning.
2013-07-22 02:09:46 -04:00
Christoph Oelckers
aad509c800
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-14 14:47:12 +02:00
Christoph Oelckers
531da15ac2
Merge branch 'maint'
2013-07-14 14:44:11 +02:00
Christoph Oelckers
a90b49dc72
- added string table replacement for A_Print, A_PrintBold and A_Log.
2013-07-14 14:33:45 +02:00
Christoph Oelckers
0c86650db0
- fixed: The savegame code for player restoration did some undefined things with the userinfo that only worked due to previous memory leaks. It must ensure that the userinfos get properly transferred and not implicitly rely on the copy assignment being used to copy the actual player data.
2013-07-14 14:22:49 +02:00
Christoph Oelckers
a59a886f94
- fixed: The SectorDamage 3D-floor code didn't account for Vavoom-style 3D floors where floor and ceiling plane of the control sector are inverted.
2013-07-14 13:24:00 +02:00
Christoph Oelckers
3e8e587ac7
- fixed another leak with userinfos: Since they are no longer POD they may not be memset to 0 in the player_t constructor.
2013-07-14 12:37:25 +02:00