diff options
| -rw-r--r-- | assets/credits.txt | 8 | ||||
| -rw-r--r-- | assets/models/players/human_base/h_helmet_mk2.tga | bin | 262188 -> 179755 bytes | |||
| -rw-r--r-- | assets/models/players/human_base/head_light_mk2.skin | 2 | ||||
| -rw-r--r-- | assets/models/players/human_base/head_mk2.md3 | bin | 0 -> 10300 bytes | |||
| -rw-r--r-- | assets/ui/assets/neutral/cross_implanted.tga | bin | 0 -> 4153 bytes | |||
| -rw-r--r-- | src/cgame/cg_local.h | 1 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 1 | ||||
| -rw-r--r-- | src/cgame/cg_players.c | 3 | ||||
| -rw-r--r-- | src/game/tremulous.h | 2 |
9 files changed, 12 insertions, 5 deletions
diff --git a/assets/credits.txt b/assets/credits.txt index 2bcff96..58fdcdb 100644 --- a/assets/credits.txt +++ b/assets/credits.txt @@ -7,9 +7,12 @@ Cuboid - a Tremulous 1.2 mod focused on cuboids and fixing balance issues. Version Release date ______________________________________________________________________________________________ 0.1.5 Sep 12 2013 +GAMEPLAY: - Reverted both Lucifer Cannon and Advanced Marauder zap back to the GPP state. - Increased Jetpack jump fuel usage from 85 to 300 (up to 20 jumps instead of 70). - Health cross changes icon and color when implanted with an egg. +NON-GAMEPLAY: +- Proper Helmet Mk2 model and texture. 0.1.4 Sep 12 2013 NON-GAMEPLAY: @@ -20,7 +23,7 @@ NON-GAMEPLAY: 0.1.3 Sep 10 2013 GAMEPLAY: -- It's not longer possible to avoid buildtimer by reconnecting. +- It's no longer possible to avoid buildtimer by reconnecting. NON-GAMEPLAY: - Customizable vote percentages: g_[map/restart/draw]VotePercent, default: 67. - Customizable vote timelimits: g_[map/restart]Timelimit, default: 5 for map votes, 10 for restart votes. @@ -115,7 +118,8 @@ models/cuboid/organic/organic.jpg Darklegion Development, theinvsblman models/cuboid/organic/organic_fx.jpg Darklegion Development, theinvsblman cc-by-sa models/cuboid/slime/fragment.tga theinvsblman cc-by models/cuboid/slime/slime.jpg theinvsblman cc-by -models/players/human_base/h_helmet... theinvsblman cc0 +models/players/human_base/h_helmet... Darklegion Development, cron cc-by-sa +models/players/human_base/head_mk2... Darklegion Development, cron cc-by-sa models/players/human_base/head_lig... Darklegion Development, theinvsblman cc-by-sa models/weapons/flamer/fireloop_qui... Darklegion Development, theinvsblman cc-by-sa models/weapons/flamer/weapon.cfg Darklegion Development, theinvsblman cc-by-sa diff --git a/assets/models/players/human_base/h_helmet_mk2.tga b/assets/models/players/human_base/h_helmet_mk2.tga Binary files differindex 79c5173..5b9cf0c 100644 --- a/assets/models/players/human_base/h_helmet_mk2.tga +++ b/assets/models/players/human_base/h_helmet_mk2.tga diff --git a/assets/models/players/human_base/head_light_mk2.skin b/assets/models/players/human_base/head_light_mk2.skin index 554cc3b..4823970 100644 --- a/assets/models/players/human_base/head_light_mk2.skin +++ b/assets/models/players/human_base/head_light_mk2.skin @@ -1,3 +1,3 @@ tag_head,
-h_head_base,models/players/human_base/h_helmet_mk2
+h_head_base,gfx/null
h_head_helmet,models/players/human_base/h_helmet_mk2
diff --git a/assets/models/players/human_base/head_mk2.md3 b/assets/models/players/human_base/head_mk2.md3 Binary files differnew file mode 100644 index 0000000..f00ddd3 --- /dev/null +++ b/assets/models/players/human_base/head_mk2.md3 diff --git a/assets/ui/assets/neutral/cross_implanted.tga b/assets/ui/assets/neutral/cross_implanted.tga Binary files differnew file mode 100644 index 0000000..5c69369 --- /dev/null +++ b/assets/ui/assets/neutral/cross_implanted.tga diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 2821bc4..a8316c5 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -1308,6 +1308,7 @@ typedef struct qhandle_t larmourLegsSkin; qhandle_t larmourTorsoSkin; + qhandle_t headMk2Model; qhandle_t jetpackModel; qhandle_t jetpackFlashModel; qhandle_t battpackModel; diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 7157061..c1c7a0d 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -1002,6 +1002,7 @@ static void CG_RegisterClients( void ) cgs.media.larmourLegsSkin = trap_R_RegisterSkin( "models/players/human_base/lower_light.skin" ); cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/human_base/upper_light.skin" ); + cgs.media.headMk2Model = trap_R_RegisterModel( "models/players/human_base/head_mk2.md3" ); cgs.media.jetpackModel = trap_R_RegisterModel( "models/players/human_base/jetpack.md3" ); cgs.media.jetpackFlashModel = trap_R_RegisterModel( "models/players/human_base/jetpack_flash.md3" ); cgs.media.battpackModel = trap_R_RegisterModel( "models/players/human_base/battpack.md3" ); diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c index 03601f6..99f9f9e 100644 --- a/src/cgame/cg_players.c +++ b/src/cgame/cg_players.c @@ -2094,7 +2094,8 @@ void CG_Player( centity_t *cent ) if( held & ( 1 << UP_HELMET_MK1 ) ) head.customSkin = cgs.media.larmourHeadSkin; else if( held & ( 1 << UP_HELMET_MK2 ) ) - head.customSkin = cgs.media.larmourMk2HeadSkin; + head.customSkin = cgs.media.larmourMk2HeadSkin, + head.hModel = cgs.media.headMk2Model; //hack else head.customSkin = ci->headSkin; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 434a0ff..a44a306 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -90,7 +90,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LEVEL2_AREAZAP_REPEAT 1500 #define LEVEL2_AREAZAP_TIME 1000 #define LEVEL2_AREAZAP_MAX_TARGETS 5 -#define LEVEL2_AREAZAP_DMG_MOD 0.66f //versus buildings +#define LEVEL2_AREAZAP_DMG_MOD 1 //versus buildings #define LEVEL2_WALLJUMP_MAXSPEED 1000.0f #define LEVEL3_CLAW_DMG ADM(80) |