Commit graph

3913 commits

Author SHA1 Message Date
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
Christoph Oelckers
2d2498d1e2 - fixed: userinfo_t needs a destructor to delete its CVARs when it is destroyed. 2013-07-14 10:58:53 +02:00
Christoph Oelckers
e9be49f37d - fixed: R_DeinitPlanes did not free all visplanes because it called R_ClearPlanes with 'fullclear' set to false.
- removed some redundancy from R_ClearPlanes.
2013-07-14 09:47:39 +02:00
Christoph Oelckers
10dd75f902 - externalized "New save game" line for save screen. 2013-07-14 09:31:49 +02:00
Christoph Oelckers
453f4ace5c - added compatibility setting for stuff in Cheogsh2 MAP04's megasphere cage which is positioned too low. 2013-07-14 09:01:00 +02:00
Christoph Oelckers
7ff532cbae Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	src/sdl/iwadpicker_cocoa.mm
2013-07-14 08:40:46 +02:00
Braden Obrzut
9dd3c4b2d5 - When erroring due to the lack of iwads, print instructions more relevent to the user's platform. 2013-07-05 00:45:45 -04:00
Braden Obrzut
8afece1b8a Merge branch 'maint' 2013-07-03 01:58:51 -04:00
Braden Obrzut
80a3e4f902 - Fixed: Cocoa IWAD picker needed to be updated to handle git version strings. 2013-07-03 01:58:13 -04:00
Christoph Oelckers
2f325a1b81 Merge branch 'maint' into maint_1.8
Conflicts:
	src/version.h
2013-07-03 07:34:25 +02:00
Randy Heit
ff49de164a Merge branch 'maint'
Conflicts:
	src/version.h
2013-07-02 15:49:10 -05:00
Randy Heit
5b17c0779b Version 2.7.1 2013-07-02 15:46:31 -05:00
Christoph Oelckers
edd2142a0f Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-02 22:11:55 +02:00
Christoph Oelckers
44dd79953b Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-02 22:02:20 +02:00
Christoph Oelckers
f1dff6c9d3 - fixed: The new XDeath code forgot to move the assignment of the flags4 variable. Also renamed the variable to avoid conflicts. 2013-07-02 22:01:54 +02:00
Randy Heit
3d61365879 Merge branch 'maint' 2013-07-02 14:51:49 -05:00
Randy Heit
e845b292c2 - Always clear bEvilGrin after checking it in FMugShot::UpdateState(). If
it's not an appropriate time to show the grin when the flag is set, it
  shouldn't be saved until later.
2013-07-02 14:48:03 -05:00
Randy Heit
5af1e6f734 - Added a compatibility option to fix Super Sonic Doom's first bonus
stage leaving you frozen when you finished it.
2013-07-02 14:15:08 -05:00
Christoph Oelckers
b6cd38cded Merge branch 'maint_1.8' 2013-07-02 11:44:41 +02:00
Christoph Oelckers
05a95f0ed0 Merge branch 'maint' into maint_1.8
Conflicts:
	wadsrc/CMakeLists.txt
2013-07-02 10:04:35 +02:00
Christoph Oelckers
97bccb5239 - adjusted CMakeLists.txt for brightmaps.pk3 and lights.pk3 to same style as for gzdoom.pk3 2013-07-02 10:02:38 +02:00
Christoph Oelckers
503dc1d9a1 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	wadsrc/CMakeLists.txt
2013-07-02 09:59:59 +02:00
Randy Heit
d9848a8e26 Merge branch 'maint' 2013-07-01 22:21:37 -05:00
Randy Heit
23e21cc85e - Fixed: S_IsChannelUsed() is declared as static, so it should be defined
as such, too.
2013-07-01 22:02:46 -05:00
Randy Heit
001ed91fd4 - Fixed: ACS's PlaySound should mask off the flag bits from the channel
before passing it to S_IsActorPlayingSomething().
2013-07-01 22:01:26 -05:00
Randy Heit
2717ed703d Shuffle FActionMap for better 64-bit alignment. 2013-07-01 21:51:12 -05:00
Randy Heit
e9425b356b - Fixed: Verbose user info strings were written with an extra backslash
character between the key and value.
2013-07-01 21:40:09 -05:00
Braden Obrzut
cc616a417d Merge branch 'maint' 2013-07-01 16:58:14 -04:00
Braden Obrzut
02ff428d54 - Allow generator expressions to be turned off during pk3 building with CMake.
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
2013-07-01 16:57:46 -04:00
Christoph Oelckers
db4f6bb8a1 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-01 18:21:12 +02:00