[quake3-commits] [ioquake/ioq3] 974b93: Starting sunlight experimentation branch

SmileTheory SmileTheory at gmail.com
Tue Apr 2 03:22:38 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/ioquake/ioq3
  Commit: 974b938f8fe93117dab3dd729baae117c8e91cf3
      https://github.com/ioquake/ioq3/commit/974b938f8fe93117dab3dd729baae117c8e91cf3
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M code/rend2/tr_bsp.c
    M code/rend2/tr_glsl.c
    M code/rend2/tr_light.c
    M code/rend2/tr_local.h
    M code/rend2/tr_shade.c

  Log Message:
  -----------
  Starting sunlight experimentation branch


  Commit: cda1c46e3a4be1dc028a0fac7b030009c3c5afde
      https://github.com/ioquake/ioq3/commit/cda1c46e3a4be1dc028a0fac7b030009c3c5afde
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M README
    M code/asm/snapvector.c
    M code/client/cl_cin.c
    M code/client/cl_console.c
    M code/client/cl_keys.c
    M code/client/cl_ui.c
    M code/game/bg_misc.c
    M code/q3_ui/ui_controls2.c
    M code/qcommon/files.c
    M code/qcommon/q_shared.h
    M code/rend2/tr_backend.c
    M code/rend2/tr_bsp.c
    M code/rend2/tr_cmds.c
    M code/rend2/tr_fbo.c
    M code/rend2/tr_font.c
    M code/rend2/tr_glsl.c
    M code/rend2/tr_image.c
    M code/rend2/tr_init.c
    M code/rend2/tr_light.c
    M code/rend2/tr_local.h
    M code/rend2/tr_main.c
    M code/rend2/tr_model.c
    M code/rend2/tr_scene.c
    M code/rend2/tr_shader.c
    M code/rend2/tr_surface.c
    M code/rend2/tr_vbo.c
    M code/rend2/tr_world.c
    M code/renderer/tr_backend.c
    M code/renderer/tr_bsp.c
    M code/renderer/tr_cmds.c
    M code/renderer/tr_font.c
    M code/renderer/tr_image.c
    M code/renderer/tr_init.c
    M code/renderer/tr_light.c
    M code/renderer/tr_local.h
    M code/renderer/tr_main.c
    M code/renderer/tr_model.c
    M code/renderer/tr_scene.c
    M code/renderer/tr_shader.c
    M code/renderer/tr_surface.c
    M code/renderer/tr_types.h
    M code/renderer/tr_world.c
    M code/sdl/sdl_glimp.c
    M code/sys/con_win32.c
    M make-macosx-ub.sh
    M make-macosx.sh

  Log Message:
  -----------
  Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest


  Commit: 66acde6d608a107dff4dc3c100ee5e1ca0b48c32
      https://github.com/ioquake/ioq3/commit/66acde6d608a107dff4dc3c100ee5e1ca0b48c32
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    A .travis.yml
    M Makefile
    M README
    M code/AL/VERSION
    M code/AL/al.h
    M code/AL/alc.h
    R code/AL/alctypes.h
    A code/AL/alext.h
    R code/AL/altypes.h
    R code/AL/alut.h
    A code/AL/efx-creative.h
    A code/AL/efx-presets.h
    A code/AL/efx.h
    M code/asm/ftola.c
    M code/botlib/be_aas_def.h
    M code/botlib/be_aas_main.c
    M code/botlib/be_aas_main.h
    M code/botlib/be_ai_goal.c
    M code/botlib/be_ai_weap.c
    M code/botlib/be_interface.c
    M code/cgame/cg_local.h
    M code/client/cl_console.c
    M code/client/cl_keys.c
    M code/client/cl_main.c
    M code/client/cl_parse.c
    M code/client/cl_ui.c
    M code/client/client.h
    M code/client/snd_codec.c
    M code/client/snd_codec.h
    A code/client/snd_codec_opus.c
    M code/client/snd_dma.c
    M code/client/snd_openal.c
    M code/game/g_bot.c
    M code/game/g_cmds.c
    M code/game/g_combat.c
    M code/game/g_main.c
    A code/libogg-1.3.0/include/ogg/config_types.h
    A code/libogg-1.3.0/include/ogg/ogg.h
    A code/libogg-1.3.0/include/ogg/os_types.h
    A code/libogg-1.3.0/src/bitwise.c
    A code/libogg-1.3.0/src/framing.c
    M code/null/null_glimp.c
    M code/null/null_main.c
    A code/opus-1.0.2/celt/_kiss_fft_guts.h
    A code/opus-1.0.2/celt/arch.h
    A code/opus-1.0.2/celt/bands.c
    A code/opus-1.0.2/celt/bands.h
    A code/opus-1.0.2/celt/celt.c
    A code/opus-1.0.2/celt/celt.h
    A code/opus-1.0.2/celt/celt_lpc.c
    A code/opus-1.0.2/celt/celt_lpc.h
    A code/opus-1.0.2/celt/cwrs.c
    A code/opus-1.0.2/celt/cwrs.h
    A code/opus-1.0.2/celt/ecintrin.h
    A code/opus-1.0.2/celt/entcode.c
    A code/opus-1.0.2/celt/entcode.h
    A code/opus-1.0.2/celt/entdec.c
    A code/opus-1.0.2/celt/entdec.h
    A code/opus-1.0.2/celt/entenc.c
    A code/opus-1.0.2/celt/entenc.h
    A code/opus-1.0.2/celt/fixed_debug.h
    A code/opus-1.0.2/celt/fixed_generic.h
    A code/opus-1.0.2/celt/float_cast.h
    A code/opus-1.0.2/celt/kiss_fft.c
    A code/opus-1.0.2/celt/kiss_fft.h
    A code/opus-1.0.2/celt/laplace.c
    A code/opus-1.0.2/celt/laplace.h
    A code/opus-1.0.2/celt/mathops.c
    A code/opus-1.0.2/celt/mathops.h
    A code/opus-1.0.2/celt/mdct.c
    A code/opus-1.0.2/celt/mdct.h
    A code/opus-1.0.2/celt/mfrngcod.h
    A code/opus-1.0.2/celt/modes.c
    A code/opus-1.0.2/celt/modes.h
    A code/opus-1.0.2/celt/opus_custom_demo.c
    A code/opus-1.0.2/celt/os_support.h
    A code/opus-1.0.2/celt/pitch.c
    A code/opus-1.0.2/celt/pitch.h
    A code/opus-1.0.2/celt/quant_bands.c
    A code/opus-1.0.2/celt/quant_bands.h
    A code/opus-1.0.2/celt/rate.c
    A code/opus-1.0.2/celt/rate.h
    A code/opus-1.0.2/celt/stack_alloc.h
    A code/opus-1.0.2/celt/static_modes_fixed.h
    A code/opus-1.0.2/celt/static_modes_float.h
    A code/opus-1.0.2/celt/vq.c
    A code/opus-1.0.2/celt/vq.h
    A code/opus-1.0.2/include/opus.h
    A code/opus-1.0.2/include/opus_custom.h
    A code/opus-1.0.2/include/opus_defines.h
    A code/opus-1.0.2/include/opus_multistream.h
    A code/opus-1.0.2/include/opus_types.h
    A code/opus-1.0.2/silk/A2NLSF.c
    A code/opus-1.0.2/silk/API.h
    A code/opus-1.0.2/silk/CNG.c
    A code/opus-1.0.2/silk/HP_variable_cutoff.c
    A code/opus-1.0.2/silk/Inlines.h
    A code/opus-1.0.2/silk/LPC_analysis_filter.c
    A code/opus-1.0.2/silk/LPC_inv_pred_gain.c
    A code/opus-1.0.2/silk/LP_variable_cutoff.c
    A code/opus-1.0.2/silk/MacroCount.h
    A code/opus-1.0.2/silk/MacroDebug.h
    A code/opus-1.0.2/silk/NLSF2A.c
    A code/opus-1.0.2/silk/NLSF_VQ.c
    A code/opus-1.0.2/silk/NLSF_VQ_weights_laroia.c
    A code/opus-1.0.2/silk/NLSF_decode.c
    A code/opus-1.0.2/silk/NLSF_del_dec_quant.c
    A code/opus-1.0.2/silk/NLSF_encode.c
    A code/opus-1.0.2/silk/NLSF_stabilize.c
    A code/opus-1.0.2/silk/NLSF_unpack.c
    A code/opus-1.0.2/silk/NSQ.c
    A code/opus-1.0.2/silk/NSQ_del_dec.c
    A code/opus-1.0.2/silk/PLC.c
    A code/opus-1.0.2/silk/PLC.h
    A code/opus-1.0.2/silk/SigProc_FIX.h
    A code/opus-1.0.2/silk/VAD.c
    A code/opus-1.0.2/silk/VQ_WMat_EC.c
    A code/opus-1.0.2/silk/ana_filt_bank_1.c
    A code/opus-1.0.2/silk/biquad_alt.c
    A code/opus-1.0.2/silk/bwexpander.c
    A code/opus-1.0.2/silk/bwexpander_32.c
    A code/opus-1.0.2/silk/check_control_input.c
    A code/opus-1.0.2/silk/code_signs.c
    A code/opus-1.0.2/silk/control.h
    A code/opus-1.0.2/silk/control_SNR.c
    A code/opus-1.0.2/silk/control_audio_bandwidth.c
    A code/opus-1.0.2/silk/control_codec.c
    A code/opus-1.0.2/silk/debug.c
    A code/opus-1.0.2/silk/debug.h
    A code/opus-1.0.2/silk/dec_API.c
    A code/opus-1.0.2/silk/decode_core.c
    A code/opus-1.0.2/silk/decode_frame.c
    A code/opus-1.0.2/silk/decode_indices.c
    A code/opus-1.0.2/silk/decode_parameters.c
    A code/opus-1.0.2/silk/decode_pitch.c
    A code/opus-1.0.2/silk/decode_pulses.c
    A code/opus-1.0.2/silk/decoder_set_fs.c
    A code/opus-1.0.2/silk/define.h
    A code/opus-1.0.2/silk/enc_API.c
    A code/opus-1.0.2/silk/encode_indices.c
    A code/opus-1.0.2/silk/encode_pulses.c
    A code/opus-1.0.2/silk/errors.h
    A code/opus-1.0.2/silk/fixed/LTP_analysis_filter_FIX.c
    A code/opus-1.0.2/silk/fixed/LTP_scale_ctrl_FIX.c
    A code/opus-1.0.2/silk/fixed/apply_sine_window_FIX.c
    A code/opus-1.0.2/silk/fixed/autocorr_FIX.c
    A code/opus-1.0.2/silk/fixed/burg_modified_FIX.c
    A code/opus-1.0.2/silk/fixed/corrMatrix_FIX.c
    A code/opus-1.0.2/silk/fixed/encode_frame_FIX.c
    A code/opus-1.0.2/silk/fixed/find_LPC_FIX.c
    A code/opus-1.0.2/silk/fixed/find_LTP_FIX.c
    A code/opus-1.0.2/silk/fixed/find_pitch_lags_FIX.c
    A code/opus-1.0.2/silk/fixed/find_pred_coefs_FIX.c
    A code/opus-1.0.2/silk/fixed/k2a_FIX.c
    A code/opus-1.0.2/silk/fixed/k2a_Q16_FIX.c
    A code/opus-1.0.2/silk/fixed/main_FIX.h
    A code/opus-1.0.2/silk/fixed/noise_shape_analysis_FIX.c
    A code/opus-1.0.2/silk/fixed/pitch_analysis_core_FIX.c
    A code/opus-1.0.2/silk/fixed/prefilter_FIX.c
    A code/opus-1.0.2/silk/fixed/process_gains_FIX.c
    A code/opus-1.0.2/silk/fixed/regularize_correlations_FIX.c
    A code/opus-1.0.2/silk/fixed/residual_energy16_FIX.c
    A code/opus-1.0.2/silk/fixed/residual_energy_FIX.c
    A code/opus-1.0.2/silk/fixed/schur64_FIX.c
    A code/opus-1.0.2/silk/fixed/schur_FIX.c
    A code/opus-1.0.2/silk/fixed/solve_LS_FIX.c
    A code/opus-1.0.2/silk/fixed/structs_FIX.h
    A code/opus-1.0.2/silk/fixed/vector_ops_FIX.c
    A code/opus-1.0.2/silk/fixed/warped_autocorrelation_FIX.c
    A code/opus-1.0.2/silk/float/LPC_analysis_filter_FLP.c
    A code/opus-1.0.2/silk/float/LPC_inv_pred_gain_FLP.c
    A code/opus-1.0.2/silk/float/LTP_analysis_filter_FLP.c
    A code/opus-1.0.2/silk/float/LTP_scale_ctrl_FLP.c
    A code/opus-1.0.2/silk/float/SigProc_FLP.h
    A code/opus-1.0.2/silk/float/apply_sine_window_FLP.c
    A code/opus-1.0.2/silk/float/autocorrelation_FLP.c
    A code/opus-1.0.2/silk/float/burg_modified_FLP.c
    A code/opus-1.0.2/silk/float/bwexpander_FLP.c
    A code/opus-1.0.2/silk/float/corrMatrix_FLP.c
    A code/opus-1.0.2/silk/float/encode_frame_FLP.c
    A code/opus-1.0.2/silk/float/energy_FLP.c
    A code/opus-1.0.2/silk/float/find_LPC_FLP.c
    A code/opus-1.0.2/silk/float/find_LTP_FLP.c
    A code/opus-1.0.2/silk/float/find_pitch_lags_FLP.c
    A code/opus-1.0.2/silk/float/find_pred_coefs_FLP.c
    A code/opus-1.0.2/silk/float/inner_product_FLP.c
    A code/opus-1.0.2/silk/float/k2a_FLP.c
    A code/opus-1.0.2/silk/float/levinsondurbin_FLP.c
    A code/opus-1.0.2/silk/float/main_FLP.h
    A code/opus-1.0.2/silk/float/noise_shape_analysis_FLP.c
    A code/opus-1.0.2/silk/float/pitch_analysis_core_FLP.c
    A code/opus-1.0.2/silk/float/prefilter_FLP.c
    A code/opus-1.0.2/silk/float/process_gains_FLP.c
    A code/opus-1.0.2/silk/float/regularize_correlations_FLP.c
    A code/opus-1.0.2/silk/float/residual_energy_FLP.c
    A code/opus-1.0.2/silk/float/scale_copy_vector_FLP.c
    A code/opus-1.0.2/silk/float/scale_vector_FLP.c
    A code/opus-1.0.2/silk/float/schur_FLP.c
    A code/opus-1.0.2/silk/float/solve_LS_FLP.c
    A code/opus-1.0.2/silk/float/sort_FLP.c
    A code/opus-1.0.2/silk/float/structs_FLP.h
    A code/opus-1.0.2/silk/float/warped_autocorrelation_FLP.c
    A code/opus-1.0.2/silk/float/wrappers_FLP.c
    A code/opus-1.0.2/silk/gain_quant.c
    A code/opus-1.0.2/silk/init_decoder.c
    A code/opus-1.0.2/silk/init_encoder.c
    A code/opus-1.0.2/silk/inner_prod_aligned.c
    A code/opus-1.0.2/silk/interpolate.c
    A code/opus-1.0.2/silk/lin2log.c
    A code/opus-1.0.2/silk/log2lin.c
    A code/opus-1.0.2/silk/macros.h
    A code/opus-1.0.2/silk/main.h
    A code/opus-1.0.2/silk/pitch_est_defines.h
    A code/opus-1.0.2/silk/pitch_est_tables.c
    A code/opus-1.0.2/silk/process_NLSFs.c
    A code/opus-1.0.2/silk/quant_LTP_gains.c
    A code/opus-1.0.2/silk/resampler.c
    A code/opus-1.0.2/silk/resampler_down2.c
    A code/opus-1.0.2/silk/resampler_down2_3.c
    A code/opus-1.0.2/silk/resampler_private.h
    A code/opus-1.0.2/silk/resampler_private_AR2.c
    A code/opus-1.0.2/silk/resampler_private_IIR_FIR.c
    A code/opus-1.0.2/silk/resampler_private_down_FIR.c
    A code/opus-1.0.2/silk/resampler_private_up2_HQ.c
    A code/opus-1.0.2/silk/resampler_rom.c
    A code/opus-1.0.2/silk/resampler_rom.h
    A code/opus-1.0.2/silk/resampler_structs.h
    A code/opus-1.0.2/silk/shell_coder.c
    A code/opus-1.0.2/silk/sigm_Q15.c
    A code/opus-1.0.2/silk/sort.c
    A code/opus-1.0.2/silk/stereo_LR_to_MS.c
    A code/opus-1.0.2/silk/stereo_MS_to_LR.c
    A code/opus-1.0.2/silk/stereo_decode_pred.c
    A code/opus-1.0.2/silk/stereo_encode_pred.c
    A code/opus-1.0.2/silk/stereo_find_predictor.c
    A code/opus-1.0.2/silk/stereo_quant_pred.c
    A code/opus-1.0.2/silk/structs.h
    A code/opus-1.0.2/silk/sum_sqr_shift.c
    A code/opus-1.0.2/silk/table_LSF_cos.c
    A code/opus-1.0.2/silk/tables.h
    A code/opus-1.0.2/silk/tables_LTP.c
    A code/opus-1.0.2/silk/tables_NLSF_CB_NB_MB.c
    A code/opus-1.0.2/silk/tables_NLSF_CB_WB.c
    A code/opus-1.0.2/silk/tables_gain.c
    A code/opus-1.0.2/silk/tables_other.c
    A code/opus-1.0.2/silk/tables_pitch_lag.c
    A code/opus-1.0.2/silk/tables_pulses_per_block.c
    A code/opus-1.0.2/silk/tuning_parameters.h
    A code/opus-1.0.2/silk/typedef.h
    A code/opus-1.0.2/src/opus.c
    A code/opus-1.0.2/src/opus_decoder.c
    A code/opus-1.0.2/src/opus_encoder.c
    A code/opus-1.0.2/src/opus_multistream.c
    A code/opus-1.0.2/src/opus_private.h
    A code/opus-1.0.2/src/repacketizer.c
    A code/opusfile-0.2/include/opusfile.h
    A code/opusfile-0.2/src/http.c
    A code/opusfile-0.2/src/info.c
    A code/opusfile-0.2/src/internal.c
    A code/opusfile-0.2/src/internal.h
    A code/opusfile-0.2/src/opusfile.c
    A code/opusfile-0.2/src/stream.c
    M code/q3_ui/ui_local.h
    M code/q3_ui/ui_serverinfo.c
    M code/q3_ui/ui_servers2.c
    M code/qcommon/files.c
    M code/qcommon/msg.c
    M code/qcommon/net_ip.c
    M code/qcommon/q_platform.h
    M code/qcommon/qcommon.h
    M code/qcommon/qfiles.h
    R code/qcommon/vm_x86_64.c
    R code/qcommon/vm_x86_64_assembler.c
    R code/rend2/glsl/bokeh_fp.glsl
    R code/rend2/glsl/bokeh_vp.glsl
    R code/rend2/glsl/calclevels4x_fp.glsl
    R code/rend2/glsl/calclevels4x_vp.glsl
    R code/rend2/glsl/depthblur_fp.glsl
    R code/rend2/glsl/depthblur_vp.glsl
    R code/rend2/glsl/dlight_fp.glsl
    R code/rend2/glsl/dlight_vp.glsl
    R code/rend2/glsl/down4x_fp.glsl
    R code/rend2/glsl/down4x_vp.glsl
    R code/rend2/glsl/fogpass_fp.glsl
    R code/rend2/glsl/fogpass_vp.glsl
    R code/rend2/glsl/generic_fp.glsl
    R code/rend2/glsl/generic_vp.glsl
    R code/rend2/glsl/lightall_fp.glsl
    R code/rend2/glsl/lightall_vp.glsl
    R code/rend2/glsl/pshadow_fp.glsl
    R code/rend2/glsl/pshadow_vp.glsl
    R code/rend2/glsl/shadowfill_fp.glsl
    R code/rend2/glsl/shadowfill_vp.glsl
    R code/rend2/glsl/shadowmask_fp.glsl
    R code/rend2/glsl/shadowmask_vp.glsl
    R code/rend2/glsl/ssao_fp.glsl
    R code/rend2/glsl/ssao_vp.glsl
    R code/rend2/glsl/texturecolor_fp.glsl
    R code/rend2/glsl/texturecolor_vp.glsl
    R code/rend2/glsl/tonemap_fp.glsl
    R code/rend2/glsl/tonemap_vp.glsl
    R code/rend2/qgl.h
    R code/rend2/tr_animation.c
    R code/rend2/tr_backend.c
    R code/rend2/tr_bsp.c
    R code/rend2/tr_cmds.c
    R code/rend2/tr_curve.c
    R code/rend2/tr_extensions.c
    R code/rend2/tr_extramath.c
    R code/rend2/tr_extramath.h
    R code/rend2/tr_extratypes.h
    R code/rend2/tr_fbo.c
    R code/rend2/tr_fbo.h
    R code/rend2/tr_flares.c
    R code/rend2/tr_font.c
    R code/rend2/tr_glsl.c
    R code/rend2/tr_image.c
    R code/rend2/tr_image_bmp.c
    R code/rend2/tr_image_jpg.c
    R code/rend2/tr_image_pcx.c
    R code/rend2/tr_image_png.c
    R code/rend2/tr_image_tga.c
    R code/rend2/tr_init.c
    R code/rend2/tr_light.c
    R code/rend2/tr_local.h
    R code/rend2/tr_main.c
    R code/rend2/tr_marks.c
    R code/rend2/tr_mesh.c
    R code/rend2/tr_model.c
    R code/rend2/tr_model_iqm.c
    R code/rend2/tr_noise.c
    R code/rend2/tr_postprocess.c
    R code/rend2/tr_postprocess.h
    R code/rend2/tr_scene.c
    R code/rend2/tr_shade.c
    R code/rend2/tr_shade_calc.c
    R code/rend2/tr_shader.c
    R code/rend2/tr_shadows.c
    R code/rend2/tr_sky.c
    R code/rend2/tr_subs.c
    R code/rend2/tr_surface.c
    R code/rend2/tr_vbo.c
    R code/rend2/tr_world.c
    R code/renderer/iqm.h
    R code/renderer/qgl.h
    R code/renderer/tr_animation.c
    R code/renderer/tr_backend.c
    R code/renderer/tr_bsp.c
    R code/renderer/tr_cmds.c
    R code/renderer/tr_curve.c
    R code/renderer/tr_flares.c
    R code/renderer/tr_font.c
    R code/renderer/tr_image.c
    R code/renderer/tr_image_bmp.c
    R code/renderer/tr_image_jpg.c
    R code/renderer/tr_image_pcx.c
    R code/renderer/tr_image_png.c
    R code/renderer/tr_image_tga.c
    R code/renderer/tr_init.c
    R code/renderer/tr_light.c
    R code/renderer/tr_local.h
    R code/renderer/tr_main.c
    R code/renderer/tr_marks.c
    R code/renderer/tr_mesh.c
    R code/renderer/tr_model.c
    R code/renderer/tr_model_iqm.c
    R code/renderer/tr_noise.c
    R code/renderer/tr_public.h
    R code/renderer/tr_scene.c
    R code/renderer/tr_shade.c
    R code/renderer/tr_shade_calc.c
    R code/renderer/tr_shader.c
    R code/renderer/tr_shadows.c
    R code/renderer/tr_sky.c
    R code/renderer/tr_subs.c
    R code/renderer/tr_surface.c
    R code/renderer/tr_types.h
    R code/renderer/tr_world.c
    A code/renderercommon/iqm.h
    A code/renderercommon/qgl.h
    A code/renderercommon/tr_common.h
    A code/renderercommon/tr_font.c
    A code/renderercommon/tr_image_bmp.c
    A code/renderercommon/tr_image_jpg.c
    A code/renderercommon/tr_image_pcx.c
    A code/renderercommon/tr_image_png.c
    A code/renderercommon/tr_image_tga.c
    A code/renderercommon/tr_noise.c
    A code/renderercommon/tr_public.h
    A code/renderercommon/tr_types.h
    A code/renderergl1/tr_animation.c
    A code/renderergl1/tr_backend.c
    A code/renderergl1/tr_bsp.c
    A code/renderergl1/tr_cmds.c
    A code/renderergl1/tr_curve.c
    A code/renderergl1/tr_flares.c
    A code/renderergl1/tr_image.c
    A code/renderergl1/tr_init.c
    A code/renderergl1/tr_light.c
    A code/renderergl1/tr_local.h
    A code/renderergl1/tr_main.c
    A code/renderergl1/tr_marks.c
    A code/renderergl1/tr_mesh.c
    A code/renderergl1/tr_model.c
    A code/renderergl1/tr_model_iqm.c
    A code/renderergl1/tr_scene.c
    A code/renderergl1/tr_shade.c
    A code/renderergl1/tr_shade_calc.c
    A code/renderergl1/tr_shader.c
    A code/renderergl1/tr_shadows.c
    A code/renderergl1/tr_sky.c
    A code/renderergl1/tr_subs.c
    A code/renderergl1/tr_surface.c
    A code/renderergl1/tr_world.c
    A code/renderergl2/glsl/bokeh_fp.glsl
    A code/renderergl2/glsl/bokeh_vp.glsl
    A code/renderergl2/glsl/calclevels4x_fp.glsl
    A code/renderergl2/glsl/calclevels4x_vp.glsl
    A code/renderergl2/glsl/depthblur_fp.glsl
    A code/renderergl2/glsl/depthblur_vp.glsl
    A code/renderergl2/glsl/dlight_fp.glsl
    A code/renderergl2/glsl/dlight_vp.glsl
    A code/renderergl2/glsl/down4x_fp.glsl
    A code/renderergl2/glsl/down4x_vp.glsl
    A code/renderergl2/glsl/fogpass_fp.glsl
    A code/renderergl2/glsl/fogpass_vp.glsl
    A code/renderergl2/glsl/generic_fp.glsl
    A code/renderergl2/glsl/generic_vp.glsl
    A code/renderergl2/glsl/lightall_fp.glsl
    A code/renderergl2/glsl/lightall_vp.glsl
    A code/renderergl2/glsl/pshadow_fp.glsl
    A code/renderergl2/glsl/pshadow_vp.glsl
    A code/renderergl2/glsl/shadowfill_fp.glsl
    A code/renderergl2/glsl/shadowfill_vp.glsl
    A code/renderergl2/glsl/shadowmask_fp.glsl
    A code/renderergl2/glsl/shadowmask_vp.glsl
    A code/renderergl2/glsl/ssao_fp.glsl
    A code/renderergl2/glsl/ssao_vp.glsl
    A code/renderergl2/glsl/texturecolor_fp.glsl
    A code/renderergl2/glsl/texturecolor_vp.glsl
    A code/renderergl2/glsl/tonemap_fp.glsl
    A code/renderergl2/glsl/tonemap_vp.glsl
    A code/renderergl2/tr_animation.c
    A code/renderergl2/tr_backend.c
    A code/renderergl2/tr_bsp.c
    A code/renderergl2/tr_cmds.c
    A code/renderergl2/tr_curve.c
    A code/renderergl2/tr_extensions.c
    A code/renderergl2/tr_extramath.c
    A code/renderergl2/tr_extramath.h
    A code/renderergl2/tr_extratypes.h
    A code/renderergl2/tr_fbo.c
    A code/renderergl2/tr_fbo.h
    A code/renderergl2/tr_flares.c
    A code/renderergl2/tr_glsl.c
    A code/renderergl2/tr_image.c
    A code/renderergl2/tr_init.c
    A code/renderergl2/tr_light.c
    A code/renderergl2/tr_local.h
    A code/renderergl2/tr_main.c
    A code/renderergl2/tr_marks.c
    A code/renderergl2/tr_mesh.c
    A code/renderergl2/tr_model.c
    A code/renderergl2/tr_model_iqm.c
    A code/renderergl2/tr_postprocess.c
    A code/renderergl2/tr_postprocess.h
    A code/renderergl2/tr_scene.c
    A code/renderergl2/tr_shade.c
    A code/renderergl2/tr_shade_calc.c
    A code/renderergl2/tr_shader.c
    A code/renderergl2/tr_shadows.c
    A code/renderergl2/tr_sky.c
    A code/renderergl2/tr_subs.c
    A code/renderergl2/tr_surface.c
    A code/renderergl2/tr_vbo.c
    A code/renderergl2/tr_world.c
    M code/sdl/sdl_gamma.c
    M code/sdl/sdl_glimp.c
    M code/server/server.h
    M code/server/sv_init.c
    M code/server/sv_snapshot.c
    M code/sys/sys_unix.c
    M code/sys/sys_win32.c
    M code/tools/lcc/lburg/gram.c
    M code/ui/ui_local.h
    M code/ui/ui_main.c
    M code/ui/ui_shared.c
    M code/ui/ui_shared.h
    R cross-make-mingw.sh
    R cross-make-mingw64.sh
    A jenkins-ci-build.sh
    M make-macosx-ub.sh
    M make-macosx.sh
    M misc/msvc/ioq3.sln
    M misc/msvc/opengl1.vcproj
    A misc/msvc/opengl2.vcproj
    R misc/msvc/rend2.vcproj
    M misc/nsis/ioquake3.nsi.in
    M misc/setup/doit
    A opengl2-readme.txt
    R rend2-readme.txt
    A travis-ci-build.sh

  Log Message:
  -----------
  Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest


  Commit: 28e14c4546cb6a23c7984d5ea24f79c409f588cd
      https://github.com/ioquake/ioq3/commit/28e14c4546cb6a23c7984d5ea24f79c409f588cd
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/glsl/lightall_vp.glsl
    M code/renderergl2/glsl/shadowmask_fp.glsl
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shader.c

  Log Message:
  -----------
  Add sunlight/lightmap merging by multiply (r_sunlightMode 1)
Merge additive sunlight and map lighting into one GLSL shader (r_sunlightMode 2)
Change single lightmap blends to use lightall


  Commit: 6a763f0671b7d2e2ce29f056577b23cfc9322146
      https://github.com/ioquake/ioq3/commit/6a763f0671b7d2e2ce29f056577b23cfc9322146
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M Makefile
    M code/botlib/be_aas_reach.c
    M code/botlib/be_aas_route.c
    M code/botlib/be_ai_chat.c
    M code/botlib/be_ai_weap.c
    M code/botlib/be_ai_weight.c
    M code/botlib/l_precomp.c
    M code/client/cl_console.c
    M code/client/snd_adpcm.c
    M code/client/snd_dma.c
    M code/client/snd_mix.c
    M code/client/snd_openal.c
    M code/client/snd_wavelet.c
    M code/qcommon/cm_polylib.c
    M code/qcommon/cm_trace.c
    M code/qcommon/common.c
    M code/qcommon/files.c
    M code/qcommon/huffman.c
    M code/qcommon/unzip.c
    M code/renderercommon/tr_image_bmp.c
    M code/renderercommon/tr_image_png.c
    M code/renderercommon/tr_image_tga.c
    M code/renderergl1/tr_backend.c
    M code/renderergl1/tr_image.c
    M code/renderergl1/tr_main.c
    M code/renderergl1/tr_marks.c
    M code/renderergl1/tr_shader.c
    M code/renderergl1/tr_world.c
    M code/renderergl2/tr_backend.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_marks.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_world.c

  Log Message:
  -----------
  Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest


Compare: https://github.com/ioquake/ioq3/compare/efaa87de10d3...6a763f0671b7


More information about the quake3-commits mailing list