[Verse-cvs] CVS commit: quelsolaar Makefile b_glut.c b_main.c co_game.c co_intro.c co_main.c co_vn_audio.c co_vn_bitmap.c co_vn_geometry.c co_vn_handle.c co_vn_head.c co_vn_material.c co_vn_object.c e_storage_bitmap.c e_storage_geometry.c e_storage_material.c ...

[Emil Brink]

emil (Emil Brink ) 2005/08/22 13:18:57 CEST

  Modified files:
    .                    Makefile b_glut.c b_main.c co_game.c 
                         co_intro.c co_main.c co_vn_audio.c 
                         co_vn_bitmap.c co_vn_geometry.c 
                         co_vn_handle.c co_vn_head.c 
                         co_vn_material.c co_vn_object.c 
                         e_storage_bitmap.c e_storage_geometry.c 
                         e_storage_material.c e_storage_node.c 
                         enough.h la_draw_overlay.c 
                         la_geometry_undo.c la_intro.c la_main.c 
                         la_particle_fx.c la_pop_up.c 
                         la_projection.c la_tool.h p_extension.c 
                         p_object.h p_object_environment.c 
                         p_object_handle.c p_object_light.c 
                         p_object_param.c p_object_render.c 
                         p_sds_array.c p_sds_geo.h 
                         p_sds_geo_clean.c p_sds_geo_divide.c 
                         p_sds_obj.c p_sds_obj.h 
                         p_sds_obj_displace.c 
                         p_sds_obj_edge_normal.c p_sds_obj_sort.c 
                         p_sds_obj_tess.c p_shader.h 
                         p_shader_extension.c 
                         p_shader_gl_one_fall_back.c 
                         p_shader_writer.c p_task.c p_texture.c 
                         persuade.h qs_camera.c qs_intro.c 
                         qs_main.c s_background.c s_popup.c 
                         s_settings.c s_text.c seduce.h st_types.h 
                         uv_geometry.c uv_geometry.h 
                         uv_input_parse.c uv_main.c uv_overlay.c 
                         uv_popup.c 
  
  Log:
  Massive merges from Eskil
  
  Revision  Changes    Path
  1.14      +7 -4      quelsolaar/Makefile
  1.9       +19 -11    quelsolaar/b_glut.c
  1.8       +2 -3      quelsolaar/b_main.c
  1.8       +1 -0      quelsolaar/co_game.c
  1.6       +4 -6      quelsolaar/co_intro.c
  1.7       +68 -185   quelsolaar/co_main.c
  1.4       +178 -178  quelsolaar/co_vn_audio.c
  1.6       +177 -185  quelsolaar/co_vn_bitmap.c
  1.10      +262 -248  quelsolaar/co_vn_geometry.c
  1.10      +771 -690  quelsolaar/co_vn_handle.c
  1.10      +493 -493  quelsolaar/co_vn_head.c
  1.11      +1565 -1565quelsolaar/co_vn_material.c
  1.20      +424 -424  quelsolaar/co_vn_object.c
  1.10      +614 -611  quelsolaar/e_storage_bitmap.c
  1.13      +1065 -977 quelsolaar/e_storage_geometry.c
  1.4       +267 -253  quelsolaar/e_storage_material.c
  1.15      +469 -470  quelsolaar/e_storage_node.c
  1.20      +291 -286  quelsolaar/enough.h
  1.8       +911 -747  quelsolaar/la_draw_overlay.c
  1.8       +821 -819  quelsolaar/la_geometry_undo.c
  1.4       +171 -171  quelsolaar/la_intro.c
  1.7       +65 -61    quelsolaar/la_main.c
  1.6       +959 -959  quelsolaar/la_particle_fx.c
  1.9       +683 -656  quelsolaar/la_pop_up.c
  1.4       +533 -533  quelsolaar/la_projection.c
  1.6       +90 -90    quelsolaar/la_tool.h
  1.5       +12 -6     quelsolaar/p_extension.c
  1.4       +59 -58    quelsolaar/p_object.h
  1.5       +450 -447  quelsolaar/p_object_environment.c
  1.8       +161 -157  quelsolaar/p_object_handle.c
  1.2       +47 -1     quelsolaar/p_object_light.c
  1.5       +163 -163  quelsolaar/p_object_param.c
  1.4       +242 -156  quelsolaar/p_object_render.c
  1.3       +5 -0      quelsolaar/p_sds_array.c
  1.2       +1 -1      quelsolaar/p_sds_geo.h
  1.2       +6 -4      quelsolaar/p_sds_geo_clean.c
  1.2       +107 -15   quelsolaar/p_sds_geo_divide.c
  1.2       +57 -19    quelsolaar/p_sds_obj.c
  1.2       +9 -3      quelsolaar/p_sds_obj.h
  1.2       +127 -49   quelsolaar/p_sds_obj_displace.c
  1.2       +23 -23    quelsolaar/p_sds_obj_edge_normal.c
  1.2       +25 -6     quelsolaar/p_sds_obj_sort.c
  1.2       +5 -2      quelsolaar/p_sds_obj_tess.c
  1.5       +18 -14    quelsolaar/p_shader.h
  1.6       +607 -511  quelsolaar/p_shader_extension.c
  1.2       +4 -0      quelsolaar/p_shader_gl_one_fall_back.c
  1.5       +597 -581  quelsolaar/p_shader_writer.c
  1.6       +133 -129  quelsolaar/p_task.c
  1.7       +410 -399  quelsolaar/p_texture.c
  1.3       +46 -53    quelsolaar/persuade.h
  1.6       +2 -2      quelsolaar/qs_camera.c
  1.7       +270 -270  quelsolaar/qs_intro.c
  1.6       +210 -212  quelsolaar/qs_main.c
  1.6       +363 -353  quelsolaar/s_background.c
  1.4       +117 -163  quelsolaar/s_popup.c
  1.9       +198 -189  quelsolaar/s_settings.c
  1.9       +6 -3      quelsolaar/s_text.c
  1.9       +26 -10    quelsolaar/seduce.h
  1.3       +128 -127  quelsolaar/st_types.h
  1.6       +534 -528  quelsolaar/uv_geometry.c
  1.5       +42 -42    quelsolaar/uv_geometry.h
  1.3       +238 -237  quelsolaar/uv_input_parse.c
  1.4       +33 -107   quelsolaar/uv_main.c
  1.4       +147 -131  quelsolaar/uv_overlay.c
  1.5       +316 -123  quelsolaar/uv_popup.c