Added second playable level

dev
Shariq Shah 5 years ago
parent e8bac0eeab
commit 780282ea78
  1. 134
      assets/entities/turret_neg_135.symtres
  2. 134
      assets/entities/turret_neg_45.symtres
  3. 134
      assets/entities/turret_neg_90.symtres
  4. 134
      assets/entities/turret_pos_135.symtres
  5. 134
      assets/entities/turret_pos_45.symtres
  6. 134
      assets/entities/turret_pos_90.symtres
  7. 972
      assets/scenes/scene_2.symtres
  8. 24
      build/genie.lua
  9. 2
      src/common/version.h
  10. 1
      src/game/enemy.c

@ -0,0 +1,134 @@
Entity
{
type : 8
scale : 1.000 1.000 1.000
pulsate_height : 1.5000
vision_range : 25.0000
pulsate_speed_scale : 0.1000
rotation : 0.000 -0.923 0.000 0.384
health : 116
alert_cooldown : 1.0000
color_alert : 1.000 1.000 0.000 1.000
muzzle_light_intensity_min : 1
default_yaw : -135.0000
turn_speed_when_targetting : 50.0000
max_yaw : 60.0000
position : 104.000 12.000 -66.000
flags : 1
enemy_type : 0
muzzle_light_intensity_max : 5
turn_speed_default : 50.0000
turn_direction_positive : true
attack_cooldown : 0.0500
name : Turret
archetype : turret_neg_135
bounding_box_min : -1.000 -0.500 -1.000
muzzle_light_intensity_decay : 30
color_default : 0.000 1.000 1.000 1.000
hit_chance : 4
color_attack : 1.000 0.000 0.000 1.000
bounding_box_max : 1.000 1.000 1.000
damage : 10
}
Entity
{
type : 5
scale : 1.000 1.000 1.000
inner_angle : 50.0000
falloff : 1.5000
light_type : 0
depth_bias : 0.0005
rotation : 0.000 0.000 0.000 1.000
cast_shadow : false
intensity : 0.0000
color : 0.900 0.400 0.000
radius : 25.0000
position : 0.000 0.000 -1.000
flags : 9
outer_angle : 80.0000
name : Enemy_Muzzle_Light
bounding_box_min : -0.500 -0.500 -0.500
pcf_enabled : false
valid : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 0.000 0.000 0.000
material : 0
rotation : 0.707 0.000 0.000 0.707
diffuse_color : 0.900 0.400 0.000 1.000
geometry : muzzle_flash.symbres
specular : 1.0000
diffuse_texture : white.tga
diffuse : 6.0000
position : 0.000 -0.500 -1.000
flags : 9
specular_strength : 50.0000
name : Enemy_Muzzle_Light_Mesh
uv_scale : 1.000 1.000
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 1.0000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : false
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/bullet_1.wav
sound_type : 1
sound_max_distance : 30.0000
name : Turret_Weapon_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 0.5000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : true
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/turret_hum.wav
sound_type : 1
sound_max_distance : 40.0000
name : Turret_Ambient_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 1.000 1.000 1.000
material : 0
rotation : 0.000 0.000 0.000 1.000
diffuse_color : 0.000 1.000 1.000 1.000
geometry : suzanne.symbres
specular : 0.4000
diffuse_texture : default.tga
diffuse : 1.0000
position : 0.000 0.243 0.000
flags : 9
specular_strength : 62.0000
name : Turret_Mesh
uv_scale : 0.300 0.200
}

@ -0,0 +1,134 @@
Entity
{
type : 8
scale : 1.000 1.000 1.000
pulsate_height : 1.5000
vision_range : 25.0000
pulsate_speed_scale : 0.1000
rotation : 0.000 -0.381 0.000 0.924
health : 116
alert_cooldown : 1.0000
color_alert : 1.000 1.000 0.000 1.000
muzzle_light_intensity_min : 1
default_yaw : -45.0000
turn_speed_when_targetting : 50.0000
max_yaw : 60.0000
position : 104.000 12.000 -28.000
flags : 1
enemy_type : 0
muzzle_light_intensity_max : 5
turn_speed_default : 50.0000
turn_direction_positive : false
attack_cooldown : 0.0500
name : Turret
archetype : turret_neg_45
bounding_box_min : -1.000 -0.500 -1.000
muzzle_light_intensity_decay : 30
color_default : 0.000 1.000 1.000 1.000
hit_chance : 4
color_attack : 1.000 0.000 0.000 1.000
bounding_box_max : 1.000 1.000 1.000
damage : 10
}
Entity
{
type : 5
scale : 1.000 1.000 1.000
inner_angle : 50.0000
falloff : 1.5000
light_type : 0
depth_bias : 0.0005
rotation : 0.000 0.000 0.000 1.000
cast_shadow : false
intensity : 0.0000
color : 0.900 0.400 0.000
radius : 25.0000
position : 0.000 0.000 -1.000
flags : 9
outer_angle : 80.0000
name : Enemy_Muzzle_Light
bounding_box_min : -0.500 -0.500 -0.500
pcf_enabled : false
valid : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : -0.020 -0.020 -0.020
material : 0
rotation : 0.707 0.000 0.000 0.707
diffuse_color : 0.900 0.400 0.000 1.000
geometry : muzzle_flash.symbres
specular : 1.0000
diffuse_texture : white.tga
diffuse : 6.0000
position : 0.000 -0.500 -1.000
flags : 9
specular_strength : 50.0000
name : Enemy_Muzzle_Light_Mesh
uv_scale : 1.000 1.000
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 1.0000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : false
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/bullet_1.wav
sound_type : 1
sound_max_distance : 30.0000
name : Turret_Weapon_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 0.5000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : true
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/turret_hum.wav
sound_type : 1
sound_max_distance : 40.0000
name : Turret_Ambient_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 1.000 1.000 1.000
material : 0
rotation : 0.000 0.000 0.000 1.000
diffuse_color : 0.000 1.000 1.000 1.000
geometry : suzanne.symbres
specular : 0.4000
diffuse_texture : default.tga
diffuse : 1.0000
position : 0.000 0.243 0.000
flags : 9
specular_strength : 62.0000
name : Turret_Mesh
uv_scale : 0.300 0.200
}

@ -0,0 +1,134 @@
Entity
{
type : 8
scale : 1.000 1.000 1.000
pulsate_height : 1.5000
vision_range : 15.0000
pulsate_speed_scale : 0.1000
rotation : 0.000 0.001 0.000 1.001
health : 116
alert_cooldown : 1.0000
color_alert : 1.000 1.000 0.000 1.000
muzzle_light_intensity_min : 1
turn_speed_when_targetting : 50.0000
max_yaw : 60.0000
position : 8.000 3.000 -45.000
flags : 1
enemy_type : 0
muzzle_light_intensity_max : 5
turn_speed_default : 50.0000
turn_direction_positive : true
attack_cooldown : 0.0500
name : Turret
archetype : turret
bounding_box_min : -1.000 -0.500 -1.000
muzzle_light_intensity_decay : 30
color_default : 0.000 1.000 1.000 1.000
hit_chance : 4
color_attack : 1.000 0.000 0.000 1.000
bounding_box_max : 1.000 1.000 1.000
damage : 10
default_yaw : -90.000
}
Entity
{
type : 5
scale : 1.000 1.000 1.000
inner_angle : 50.0000
falloff : 1.5000
light_type : 0
depth_bias : 0.0005
rotation : 0.000 0.000 0.000 1.000
cast_shadow : false
intensity : 0.0000
color : 0.900 0.400 0.000
radius : 25.0000
position : 0.000 0.000 -1.000
flags : 9
outer_angle : 80.0000
name : Enemy_Muzzle_Light
bounding_box_min : -0.500 -0.500 -0.500
pcf_enabled : false
valid : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 0.000 0.000 0.000
material : 0
rotation : 0.707 0.000 0.000 0.707
diffuse_color : 0.900 0.400 0.000 1.000
geometry : muzzle_flash.symbres
specular : 1.0000
diffuse_texture : white.tga
diffuse : 6.0000
position : 0.000 -0.500 -1.000
flags : 9
specular_strength : 50.0000
name : Enemy_Muzzle_Light_Mesh
uv_scale : 1.000 1.000
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 1.0000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : false
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/bullet_1.wav
sound_type : 1
sound_max_distance : 30.0000
name : Turret_Weapon_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 0.5000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : true
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/turret_hum.wav
sound_type : 1
sound_max_distance : 40.0000
name : Turret_Ambient_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 1.000 1.000 1.000
material : 0
rotation : 0.000 0.000 0.000 1.000
diffuse_color : 0.000 1.000 1.000 1.000
geometry : suzanne.symbres
specular : 0.4000
diffuse_texture : default.tga
diffuse : 1.0000
position : 0.000 1.123 0.000
flags : 9
specular_strength : 62.0000
name : Turret_Mesh
uv_scale : 0.300 0.200
}

@ -0,0 +1,134 @@
Entity
{
type : 8
scale : 1.000 1.000 1.000
pulsate_height : 1.5000
vision_range : 25.0000
pulsate_speed_scale : 0.1000
rotation : 0.000 -0.923 0.000 -0.385
health : 116
alert_cooldown : 1.0000
color_alert : 1.000 1.000 0.000 1.000
muzzle_light_intensity_min : 1
default_yaw : 135.0000
turn_speed_when_targetting : 50.0000
max_yaw : 60.0000
position : 39.000 12.000 76.500
flags : 1
enemy_type : 0
muzzle_light_intensity_max : 5
turn_speed_default : 50.0000
turn_direction_positive : true
attack_cooldown : 0.0500
name : Turret
archetype : turret_neg_135
bounding_box_min : -1.000 -0.500 -1.000
muzzle_light_intensity_decay : 30
color_default : 0.000 1.000 1.000 1.000
hit_chance : 4
color_attack : 1.000 0.000 0.000 1.000
bounding_box_max : 1.000 1.000 1.000
damage : 10
}
Entity
{
type : 5
scale : 1.000 1.000 1.000
inner_angle : 50.0000
falloff : 1.5000
light_type : 0
depth_bias : 0.0005
rotation : 0.000 0.000 0.000 1.000
cast_shadow : false
intensity : 0.0000
color : 0.900 0.400 0.000
radius : 25.0000
position : 0.000 0.000 -1.000
flags : 9
outer_angle : 80.0000
name : Enemy_Muzzle_Light
bounding_box_min : -0.500 -0.500 -0.500
pcf_enabled : false
valid : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 0.000 0.000 0.000
material : 0
rotation : 0.707 0.000 0.000 0.707
diffuse_color : 0.900 0.400 0.000 1.000
geometry : muzzle_flash.symbres
specular : 1.0000
diffuse_texture : white.tga
diffuse : 6.0000
position : 0.000 -0.500 -1.000
flags : 9
specular_strength : 50.0000
name : Enemy_Muzzle_Light_Mesh
uv_scale : 1.000 1.000
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 1.0000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : false
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/bullet_1.wav
sound_type : 1
sound_max_distance : 30.0000
name : Turret_Weapon_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 0.5000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : true
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/turret_hum.wav
sound_type : 1
sound_max_distance : 40.0000
name : Turret_Ambient_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 1.000 1.000 1.000
material : 0
rotation : 0.000 0.000 0.000 1.000
diffuse_color : 0.000 1.000 1.000 1.000
geometry : suzanne.symbres
specular : 0.4000
diffuse_texture : default.tga
diffuse : 1.0000
position : 0.000 -1.367 0.000
flags : 9
specular_strength : 62.0000
name : Turret_Mesh
uv_scale : 0.300 0.200
}

@ -0,0 +1,134 @@
Entity
{
type : 8
scale : 1.000 1.000 1.000
pulsate_height : 1.5000
vision_range : 15.0000
pulsate_speed_scale : 0.1000
rotation : 0.000 -0.361 0.000 0.933
health : 116
alert_cooldown : 1.0000
color_alert : 1.000 1.000 0.000 1.000
muzzle_light_intensity_min : 1
default_yaw : 45.0000
turn_speed_when_targetting : 50.0000
max_yaw : 60.0000
position : 105.000 11.000 -28.000
flags : 1
enemy_type : 0
muzzle_light_intensity_max : 5
turn_speed_default : 50.0000
turn_direction_positive : true
attack_cooldown : 0.0500
name : Turret
archetype : turret_pos_135
bounding_box_min : -1.000 -0.500 -1.000
muzzle_light_intensity_decay : 30
color_default : 0.000 1.000 1.000 1.000
hit_chance : 4
color_attack : 1.000 0.000 0.000 1.000
bounding_box_max : 1.000 1.000 1.000
damage : 10
}
Entity
{
type : 5
scale : 1.000 1.000 1.000
inner_angle : 50.0000
falloff : 1.5000
light_type : 0
depth_bias : 0.0005
rotation : 0.000 0.000 0.000 1.000
cast_shadow : false
intensity : 0.0000
color : 0.900 0.400 0.000
radius : 25.0000
position : 0.000 0.000 -1.000
flags : 9
outer_angle : 80.0000
name : Enemy_Muzzle_Light
bounding_box_min : -0.500 -0.500 -0.500
pcf_enabled : false
valid : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 0.000 0.000 0.000
material : 0
rotation : 0.707 0.000 0.000 0.707
diffuse_color : 0.900 0.400 0.000 1.000
geometry : muzzle_flash.symbres
specular : 1.0000
diffuse_texture : white.tga
diffuse : 6.0000
position : 0.000 -0.500 -1.000
flags : 9
specular_strength : 50.0000
name : Enemy_Muzzle_Light_Mesh
uv_scale : 1.000 1.000
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 1.0000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : false
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/bullet_1.wav
sound_type : 1
sound_max_distance : 30.0000
name : Turret_Weapon_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 0.5000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : true
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/turret_hum.wav
sound_type : 1
sound_max_distance : 40.0000
name : Turret_Ambient_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 1.000 1.000 1.000
material : 0
rotation : 0.000 0.000 0.000 1.000
diffuse_color : 0.000 1.000 1.000 1.000
geometry : suzanne.symbres
specular : 0.4000
diffuse_texture : default.tga
diffuse : 1.0000
position : 0.000 -0.503 0.000
flags : 9
specular_strength : 62.0000
name : Turret_Mesh
uv_scale : 0.300 0.200
}

@ -0,0 +1,134 @@
Entity
{
type : 8
scale : 1.000 1.000 1.000
pulsate_height : 1.5000
vision_range : 19.0000
pulsate_speed_scale : 0.1000
rotation : 0.000 0.708 0.000 0.706
health : 116
alert_cooldown : 1.0000
color_alert : 1.000 1.000 0.000 1.000
muzzle_light_intensity_min : 1
default_yaw : 90.0000
turn_speed_when_targetting : 50.0000
max_yaw : 60.0000
position : 136.000 12.000 -48.000
flags : 1
enemy_type : 0
muzzle_light_intensity_max : 5
turn_speed_default : 50.0000
turn_direction_positive : true
attack_cooldown : 0.0500
name : Turret
archetype : turret_pos_90
bounding_box_min : -1.000 -0.500 -1.000
muzzle_light_intensity_decay : 30
color_default : 0.000 1.000 1.000 1.000
hit_chance : 4
color_attack : 1.000 0.000 0.000 1.000
bounding_box_max : 1.000 1.000 1.000
damage : 10
}
Entity
{
type : 5
scale : 1.000 1.000 1.000
inner_angle : 50.0000
falloff : 1.5000
light_type : 0
depth_bias : 0.0005
rotation : 0.000 0.000 0.000 1.000
cast_shadow : false
intensity : 0.0000
color : 0.900 0.400 0.000
radius : 25.0000
position : 0.000 0.000 -1.000
flags : 9
outer_angle : 80.0000
name : Enemy_Muzzle_Light
bounding_box_min : -0.500 -0.500 -0.500
pcf_enabled : false
valid : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 0.000 0.000 0.000
material : 0
rotation : 0.707 0.000 0.000 0.707
diffuse_color : 0.900 0.400 0.000 1.000
geometry : muzzle_flash.symbres
specular : 1.0000
diffuse_texture : white.tga
diffuse : 6.0000
position : 0.000 -0.500 -1.000
flags : 9
specular_strength : 50.0000
name : Enemy_Muzzle_Light_Mesh
uv_scale : 1.000 1.000
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 1.0000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : false
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/bullet_1.wav
sound_type : 1
sound_max_distance : 30.0000
name : Turret_Weapon_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 7
scale : 1.000 1.000 1.000
volume : 0.5000
rolloff_factor : 0.9500
rotation : 0.000 0.000 0.000 1.000
loop : true
sound_min_distance : 0.0000
position : 0.000 0.000 0.000
flags : 9
source_filename : sounds/turret_hum.wav
sound_type : 1
sound_max_distance : 40.0000
name : Turret_Ambient_Sound
bounding_box_min : -0.500 -0.500 -0.500
sound_attenuation_type : 2
paused : true
bounding_box_max : 0.500 0.500 0.500
}
Entity
{
type : 6
scale : 1.000 1.000 1.000
material : 0
rotation : 0.000 0.000 0.000 1.000
diffuse_color : 0.000 1.000 1.000 1.000
geometry : suzanne.symbres
specular : 0.4000
diffuse_texture : default.tga
diffuse : 1.0000
position : 0.000 -0.735 0.000
flags : 9
specular_strength : 62.0000
name : Turret_Mesh
uv_scale : 0.300 0.200
}

File diff suppressed because it is too large Load Diff

@ -8,7 +8,7 @@ solution "Symmetry"
postbuildcommands {"ln -fs " .. os.getcwd() .. "/../assets " .. os.getcwd() .. "release"} postbuildcommands {"ln -fs " .. os.getcwd() .. "/../assets " .. os.getcwd() .. "release"}
buildoptions {"-Wall", "-std=c99"} buildoptions {"-Wall", "-std=c99"}
configuration {"windows", "vs2019"} configuration {"windows", "vs2019"}
defines {"_CRT_SECURE_NO_WARNINGS"} defines {"_CRT_SECURE_NO_WARNINGS"}
flags {"NoIncrementalLink", "NoEditAndContinue"} flags {"NoIncrementalLink", "NoEditAndContinue"}
local windowsPlatform = string.gsub(os.getenv("WindowsSDKVersion") or "10.0.16299.0", "\\", "") local windowsPlatform = string.gsub(os.getenv("WindowsSDKVersion") or "10.0.16299.0", "\\", "")
@ -17,7 +17,7 @@ solution "Symmetry"
action.vstudio.windowsTargetPlatformVersion = windowsPlatform action.vstudio.windowsTargetPlatformVersion = windowsPlatform
action.vstudio.windowsTargetPlatformMinVersion = windowsPlatform action.vstudio.windowsTargetPlatformMinVersion = windowsPlatform
end end
configuration "Debug" configuration "Debug"
if (_ACTION ~= nil and _ACTION ~= "postbuild_copy" and _ACTION ~= "build_addon") then if (_ACTION ~= nil and _ACTION ~= "postbuild_copy" and _ACTION ~= "build_addon") then
os.mkdir(_ACTION .. "/debug") os.mkdir(_ACTION .. "/debug")
@ -33,14 +33,14 @@ solution "Symmetry"
end end
defines { "NDEBUG", "ExtraWarnings" } defines { "NDEBUG", "ExtraWarnings" }
flags { "OptimizeSpeed"} flags { "OptimizeSpeed"}
newaction { newaction {
trigger = "postbuild_copy", trigger = "postbuild_copy",
description = "Action to copy relevant dlls to executable directory after build", description = "Action to copy relevant dlls to executable directory after build",
execute = function () execute = function ()
-- local copy_dest_dir = "" -- local copy_dest_dir = ""
-- local symlink_dest_dir = "" -- local symlink_dest_dir = ""
-- if(_ARGS[1] == "vs2019") then -- if(_ARGS[1] == "vs2019") then
-- copy_dest_dir = "vs2019" -- copy_dest_dir = "vs2019"
-- symlink_dest_dir = "..\\..\\..\\assets" -- symlink_dest_dir = "..\\..\\..\\assets"
@ -60,7 +60,7 @@ solution "Symmetry"
description = "Generate version.h from git revision number", description = "Generate version.h from git revision number",
execute = function() execute = function()
local major_version = 0 local major_version = 0
local minor_version = 3 local minor_version = 4
local revision_number = os.outputof("git rev-list --count HEAD") local revision_number = os.outputof("git rev-list --count HEAD")
local branch = os.outputof("git rev-parse --abbrev-ref HEAD") local branch = os.outputof("git rev-parse --abbrev-ref HEAD")
@ -136,18 +136,18 @@ solution "Symmetry"
configuration {"windows", "vs2019"} configuration {"windows", "vs2019"}
includedirs {"../include/windows/sdl2/", "../include/common/soloud/", "../include/windows/"} includedirs {"../include/windows/sdl2/", "../include/common/soloud/", "../include/windows/"}
libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/"} libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/"}
configuration {"not macosx", "Debug"} configuration {"not macosx", "Debug"}
links {"soloud_x64_d"} links {"soloud_x64_d"}
configuration "Debug" configuration "Debug"
defines {"GL_DEBUG_CONTEXT", "GL_BREAK_ON_ERROR"} defines {"GL_DEBUG_CONTEXT", "GL_BREAK_ON_ERROR"}
configuration {"not macosx", "Release"} configuration {"not macosx", "Release"}
links {"soloud_x64"} links {"soloud_x64"}
configuration {"windows", "Release", "vs2019"} configuration {"windows", "Release", "vs2019"}
postbuildcommands postbuildcommands
{ {
"copy ..\\..\\lib\\windows\\sdl2\\SDL2.dll release\\ /Y", "copy ..\\..\\lib\\windows\\sdl2\\SDL2.dll release\\ /Y",
"copy ..\\..\\lib\\windows\\soloud\\soloud_x64.dll release\\ /Y", "copy ..\\..\\lib\\windows\\soloud\\soloud_x64.dll release\\ /Y",
@ -160,9 +160,9 @@ solution "Symmetry"
"mklink /D release\\assets ..\\..\\..\\assets" "mklink /D release\\assets ..\\..\\..\\assets"
} }
links {"SDL2"} links {"SDL2"}
configuration {"windows", "Debug", "vs2019"} configuration {"windows", "Debug", "vs2019"}
postbuildcommands postbuildcommands
{ {
"copy ..\\..\\lib\\windows\\sdl2\\SDL2.dll debug\\ /Y", "copy ..\\..\\lib\\windows\\sdl2\\SDL2.dll debug\\ /Y",
"copy ..\\..\\lib\\windows\\soloud\\soloud_x64_d.dll debug\\ /Y", "copy ..\\..\\lib\\windows\\soloud\\soloud_x64_d.dll debug\\ /Y",

@ -4,7 +4,7 @@
/* Auto generated version file. DO NOT MODIFY */ /* Auto generated version file. DO NOT MODIFY */
#define SYMMETRY_VERSION_MAJOR 0 #define SYMMETRY_VERSION_MAJOR 0
#define SYMMETRY_VERSION_MINOR 3 #define SYMMETRY_VERSION_MINOR 3
#define SYMMETRY_VERSION_REVISION 375 #define SYMMETRY_VERSION_REVISION 376
#define SYMMETRY_VERSION_BRANCH "dev" #define SYMMETRY_VERSION_BRANCH "dev"
#endif #endif

@ -226,6 +226,7 @@ void enemy_write(struct Enemy* enemy, struct Hashmap* entity_data)
{ {
hashmap_float_set(entity_data, "turn_speed_default", enemy->Turret.turn_speed_default); hashmap_float_set(entity_data, "turn_speed_default", enemy->Turret.turn_speed_default);
hashmap_float_set(entity_data, "turn_speed_when_targetting", enemy->Turret.turn_speed_default); hashmap_float_set(entity_data, "turn_speed_when_targetting", enemy->Turret.turn_speed_default);
hashmap_float_set(entity_data, "default_yaw", enemy->Turret.default_yaw);
hashmap_float_set(entity_data, "max_yaw", enemy->Turret.max_yaw); hashmap_float_set(entity_data, "max_yaw", enemy->Turret.max_yaw);
hashmap_float_set(entity_data, "pulsate_speed_scale", enemy->Turret.pulsate_speed_scale); hashmap_float_set(entity_data, "pulsate_speed_scale", enemy->Turret.pulsate_speed_scale);
hashmap_float_set(entity_data, "pulsate_height", enemy->Turret.pulsate_height); hashmap_float_set(entity_data, "pulsate_height", enemy->Turret.pulsate_height);

Loading…
Cancel
Save