voretournament/voretournament.git
9 years agoFix and improve prey animations
MirceaKitsune [Wed, 4 May 2011 11:24:15 +0000 (14:24 +0300)]
Fix and improve prey animations

9 years agoDecrease healthsize_vore_pos again, as it causes the view to poke out sometimes
MirceaKitsune [Wed, 4 May 2011 01:13:32 +0000 (04:13 +0300)]
Decrease healthsize_vore_pos again, as it causes the view to poke out sometimes

9 years agoLastly, add some good animations to prey. Idle prey will use the jump animation,...
MirceaKitsune [Wed, 4 May 2011 01:01:21 +0000 (04:01 +0300)]
Lastly, add some good animations to prey. Idle prey will use the jump animation, and prey that perform stomach kicks will use the duckjump animation, simulating them attacking the stomach.

9 years agoDon't attempt to rotate positions based on predator angles. It didn't work right...
MirceaKitsune [Wed, 4 May 2011 00:17:33 +0000 (03:17 +0300)]
Don't attempt to rotate positions based on predator angles. It didn't work right and IMO there's no real need to do this.

9 years agoDetermine stomach center by the predator's scale also
MirceaKitsune [Wed, 4 May 2011 00:11:52 +0000 (03:11 +0300)]
Determine stomach center by the predator's scale also

9 years agoActually, it seems ok to bump the prey position on scale to 8... no view poking out
MirceaKitsune [Wed, 4 May 2011 00:02:08 +0000 (03:02 +0300)]
Actually, it seems ok to bump the prey position on scale to 8... no view poking out

9 years agoBigger prey position for healthsize
MirceaKitsune [Tue, 3 May 2011 23:58:31 +0000 (02:58 +0300)]
Bigger prey position for healthsize

9 years agoUse a more correct default prey view offset
MirceaKitsune [Tue, 3 May 2011 23:56:01 +0000 (02:56 +0300)]
Use a more correct default prey view offset

9 years agoFix fake prey getting rendered as well
MirceaKitsune [Tue, 3 May 2011 23:41:27 +0000 (02:41 +0300)]
Fix fake prey getting rendered as well

9 years agoRe-integrate prey view offset based on scale with the new prey positioning code
MirceaKitsune [Tue, 3 May 2011 23:37:44 +0000 (02:37 +0300)]
Re-integrate prey view offset based on scale with the new prey positioning code

9 years agoMore tweaks to the prey positioning code
MirceaKitsune [Tue, 3 May 2011 23:27:17 +0000 (02:27 +0300)]
More tweaks to the prey positioning code

9 years agoRename a function
MirceaKitsune [Tue, 3 May 2011 23:19:21 +0000 (02:19 +0300)]
Rename a function

9 years agoNo need to check if self == other when setting player alpha
MirceaKitsune [Tue, 3 May 2011 23:14:41 +0000 (02:14 +0300)]
No need to check if self == other when setting player alpha

9 years agoLet's not forget the fake prey
MirceaKitsune [Tue, 3 May 2011 23:06:32 +0000 (02:06 +0300)]
Let's not forget the fake prey

9 years agoTweaks to how the predator's angles are applied to prey positions
MirceaKitsune [Tue, 3 May 2011 23:04:00 +0000 (02:04 +0300)]
Tweaks to how the predator's angles are applied to prey positions

9 years agoAllow scaling prey down when the neighboring prey feature is enable. Don't enable...
MirceaKitsune [Tue, 3 May 2011 22:56:17 +0000 (01:56 +0300)]
Allow scaling prey down when the neighboring prey feature is enable. Don't enable it by default yet though.

9 years agoRename cvar
MirceaKitsune [Tue, 3 May 2011 22:43:29 +0000 (01:43 +0300)]
Rename cvar

9 years agoCvar the distance by which prey are separated in the stomach. Setting the cvar to...
MirceaKitsune [Tue, 3 May 2011 22:37:45 +0000 (01:37 +0300)]
Cvar the distance by which prey are separated in the stomach. Setting the cvar to 0 will disable the ability to see neighboring prey, and everything will work as before.

9 years agoPositions for all 9 occupants
MirceaKitsune [Tue, 3 May 2011 22:19:41 +0000 (01:19 +0300)]
Positions for all 9 occupants

9 years agoFirst system for positioning prey differently in the stomach. Each frame, a loop...
MirceaKitsune [Tue, 3 May 2011 22:09:50 +0000 (01:09 +0300)]
First system for positioning prey differently in the stomach. Each frame, a loop will run. The position will be offset in a square shape for all occupants of that stomach.

9 years agoFirst step in making prey that have the same predator able to see each other in the...
MirceaKitsune [Tue, 3 May 2011 21:41:30 +0000 (00:41 +0300)]
First step in making prey that have the same predator able to see each other in the stomach. The model for other prey will now be shown. However, each "occupant" must be positioned properly, else all models will just overlap in the center... which is the harder part to fix.

9 years agoCvar each ring's action, and showing the ring for that purpose.
MirceaKitsune [Tue, 3 May 2011 20:37:34 +0000 (23:37 +0300)]
Cvar each ring's action, and showing the ring for that purpose.

9 years agoCopy ring settings for spectators
MirceaKitsune [Tue, 3 May 2011 20:27:46 +0000 (23:27 +0300)]
Copy ring settings for spectators

9 years agoSlightly smaller rings
MirceaKitsune [Tue, 3 May 2011 20:24:32 +0000 (23:24 +0300)]
Slightly smaller rings

9 years agoLess intense crosshair pickup effect
MirceaKitsune [Tue, 3 May 2011 20:20:34 +0000 (23:20 +0300)]
Less intense crosshair pickup effect

9 years agoCvar sbar ring settings
MirceaKitsune [Tue, 3 May 2011 20:18:46 +0000 (23:18 +0300)]
Cvar sbar ring settings

9 years agoLarger fonts for the larger ring
MirceaKitsune [Tue, 3 May 2011 20:10:05 +0000 (23:10 +0300)]
Larger fonts for the larger ring

9 years agoRing for stomach kicking
MirceaKitsune [Tue, 3 May 2011 20:06:56 +0000 (23:06 +0300)]
Ring for stomach kicking

9 years agoMake vore delays a little longer
MirceaKitsune [Tue, 3 May 2011 19:51:42 +0000 (22:51 +0300)]
Make vore delays a little longer

9 years agoSbar ring for regurgitation delay
MirceaKitsune [Tue, 3 May 2011 19:50:52 +0000 (22:50 +0300)]
Sbar ring for regurgitation delay

9 years agoSome safety tweaks with the action delay
MirceaKitsune [Tue, 3 May 2011 19:36:16 +0000 (22:36 +0300)]
Some safety tweaks with the action delay

9 years agoFix action delay for regurgitating
MirceaKitsune [Tue, 3 May 2011 19:34:15 +0000 (22:34 +0300)]
Fix action delay for regurgitating

9 years agoChange th swallow_delay cvar to also affect regurgitating. The system is now called...
MirceaKitsune [Tue, 3 May 2011 17:21:13 +0000 (20:21 +0300)]
Change th swallow_delay cvar to also affect regurgitating. The system is now called action_delay. Whenever you both swallow or regurgitate someone, the delay is applied and blocks both actions.

9 years agoAdd first actual functionality to the sbar ring; Showing the swallowing delay.
MirceaKitsune [Tue, 3 May 2011 17:01:10 +0000 (20:01 +0300)]
Add first actual functionality to the sbar ring; Showing the swallowing delay.

9 years agoAdd ring stats
MirceaKitsune [Tue, 3 May 2011 15:26:14 +0000 (18:26 +0300)]
Add ring stats

9 years agoSome small tweaks and fixes
MirceaKitsune [Tue, 3 May 2011 15:13:19 +0000 (18:13 +0300)]
Some small tweaks and fixes

9 years agoAdd proper ring functions to work with
MirceaKitsune [Tue, 3 May 2011 15:04:05 +0000 (18:04 +0300)]
Add proper ring functions to work with

9 years agoAdd text strings, which will be used later to describe what the ring is addressing
MirceaKitsune [Tue, 3 May 2011 14:54:53 +0000 (17:54 +0300)]
Add text strings, which will be used later to describe what the ring is addressing

9 years agoDraw the two sbar rings. They will be used to indicate certain things, including...
MirceaKitsune [Tue, 3 May 2011 14:05:56 +0000 (17:05 +0300)]
Draw the two sbar rings. They will be used to indicate certain things, including slow swallowing once it will be implemented.

9 years agoDon't allow kicking immediately after being swallowed. Increase escape probability...
MirceaKitsune [Tue, 3 May 2011 13:42:37 +0000 (16:42 +0300)]
Don't allow kicking immediately after being swallowed. Increase escape probability a little too, as this means prey gets to kick one time less now.

9 years agoTweak crosshair swallow indicator size
MirceaKitsune [Tue, 3 May 2011 13:36:33 +0000 (16:36 +0300)]
Tweak crosshair swallow indicator size

9 years agoFix a bug with keepdeadprey being probability based. Also give it a probability of...
MirceaKitsune [Tue, 3 May 2011 13:34:04 +0000 (16:34 +0300)]
Fix a bug with keepdeadprey being probability based. Also give it a probability of 0.75 by default (prey staying in the stomach once dead).

9 years agoFix a small bug with vore taunts introduced in my last commit
MirceaKitsune [Tue, 3 May 2011 13:16:04 +0000 (16:16 +0300)]
Fix a small bug with vore taunts introduced in my last commit

9 years agoUse self.stat_eaten instead of checking self.predator.classname. Also adjust the...
MirceaKitsune [Tue, 3 May 2011 13:10:58 +0000 (16:10 +0300)]
Use self.stat_eaten instead of checking self.predator.classname. Also adjust the fakeprey status accordingly. This is a major change and might brake some things, but it's cleaner and more correct.

9 years agoI like this crosshair better by default :)
MirceaKitsune [Tue, 3 May 2011 12:15:34 +0000 (15:15 +0300)]
I like this crosshair better by default :)

9 years agoMake the new crosshair ring better for indicating ammo load
MirceaKitsune [Tue, 3 May 2011 12:11:43 +0000 (15:11 +0300)]
Make the new crosshair ring better for indicating ammo load

9 years agoMore crosshair tweaks
MirceaKitsune [Tue, 3 May 2011 12:07:44 +0000 (15:07 +0300)]
More crosshair tweaks

9 years agoSet good crosshair defaults for the new crosshairs
MirceaKitsune [Tue, 3 May 2011 12:01:12 +0000 (15:01 +0300)]
Set good crosshair defaults for the new crosshairs

9 years agoLess blurry crosshair ring
MirceaKitsune [Tue, 3 May 2011 11:55:08 +0000 (14:55 +0300)]
Less blurry crosshair ring

9 years agoPort crosshair reload ring from Xonotic as well, with a small tweak to its sharpness
MirceaKitsune [Tue, 3 May 2011 11:53:38 +0000 (14:53 +0300)]
Port crosshair reload ring from Xonotic as well, with a small tweak to its sharpness

9 years agoSort crosshairs better
MirceaKitsune [Tue, 3 May 2011 11:48:59 +0000 (14:48 +0300)]
Sort crosshairs better

9 years agoMake the dot crosshair visible
MirceaKitsune [Tue, 3 May 2011 11:45:52 +0000 (14:45 +0300)]
Make the dot crosshair visible

9 years agoPort high quality crosshairs from Xonotic, and replace the old ones
MirceaKitsune [Tue, 3 May 2011 11:39:30 +0000 (14:39 +0300)]
Port high quality crosshairs from Xonotic, and replace the old ones

9 years agoAdd a sbar ring texture. Will be used in the future for a planned feature
MirceaKitsune [Tue, 3 May 2011 11:32:30 +0000 (14:32 +0300)]
Add a sbar ring texture. Will be used in the future for a planned feature

9 years agoHigher quality swallow crosshair indicators
MirceaKitsune [Tue, 3 May 2011 11:30:42 +0000 (14:30 +0300)]
Higher quality swallow crosshair indicators

9 years agoPort respawn ghosts from Xonotic, original code by me. Makes dead bodies become float...
MirceaKitsune [Tue, 3 May 2011 11:08:18 +0000 (14:08 +0300)]
Port respawn ghosts from Xonotic, original code by me. Makes dead bodies become floating ghosts if they are still whole and visible, once the player respawns. Effect only.

9 years agoSlower default viewheight smoothing (for crouching and changing size)
MirceaKitsune [Tue, 3 May 2011 01:07:11 +0000 (04:07 +0300)]
Slower default viewheight smoothing (for crouching and changing size)

9 years agoSlightly increase swallowing range, and decrease stomach kicking escape probability.
MirceaKitsune [Tue, 3 May 2011 01:04:16 +0000 (04:04 +0300)]
Slightly increase swallowing range, and decrease stomach kicking escape probability.

9 years agoAdd a TODO I forgot, regarding player sizes and the bounding box.
MirceaKitsune [Tue, 3 May 2011 00:51:04 +0000 (03:51 +0300)]
Add a TODO I forgot, regarding player sizes and the bounding box.

9 years agoSlightly lower view offset for prey
MirceaKitsune [Tue, 3 May 2011 00:46:59 +0000 (03:46 +0300)]
Slightly lower view offset for prey

9 years agoDon't allow players to swallow anyone larger than them by default. This means you...
MirceaKitsune [Tue, 3 May 2011 00:42:28 +0000 (03:42 +0300)]
Don't allow players to swallow anyone larger than them by default. This means you can only swallow someone who is lower on health (or same health) than you.

9 years agoImprove the swallowing complaint system. Also done for the change in the commit to...
MirceaKitsune [Tue, 3 May 2011 00:34:08 +0000 (03:34 +0300)]
Improve the swallowing complaint system. Also done for the change in the commit to follow.

9 years agoRemove the smooth camera for prey entering the stomach. It was ugly to begin with...
MirceaKitsune [Tue, 3 May 2011 00:22:07 +0000 (03:22 +0300)]
Remove the smooth camera for prey entering the stomach. It was ugly to begin with, and now with sizes it risked being buggy too. View offset changes are already smoothed now (see view smoothing for crouching), so this was just a duplicate effect now.

9 years agoSome major changes to fake prey and the way prey is hidden. Fixes a bug and might...
MirceaKitsune [Tue, 3 May 2011 00:11:14 +0000 (03:11 +0300)]
Some major changes to fake prey and the way prey is hidden. Fixes a bug and might prevent and improve other parts.

9 years agoDecrease default position a bit to avoid the view poking out of the stomach model...
MirceaKitsune [Mon, 2 May 2011 23:12:38 +0000 (02:12 +0300)]
Decrease default position a bit to avoid the view poking out of the stomach model, when the size difference is too big

9 years agoCopy spectatee scale
MirceaKitsune [Mon, 2 May 2011 23:06:33 +0000 (02:06 +0300)]
Copy spectatee scale

9 years agoBase prey view height on the size difference between them and their predator.
MirceaKitsune [Mon, 2 May 2011 23:05:23 +0000 (02:05 +0300)]
Base prey view height on the size difference between them and their predator.

9 years agoDo update health-based scale for prey, just not the view offset
MirceaKitsune [Mon, 2 May 2011 20:35:28 +0000 (23:35 +0300)]
Do update health-based scale for prey, just not the view offset

9 years agoSome tiny tweaks
MirceaKitsune [Mon, 2 May 2011 20:19:36 +0000 (23:19 +0300)]
Some tiny tweaks

9 years agoMove the falldamage offset in the right spot
MirceaKitsune [Mon, 2 May 2011 20:09:40 +0000 (23:09 +0300)]
Move the falldamage offset in the right spot

9 years agoMake falling damage depend on size (especially since we can run slower or faster...
MirceaKitsune [Mon, 2 May 2011 20:02:39 +0000 (23:02 +0300)]
Make falling damage depend on size (especially since we can run slower or faster at different sizes)

9 years agoMake weapon even larger / smaller when changing size
MirceaKitsune [Mon, 2 May 2011 19:45:27 +0000 (22:45 +0300)]
Make weapon even larger / smaller when changing size

9 years agoDon't attempt to scale the world when weapon models are unset.
MirceaKitsune [Mon, 2 May 2011 19:44:29 +0000 (22:44 +0300)]
Don't attempt to scale the world when weapon models are unset.

9 years agoTweak viewmodel scaling size
MirceaKitsune [Mon, 2 May 2011 17:26:08 +0000 (20:26 +0300)]
Tweak viewmodel scaling size

9 years agoSame for fake predator
MirceaKitsune [Mon, 2 May 2011 17:14:23 +0000 (20:14 +0300)]
Same for fake predator

9 years agoUse a different method of applying the predator's scale to the prey's view offset...
MirceaKitsune [Mon, 2 May 2011 17:13:37 +0000 (20:13 +0300)]
Use a different method of applying the predator's scale to the prey's view offset (to avoid the view poking out of the stomach model).

9 years agoMerge branch 'master' into mirceakitsune/health_size
MirceaKitsune [Mon, 2 May 2011 17:09:39 +0000 (20:09 +0300)]
Merge branch 'master' into mirceakitsune/health_size

9 years agoUse a separate view offset for prey
MirceaKitsune [Mon, 2 May 2011 17:08:44 +0000 (20:08 +0300)]
Use a separate view offset for prey

9 years agoRun the camera effect when fake prey too
MirceaKitsune [Mon, 2 May 2011 17:05:38 +0000 (20:05 +0300)]
Run the camera effect when fake prey too

9 years agoLower music volume when in the stomach by default
MirceaKitsune [Mon, 2 May 2011 17:01:52 +0000 (20:01 +0300)]
Lower music volume when in the stomach by default

9 years agoBetter defaults for the time being
MirceaKitsune [Mon, 2 May 2011 17:00:12 +0000 (20:00 +0300)]
Better defaults for the time being

9 years agoSeparate cvars for exterior and view weapon scaling
MirceaKitsune [Mon, 2 May 2011 16:46:43 +0000 (19:46 +0300)]
Separate cvars for exterior and view weapon scaling

9 years agoThe exterior weapon entity will now scale properly as well
MirceaKitsune [Mon, 2 May 2011 16:32:03 +0000 (19:32 +0300)]
The exterior weapon entity will now scale properly as well

9 years agoAllow weapons to keep their size while the player shrinks and grows. Micros will...
MirceaKitsune [Mon, 2 May 2011 14:54:00 +0000 (17:54 +0300)]
Allow weapons to keep their size while the player shrinks and grows. Micros will now appear to be carrying a huge gun, whereas for macros, the weapon will appear tiny. Implementation for exterior weapon model to follow.

9 years agoScale the amount by which movement is influenced by size. Default it to 0.5 for reali...
MirceaKitsune [Mon, 2 May 2011 13:44:47 +0000 (16:44 +0300)]
Scale the amount by which movement is influenced by size. Default it to 0.5 for realistic and correct feel.

9 years agoFix a comment
MirceaKitsune [Mon, 2 May 2011 12:21:11 +0000 (15:21 +0300)]
Fix a comment

9 years agoDon't account view offset when attempting to swallow players. Fixes macro bots being...
MirceaKitsune [Mon, 2 May 2011 11:20:38 +0000 (14:20 +0300)]
Don't account view offset when attempting to swallow players. Fixes macro bots being unable to eat other players properly, and might improve bot performance overall.

9 years agoSize also determines the distance from which you can swallow other players now
MirceaKitsune [Mon, 2 May 2011 10:51:01 +0000 (13:51 +0300)]
Size also determines the distance from which you can swallow other players now

9 years agoFix player sizing working in reverse
MirceaKitsune [Mon, 2 May 2011 10:44:14 +0000 (13:44 +0300)]
Fix player sizing working in reverse

9 years agoLimit the health below / past which player size may change.
MirceaKitsune [Mon, 2 May 2011 10:29:41 +0000 (13:29 +0300)]
Limit the health below / past which player size may change.

9 years agoAllow specifying health at which the player is default size
MirceaKitsune [Mon, 2 May 2011 10:17:32 +0000 (13:17 +0300)]
Allow specifying health at which the player is default size

9 years agoFix view offset with prey at different sizes.
MirceaKitsune [Mon, 2 May 2011 01:39:09 +0000 (04:39 +0300)]
Fix view offset with prey at different sizes.

9 years agoMovement and jumping speed now depends on size. Needs to be tweaked better though.
MirceaKitsune [Mon, 2 May 2011 01:27:28 +0000 (04:27 +0300)]
Movement and jumping speed now depends on size. Needs to be tweaked better though.

9 years agoInclude the scale factor in CopyBody()
MirceaKitsune [Mon, 2 May 2011 01:08:24 +0000 (04:08 +0300)]
Include the scale factor in CopyBody()

9 years agoSet the view offset according to the payer size. Due to the bboxes being unmodified...
MirceaKitsune [Mon, 2 May 2011 01:04:14 +0000 (04:04 +0300)]
Set the view offset according to the payer size. Due to the bboxes being unmodified, this will cause the camera to go into walls when you become a macro :/

9 years agoDon't smoothly scale players, but let the amount of health decide.
MirceaKitsune [Mon, 2 May 2011 00:51:58 +0000 (03:51 +0300)]
Don't smoothly scale players, but let the amount of health decide.

9 years agoDon't resize the bounding box any more, due to the issues with cl_movement. Players...
MirceaKitsune [Mon, 2 May 2011 00:34:21 +0000 (03:34 +0300)]
Don't resize the bounding box any more, due to the issues with cl_movement. Players will still grow / shrink, but collisions will stay the same. This is pretty ugly, but all that can be done right now to allow this feature to work.

9 years agoAccount crouching for the bbox. Still need to fix issue with cl_movement 1 however...
MirceaKitsune [Sun, 1 May 2011 21:53:34 +0000 (00:53 +0300)]
Account crouching for the bbox. Still need to fix issue with cl_movement 1 however, as darkplaces doesn't know we are changing player collisions for movement prediction :/

9 years agoSet bounding box to the size of the player model. This brakes players and causes...
MirceaKitsune [Sun, 1 May 2011 20:55:49 +0000 (23:55 +0300)]
Set bounding box to the size of the player model. This brakes players and causes them to go through the floor in some circumstances! Need to figure the reason for this.

9 years agoBasic implementation for scaling players based on their health
MirceaKitsune [Sun, 1 May 2011 20:28:17 +0000 (23:28 +0300)]
Basic implementation for scaling players based on their health