zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,956 Commits 139 Branches 144 Tags 184 MiB
Commit Graph

1076 Commits

Author SHA1 Message Date
Christoph Oelckers f8e5a0ebf0 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/g_doomedmap.cpp
#	src/info.h
#	src/p_saveg.cpp
#	src/p_setup.cpp
#	src/p_spec.cpp
#	src/r_defs.h
#	wadsrc/static/mapinfo/eternity.txt
#	wadsrc/static/xlat/eternity.txt
 2016-02-06 00:41:00 +01:00
Christoph Oelckers e88901f4b7 - added the EE-Extradata parser I wrote for GZDoom so I can use the Vaporware demo map for testing portal stuff. 2016-02-05 23:51:28 +01:00
Christoph Oelckers dda73b531c Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/p_setup.cpp
#	src/r_defs.h
#	src/version.h

This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.
 2016-02-05 12:31:41 +01:00
Christoph Oelckers c995158d52 Merge branch 'maint' of https://github.com/rheit/zdoom 2016-02-05 01:49:12 +01:00
Randy Heit b3b0886b64 Merge branch 'scripting' 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-02-04 15:17:22 -06:00
Randy Heit b8a24902bc Move extra font characters into filter directories 2016-02-04 13:23:36 -06:00
Christoph Oelckers 87f3a8f0cc Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-03 13:04:16 +01:00
Christoph Oelckers 66f053f131 - on second thought: this shouldn't explode the speakers with too high values. 2016-02-02 15:02:06 +01:00
Christoph Oelckers e12174ffc1 Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-02 14:53:48 +01:00
Christoph Oelckers c002c2fde9 - added a mastervolume setting for DUMB because its default volume is far less than all the other music options. 2016-02-02 14:45:32 +01:00
Christoph Oelckers 456e71ec4b Merge branch 'master' into Clip3DLights 2016-01-31 21:36:16 +01:00
Christoph Oelckers e73e26c15a Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-31 21:11:21 +01:00
coelckers c3cc98b5f3 Merge pull request #523 from alexey-lysiuk/osx_fullscreen 
Final touches to fullscreen mode on OS X
 2016-01-31 16:56:35 +01:00
MajorCooke eb2829ad5e - Added CBF_DROPOFF to A_CheckBlock. Checks for actors stuck in tall ledges or dropoffs. 2016-01-31 09:45:41 -06:00
Christoph Oelckers 4d7e7deea8 Merge branch 'master' into Clip3DLights 2016-01-31 10:10:32 +01:00
alexey.lysiuk bb00c9b588 Added menu option to control fullscreen toggle shortcut on OS X 2016-01-31 10:34:17 +02:00
Christoph Oelckers 8bc7a0a24e Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-30 23:01:36 +01:00
Christoph Oelckers fc57180d7e - added necessary state to implement 3D light splitting using hardware clipping planes. 2016-01-30 23:01:11 +01:00
John Palomo Jr d8f7785ad9 Added dimamount and dimcolor to display options menu. 2016-01-30 16:44:50 -05:00
Christoph Oelckers afcd755c7a - changed autoaim menu option to a slider which allows a more precise control of the property. 
- having a value of 5000 as the default for autoaim makes no sense, since this is an angle value that will always be clamped to [0..35]. So now 35 is both the default and the maximum.
 2016-01-30 13:43:39 +01:00
Christoph Oelckers 4267e3c40b Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-30 01:08:35 +01:00
Christoph Oelckers 409525cde6 - removed some overlooked 'player5start' entries in GAMEINFO sections. 
This property no longer exists, these are now being set in the 'doomednums' block.
 2016-01-29 22:09:16 +01:00
Christoph Oelckers d0b194563a Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_3dfloors.cpp
 2016-01-29 16:36:24 +01:00
Christoph Oelckers 058bfdea26 - forgot to commit this with the source changes for A_Face*. 2016-01-29 00:58:18 +01:00
Christoph Oelckers b5c3ced9a9 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-27 21:27:26 +01:00
MajorCooke 275cdcd958 Renamed A_FaceVelocity to A_FaceMovementDirection. 2016-01-27 10:12:13 -06:00
coelckers c5379c749e Merge pull request #428 from MajorCooke/A_CheckSPecies 
Added A_CheckSpecies(state jump, name species, ptr = AAPTR_DEFAULT)
 2016-01-27 16:45:16 +01:00
Christoph Oelckers 238990c871 don't leave any gaps in the used clip planes. 2016-01-27 12:32:39 +01:00
Christoph Oelckers 47db3252f4 - it's really not necessary to waste two clip planes for reflective surfaces because only one can be active at any time. 2016-01-27 12:30:55 +01:00
Christoph Oelckers 4b0ce7a8db Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-27 11:21:39 +01:00
Christoph Oelckers 2a1fa60aa6 Merge branch 'CheckProxExpPruned' of https://github.com/MajorCooke/zdoom 2016-01-26 18:49:03 +01:00
MajorCooke 1c0ef1d367 Removed CPXF_NODISTANCE. 2016-01-26 10:00:20 -06:00
Christoph Oelckers 66ce8915fb Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-26 15:00:54 +01:00
alexey.lysiuk 204bf2c375 Made secret on Plutonia: Revisited MAP27 accessible without vanilla wallrunning 
Increased duration of lift's lowered state
See http://forum.zdoom.org/viewtopic.php?t=47878
 2016-01-26 13:49:04 +02:00
Randy Heit c63f65d441 Merge remote-tracking branch 'origin/master' into scripting 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
 2016-01-22 20:53:27 -06:00
Christoph Oelckers 6691358b0a Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-22 19:15:24 +01:00
MajorCooke 793fc90716 Once more homogenized! 
- DECORATE: color, flags, lifetime, size, angle, xyz offset/vel/accel, startalpha, fadestep.
- ACS: Similar, minus the angle parameter.
 2016-01-21 19:59:33 -06:00
MajorCooke 28502b9a80 - Reorganized A_SpawnParticle parameters. 
- Decorate order is now color, x/y/zoff, velx/y/z, lifetime, angle, flags, size, startalphaf, fadestepf, accelx/y/z.
- ACS order is now color, xyz offset, xyz velocity, lifetime, fullbright, size, startalpha, fadestep, xyz accel
 2016-01-21 18:34:39 -06:00
Christoph Oelckers 1a631670fb Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-22 01:11:08 +01:00
Christoph Oelckers 841c7b275e Merge branch 'ParticleFlags' of https://github.com/MajorCooke/zdoom 
Conflicts:
	wadsrc/static/actors/actor.txt
 2016-01-22 00:58:42 +01:00
Christoph Oelckers 3b4ed8d7cd - made A_SpawnParticle's fadestep parameter a fixed point value as well. 2016-01-22 00:54:09 +01:00
MajorCooke 13dc6be5a1 - Added flags for A_SpawnParticle and angle parameter. 
- SPF_FULLBRIGHT makes the particle full bright.
- SPF_RELATIVE encapsulates the following flags:
- SPF_RELPOS: Position is relative to angle.
- SPF_RELVEL: Velocity is relative to angle.
- SPF_RELACCEL: Acceleration is relative to angle.
- SPF_RELANG: Add caller's angle to angle parameter for relativity.
 2016-01-21 16:36:58 -06:00
Christoph Oelckers 39014b1732 - make the startalpha parameter of A_SpawnParticle a float to be consistent with other functions that want an alpha value. 2016-01-21 20:13:55 +01:00
Randy Heit 1ac0d0690c Re-remove testglobalvar from constants.txt so scripting branch runs again 2016-01-21 12:46:12 -06:00
Randy Heit 9744b9e0d9 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/dobject.h
	src/dobjgc.cpp
	src/p_local.h
	src/thingdef/thingdef_codeptr.cpp
 2016-01-21 12:45:06 -06:00
MajorCooke 9638cbb844 Updated A_CheckProximity Expansion Pruned Edition. 2016-01-21 11:39:13 -06:00
Christoph Oelckers 995721836b Merge branch 'SpawnParticle' of https://github.com/Edward850/zdoom 
Conflicts:
	src/actor.h
 2016-01-21 17:04:52 +01:00
Christoph Oelckers 8f7be01dd4 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/r_data/r_interpolate.cpp
 2016-01-21 12:09:12 +01:00
MajorCooke 93aff2413f Fixed an issue which caused A_Teleport to set the caller and itself to SpotZ's z position. 2016-01-20 18:18:00 -06:00
MajorCooke d20a7516c9 Updated A_FaceVelocity to remove conflicts. 2016-01-20 15:51:11 -06:00