From: Jakob MG Date: Tue, 29 Mar 2011 20:21:30 +0000 (+0200) Subject: Merge master X-Git-Tag: xonotic-v0.5.0~199^2~11^2~102 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=835d73da991f798138916794ebf92a4e1a90c87c;p=xonotic%2Fxonotic-data.pk3dir.git Merge master --- 835d73da991f798138916794ebf92a4e1a90c87c diff --cc effectinfo.txt index f1cb2ea96,e2b476ce8..e3f80efb3 --- a/effectinfo.txt +++ b/effectinfo.txt @@@ -5195,351 -5195,65 +5195,416 @@@ velocitymultiplier 1 airfriction -1 rotate 0 360 -180 180 ++<<<<<<< HEAD +// ---------------vechicles + +effect spiderbot_minigun_trail +notunderwater +trailspacing 10 +type smoke +color 0xd0d0a0 0xffffff +tex 0 8 +size 1 2 +alpha 20 50 100 +sizeincrease 2 +velocityjitter 5 5 5 +gravity -0.03 +airfriction 1 + +effect spiderbot_minigun_muzzleflash +count 3 +type spark +color 0xff9c00 0xff8400 +tex 48 55 +size 10 15 +alpha 256 512 6280 +airfriction 10 +originjitter 2 2 2 +velocityjitter 150 150 150 +velocitymultiplier 0.35 +sizeincrease -100 +stretchfactor 1.3 +rotate -180 180 4000 -4000 +// fire +effect spiderbot_minigun_muzzleflash +count 6 +type spark +color 0xff9c00 0xff8400 +tex 8 15 +size 5 7 +alpha 256 512 6280 +airfriction 12 +originjitter 2 2 2 +velocityjitter 200 200 200 +velocitymultiplier 0.2 +sizeincrease -10 +stretchfactor 0.8 +effect spiderbot_minigun_muzzleflash +countabsolute 2 +type static +tex 48 55 +color 0xff9c00 0xff8400 +size 32 32 +alpha 256 512 6680 +sizeincrease -100 +stretchfactor 0.1 +rotate -180 180 4000 -4000 +lightradius 120 +lightradiusfade 8000 +lightcolor 3 3 0 + +effect spiderbot_minigun_impact +countabsolute 1 +type static +tex 65 65 +color 0xff9c00 0xf6ff00 +size 52 52 +alpha 50 100 1680 +sizeincrease -100 +stretchfactor 0.1 +rotate -180 180 4000 -4000 +// fire +effect spiderbot_minigun_impact +count 7 +type spark +color 0xff9c00 0xff8400 +tex 48 55 +size 9 15 +alpha 256 512 6280 +airfriction 10 +originjitter 2 2 2 +velocityjitter 250 250 150 +velocitymultiplier 0.2 +sizeincrease 100 +stretchfactor 3 +airfriction 6 +rotate -180 180 4000 -4000 +// smoke +effect spiderbot_minigun_impact +count 6 +type smoke +color 0xd0d0a0 0xffffff +tex 0 8 +size 10 20 +alpha 50 50 140 +sizeincrease 80 +velocityjitter 100 100 250 +velocitymultiplier 0.47 +gravity 1.3 +airfriction 10 +rotate -180 180 0 0 +// smoke 2 +effect spiderbot_minigun_impact +count 7 +type spark +color 0xd0d0a0 0xffffff +tex 0 8 +size 15 19 +alpha 25 51 128 +airfriction 6 +originjitter 2 2 2 +velocityjitter 250 250 150 +velocitymultiplier 0.2 +sizeincrease 100 +stretchfactor 7.6 +// derbis +effect spiderbot_minigun_impact +notunderwater +count 3 +type alphastatic +tex 66 68 +color 0xffa35b 0xfff2be +size 6 8 +alpha 644 756 1484 +gravity 1.1 +airfriction 0.4 +sizeincrease -10 +velocitymultiplier 0.15 +originjitter 16 16 16 +velocityjitter 124 124 224 +rotate -180 180 -1000 1000 +// decal +effect spiderbot_minigun_impact +countabsolute 1 +type decal +tex 56 59 +size 5 10 +alpha 256 256 0 +originjitter 16 16 16 +rotate -180 180 0 0 + + +effect wakizashi_gun_impact +count 15 +type spark +color 0xff0000 0xc03535 +tex 41 41 +size 4 7 +alpha 256 512 1180 +airfriction 4 +gravity 3 +originjitter 40 40 10 +velocityjitter 350 350 550 +velocityoffset 0 0 700 +stretchfactor 0.9 +effect wakizashi_gun_impact +type smoke +count 24 +color 0xd0d0a0 0xc03535 +tex 0 8 +size 10 20 +alpha 50 90 150 +sizeincrease 80 +velocityjitter 250 250 450 +velocityoffset 0 0 600 +originjitter 40 40 10 +airfriction 4 +sizeincrease 80 +rotate -180 180 0 0 +effect wakizashi_gun_impact +countabsolute 1 +type smoke +tex 65 65 +color 0xff0000 0xc03535 +size 82 82 +alpha 250 300 680 +sizeincrease -180 +effect wakizashi_gun_impact +countabsolute 1 +type smoke +tex 33 33 +color 0xff0000 0xc03535 +size 40 40 +alpha 50 100 620 +sizeincrease 900 +rotate -180 180 400 -400 +effect wakizashi_gun_impact +countabsolute 1 +type decal +tex 59 59 +size 14 14 +alpha 256 256 0 +originjitter 16 16 16 +rotate -180 180 0 0 + +effect wakizashi_gun_muzzleflash +count 16 +type spark +color 0xff0000 0xc03535 +tex 8 15 +size 5 7 +alpha 256 512 6280 +airfriction 12 +originjitter 2 2 2 +velocityjitter 200 200 200 +velocitymultiplier 0.2 +sizeincrease -10 +stretchfactor 0.7 + +// decal +effect raptor_cannon_impact +countabsolute 1 +type decal +tex 47 47 +size 24 24 +alpha 256 256 0 +originjitter 16 16 16 +rotate -180 180 0 0 +//spark +effect raptor_cannon_impact +notunderwater +count 6 +type spark +tex 40 40 +color 0xD400FF 0x571863 +size 1 1 +alpha 644 956 784 +gravity 1 +airfriction 0.2 +velocityoffset 0 0 150 +originjitter 16 16 16 +velocityjitter 124 124 524 +// smoke +effect raptor_cannon_impact +count 4 +type alphastatic +tex 0 7 +size 50 50 +color 0x646364 0x151515 +alpha 428 428 600 +rotate -180 180 0 0 +velocityjitter 200 200 300 +velocityoffset 0 0 340 +gravity 0.7 +airfriction 2 +// fire +effect raptor_cannon_impact +notunderwater +count 10 +type static +tex 48 55 +color 0xD400FF 0x571863 +size 33 44 +sizeincrease 25 +alpha 200 256 812 +bounce 1.5 +airfriction 8 +liquidfriction 8 +originjitter 8 8 8 +velocityjitter 312 312 312 + + +effect raptor_cannon_muzzleflash +count 16 +type spark +color 0xD400FF 0x571863 +tex 8 15 +size 10 17 +alpha 1256 1512 56280 +airfriction 12 +originjitter 2 2 2 +velocityjitter 200 200 200 +velocitymultiplier 0.2 +sizeincrease -10 +stretchfactor 0.6 +effect raptor_cannon_muzzleflash +countabsolute 1 +type static +tex 48 55 +color 0xD400FF 0x571863 +size 32 32 +alpha 6056 20112 406280 +sizeincrease -100 +stretchfactor 0.1 +rotate -180 180 4000 -4000 +lightradius 150 +lightradiusfade 6000 +lightcolor 3 0 6 + +// decal +effect raptor_bomb_impact +countabsolute 1 +type decal +tex 8 16 +size 84 84 +alpha 256 256 0 +originjitter 16 16 16 +rotate -180 180 0 0 +//spark vertical +effect raptor_bomb_impact +count 6 +type spark +color 0xff9c00 0xff3c00 +tex 48 55 +size 30 60 +alpha 300 300 600 +originjitter 10 10 10 +velocityjitter 80 80 120 +stretchfactor 240 +sizeincrease 50 +//fire +effect raptor_bomb_impact +count 8 +type smoke +color 0xff9c00 0xff3c00 +tex 48 55 +size 80 160 +alpha 300 300 500 +originjitter 10 10 10 +velocityjitter 950 950 0 +sizeincrease 290 +airfriction 2 +//smoke +effect raptor_bomb_impact +count 5 +type spark +blend alpha +tex 0 7 +size 140 200 +color 0x646364 0x151515 +alpha 428 428 600 +rotate -180 180 0 0 +velocityjitter 200 200 300 +velocityoffset 0 0 280 +originjitter 30 30 10 +stretchfactor 20 +//smoke 2 +effect raptor_bomb_impact +count 4 +type alphastatic +tex 0 7 +size 40 100 +color 0x646364 0x151515 +alpha 328 328 350 +rotate -180 180 0 0 +velocityjitter 200 200 300 +velocityoffset 0 0 380 +originjitter 30 30 10 +sizeincrease 60 +airfriction 0.6 + + ++======= + // seeker missile trail + effect TR_SEEKER + trailspacing 10 + type smoke + notunderwater + color 0x000000 0x666666 + tex 0 8 + size 2 2 + bounce 1 + sizeincrease 11 + alpha 200 300 200 + lightradius 100 + lighttime 0 + lightcolor 6 3 1 + originjitter 2 2 2 + velocityjitter 3 3 3 + velocitymultiplier -0.02 + rotate -180 180 -30 30 + //gravity -0.11 + // fire + effect TR_SEEKER + trailspacing 4 + type static + color 0xffdf72 0x811200 + tex 48 55 + size 5 5 + sizeincrease -30 + alpha 100 144 588 + airfriction 8 + velocityjitter 32 32 32 + velocitymultiplier -1.5 + // bubbles + effect TR_SEEKER + type bubble + underwater + trailspacing 16 + tex 62 62 + size 1 2 + alpha 256 256 256 + gravity -0.125 + bounce 1.5 + liquidfriction 4 + velocityjitter 16 16 16 + velocitymultiplier -0.31 + rotate 0 0 0 0 + // sparks + effect TR_SEEKER + notunderwater + trailspacing 20 + type spark + tex 40 40 + color 0xFFFDD9 0xFFFDD9 + size 0.5 0.5 + alpha 444 512 1866 + stretchfactor 0.3 + //gravity 1 + bounce 1 + //velocityoffset 0 0 15 + airfriction 5 + originjitter 1 1 1 + velocityjitter 100 100 100 + velocitymultiplier -0.31 ++>>>>>>> origin/master diff --cc qcsrc/client/View.qc index 6b682c1d9,f99464587..8f38cb5bc --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@@ -716,9 -727,14 +718,14 @@@ void CSQC_UpdateView(float w, float h if(contentavgalpha) drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL); } - + if(autocvar_hud_damage) { + splash_size_x = max(vid_conwidth, vid_conheight); + splash_size_y = max(vid_conwidth, vid_conheight); + splash_pos_x = (vid_conwidth - splash_size_x) / 2; + splash_pos_y = (vid_conheight - splash_size_y) / 2; + float myhealth_flash_temp; myhealth = getstati(STAT_HEALTH); diff --cc qcsrc/client/projectile.qc index 098b214c6,092cdc21a..96150a0bb --- a/qcsrc/client/projectile.qc +++ b/qcsrc/client/projectile.qc @@@ -292,9 -292,8 +292,9 @@@ void Ent_Projectile( case PROJECTILE_FIREBALL: self.model = ""; self.modelindex = 0; self.traileffect = particleeffectnum("fireball"); break; // particle effect is good enough case PROJECTILE_FIREMINE: self.model = ""; self.modelindex = 0; self.traileffect = particleeffectnum("firemine"); break; // particle effect is good enough case PROJECTILE_TAG: setmodel(self, "models/laser.mdl"); self.traileffect = particleeffectnum("TR_ROCKET"); break; - case PROJECTILE_FLAC: setmodel(self, "models/hagarmissile.mdl"); self.scale = 0.4; self.traileffect = particleeffectnum("TR_ROCKET"); break; - case PROJECTILE_SEEKER: setmodel(self, "models/tagrocket.md3"); self.scale = 2; self.traileffect = particleeffectnum("TR_ROCKET"); break; + case PROJECTILE_FLAC: setmodel(self, "models/hagarmissile.mdl"); self.scale = 0.4; self.traileffect = particleeffectnum("TR_SEEKER"); break; + case PROJECTILE_SEEKER: setmodel(self, "models/tagrocket.md3"); self.traileffect = particleeffectnum("TR_SEEKER"); break; + case PROJECTILE_RAPTORBOMB: setmodel(self, "models/vehicles/raptor_bomb.dpm"); self.gravity = 1; self.avelocity = '0 0 180'; self.traileffect = particleeffectnum(""); break; default: error("Received invalid CSQC projectile, can't work with this!"); break;