Christoph Oelckers
d8d4679471
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-25 21:13:04 +01:00
Christoph Oelckers
c4377b7039
- removed the implicit fixedvec -> TVector conversions because they caused too many problems. Also reviewed all uses of these and made the necessary adjustments. Problems were present in P_SpawnMissileXYZ and P_Thing_Projectile.
...
- replaced some single precision float math with doubles.
2016-01-23 20:44:33 +01:00
Christoph Oelckers
1a631670fb
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-22 01:11:08 +01:00
alexey.lysiuk
f10dd68ca6
Fixed actors intersection check
2016-01-21 16:21:09 +02: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
Christoph Oelckers
68c0f929dc
- refactoring complete. The source compiles again with the renamed position variable.
2016-01-20 15:12:51 +01:00
Christoph Oelckers
25107ed421
- since I had to shuffle around the first variables in AActor, let's better commit that change.
2016-01-20 13:49:52 +01:00
Christoph Oelckers
7ea3e49332
- refactored p_mobj.cpp and the first half of p_map.cpp.
2016-01-20 01:48:57 +01:00
Christoph Oelckers
7658111566
- refactoriung of thingdef_codeptr.cpp - probably the ugliest file in the entire project...
2016-01-19 20:15:45 +01:00
Christoph Oelckers
9f78bcd1e6
- Strife game code refactored for coordinates.
2016-01-19 11:50:07 +01:00
Christoph Oelckers
6ae09334a3
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/r_defs.h
2016-01-19 10:51:42 +01:00
Christoph Oelckers
069889c5ce
Merge remote-tracking branch 'remotes/zdoom/master'
2016-01-19 10:46:59 +01:00
Christoph Oelckers
2326928ff7
- the last bits of Hexen refactored
...
This also fixes a problem with some of Hexen's Wraith's effects which did some repositioning without properly linking them into the blockmap.
2016-01-19 01:10:57 +01:00
Christoph Oelckers
c1b44a5694
- let's make some use of AActor::Pos and get rid of some of those X() and Y() calls...
...
- restore proper actor.h file.
2016-01-18 21:01:52 +01:00
Christoph Oelckers
460751653d
- refactored most of Heretic's game code.
2016-01-18 20:13:20 +01:00
Christoph Oelckers
57ab1387f2
- yet more refactoring.
...
Note about A_SkelMissile: The direct change of the missile's position was changed to use SetOrigin. If this is later supposed to be portal-aware, such direct coordinate changes are a no-go to ensure that everything is properly maintained.
2016-01-18 18:52:24 +01:00
Christoph Oelckers
2b5e5b6bc3
- next round of refactoring.
...
This contains some advance work for handling line-to-line portals in A_PainShootSkull.
This function is special because it performs a map check itself instead of using one of the common functions from p_map.cpp, like most of the rest of the game code.
2016-01-18 16:49:24 +01:00
Christoph Oelckers
b63eb391f7
- refactored two mire files.
...
- fixed: FraggleScript's SetObjPosition function did not properly set the moved actor's properties. Better use SetOrigin for changing the position.
2016-01-18 12:37:39 +01:00
Christoph Oelckers
43314f0c0d
- started refactoring p_map.cpp
...
- added AActor::Top function to replace the frequent occurences of actor->z + actor->height.
2016-01-18 00:59:16 +01:00
Christoph Oelckers
b735138332
- forgot the changes to actor.h.
2016-01-17 22:56:16 +01:00
Christoph Oelckers
3f34083e88
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/actor.h
2016-01-17 22:16:27 +01:00
Christoph Oelckers
c611456397
- more refactoring of AActor coordinate access.
2016-01-17 18:36:14 +01:00
Christoph Oelckers
5b610390e1
- some more inline functions.
2016-01-17 16:49:15 +01:00
Christoph Oelckers
bf5ee5e542
- added X(), Y(), Z() access functions to AActor.
...
This commit is just preparation for upcoming changes to completely encapsulate the coordinate info in AActor because I'm going to have to work with an altered version of actor.h that cannot be committed without breaking the engine.
With this file present in the repo before work is started the changes can be committed piece by piece.
2016-01-17 12:23:49 +01:00
Christoph Oelckers
ef7bcb3a66
- implement Eternity-Style flat and horizon portals. Not tested yet due to lack of material to work with.
2016-01-11 15:07:58 +01:00
Christoph Oelckers
ab1bf2bca3
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/actor.h
2016-01-10 22:43:34 +01:00
Christoph Oelckers
2c0f64cf9f
- refactoring of R_PointToAngle2 when used to calculate direction between two actors.
2016-01-10 20:46:26 +01:00
Christoph Oelckers
1e2ce9a622
- some refactoring of P_AproxDistance calls into newly defined AActor method AproxDistance.
...
The main reason here is to reduce the number of instances where AActor::x and AActor::y are being referenced.
2016-01-10 17:52:41 +01:00
Christoph Oelckers
f391216ab9
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-09 19:48:01 +01:00
Christoph Oelckers
71c7f2b42c
- added 'floorterrain' and 'ceilingterrain' sector properties for UDMF. These will take precedence over texture based terrain if used.
...
'ceilingterrain' is needed because the top of 3D-floors refers to the model sector's ceiling, so in order to give a 3D floor a terrain it must be assignable to the sector's ceiling.
Note that although it is basically the same property, its actual function bears no relevance to its use in Eternity.
2016-01-09 12:10:36 +01:00
Christoph Oelckers
a5b43dfb66
Merge branch 'master' of https://github.com/rheit/zdoom
2015-11-03 23:55:41 +01:00
MajorCooke
380b5c1eb7
- Added ICESHATTER flag.
...
- Any inflictor with this flag can break ice corpses
2015-10-11 09:10:33 -05:00
Christoph Oelckers
fbefe13bb2
Merge branch 'master' of https://github.com/rheit/zdoom
2015-06-04 09:27:17 +02:00
MajorCooke
22570e079e
* Added LAXTELEFRAGDMG. This flag forces all damage to be factored, regardless being above or below the telefrag threshold.
...
- This only affects damage calculations being received by the end result. If the original damage was not a million or more, from the start, it will not hurt invulnerable-flagged or kill buddha-flagged monsters.
- Fixed: Damage was inconsistent by the time the function checked for player cheats/invulnerability and (monster and player) buddha, yet monster invulnerability checked the original damage prior to factor processing. This means a damage source that intended to damage another below the threshold could accidentally increase with a powerdamage multiplier or the recipient with a weakness for it, resulting in invulnerability/buddha foiling. Now, checks for telefrag damage using the raw original value on player godmode, player/monster invulnerability and buddha.
2015-06-02 12:10:45 -05:00
Edoardo Prezioso
4546df7dc3
- Fixed SetActorPitch and ChangeActorPitch issue.
...
The code did not take into account the player's limited pitch.
2015-05-28 00:41:07 +02:00
Christoph Oelckers
bb85625d52
Merge branch 'master' of https://github.com/rheit/zdoom
2015-05-01 00:08:42 +02:00
Christoph Oelckers
84351419a3
Merge branch 'master' of https://github.com/crimsondusk/zdoom
...
Conflicts:
src/actor.h
2015-04-30 10:03:50 +02:00
Christoph Oelckers
9880af1b0c
- this line got lost during conflict resolution.
2015-04-30 09:18:13 +02:00
Christoph Oelckers
405fc31e81
Merge branch 'master' of https://github.com/DaZombieKiller/zdoom
...
Conflicts:
src/actor.h
2015-04-30 09:14:31 +02:00
Christoph Oelckers
21993b3481
Merge branch 'master' of https://github.com/rheit/zdoom
2015-04-29 16:27:46 +02:00
Edoardo Prezioso
b51fac344d
Little TakeInventory refactoring.
...
Introduce AActor::TakeInventory, which unifies DoTakeInv from ACS and DoTakeInventory from Decorate, and AInventory::DepleteOrDestroy, which is extracted from the DoTakeInv core function, and use both where they're needed.
I don't know if the differences between DoTakeInv and DoTakeInventory were intentional, so I kept both behaviors.
2015-04-28 15:45:11 +02:00
Teemu Piippo
ca012bc9be
- adapted AActor to use TFlags
2015-04-04 19:40:43 +03:00
Christoph Oelckers
f0886ce1f1
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
src/version.h
2015-04-03 09:45:04 +02:00
Randy Heit
d37f9cbcae
Add flies (doomed #112 ) from the Hexen retail beta
...
...because it brought back memories of adding Strife support.
- The search function is radically different, but the flying mechanics are
the same.
2015-04-02 17:52:54 -05:00
Christoph Oelckers
97947f9e10
Merge branch 'master' of https://github.com/rheit/zdoom
...
Conflicts:
dumb/vc6/dumb_static/dumb_static.vcproj
wadsrc/static/compatibility.txt
2015-03-15 11:42:59 +01:00
Randy Heit
d84c85d40f
Remove warnings warned by Clang
2015-03-08 17:21:15 -05:00
Christoph Oelckers
714a9aa2c9
Merge branch 'master' of https://github.com/rheit/zdoom
2015-02-11 09:56:58 +01:00
Christoph Oelckers
337682934c
- fixed: CF_FLY cannot be part of the player_t structure and be tracked properly. It needs to be part of the actor itself that has MF2_FLY set so it got moved to flags7.
...
- removed some fudging code that tried to work around the shortcomings of CF_FLY but was ultimately causing more problems than it solved.
2015-02-10 23:40:53 +01:00
Benjamin Moir
6dff8da503
Added +NODECAL and +FORCEDECAL actor flags
...
Added FHF_NOIMPACTDECAL for LineAttack
2015-01-20 12:05:00 +10:30
Christoph Oelckers
1c3561d71e
Merge branch 'master' of https://github.com/rheit/zdoom
2015-01-08 09:27:30 +01:00