[quake3-commits] [ioquake/ioq3] cc4005: Add vorbis 1.3.4 build support

Mon Mar 24 19:00:23 EDT 2014

  Branch: refs/heads/sdl2
  Home:   https://github.com/ioquake/ioq3
  Commit: cc40051839cec009cae15dc2a48647eb7d14f74e
      https://github.com/ioquake/ioq3/commit/cc40051839cec009cae15dc2a48647eb7d14f74e
  Author: hairball <xhairball at gmail.com>
  Date:   2014-02-08 (Sat, 08 Feb 2014)

  Changed paths:
    M Makefile
    A code/libvorbis-1.3.4/include/vorbis/codec.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisenc.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisfile.h
    A code/libvorbis-1.3.4/lib/analysis.c
    A code/libvorbis-1.3.4/lib/backends.h
    A code/libvorbis-1.3.4/lib/bitrate.c
    A code/libvorbis-1.3.4/lib/bitrate.h
    A code/libvorbis-1.3.4/lib/block.c
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_51.h
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_stereo.h
    A code/libvorbis-1.3.4/lib/books/floor/floor_books.h
    A code/libvorbis-1.3.4/lib/books/uncoupled/res_books_uncoupled.h
    A code/libvorbis-1.3.4/lib/codebook.c
    A code/libvorbis-1.3.4/lib/codebook.h
    A code/libvorbis-1.3.4/lib/codec_internal.h
    A code/libvorbis-1.3.4/lib/envelope.c
    A code/libvorbis-1.3.4/lib/envelope.h
    A code/libvorbis-1.3.4/lib/floor0.c
    A code/libvorbis-1.3.4/lib/floor1.c
    A code/libvorbis-1.3.4/lib/highlevel.h
    A code/libvorbis-1.3.4/lib/info.c
    A code/libvorbis-1.3.4/lib/lookup.c
    A code/libvorbis-1.3.4/lib/lookup.h
    A code/libvorbis-1.3.4/lib/lookup_data.h
    A code/libvorbis-1.3.4/lib/lpc.c
    A code/libvorbis-1.3.4/lib/lpc.h
    A code/libvorbis-1.3.4/lib/lsp.c
    A code/libvorbis-1.3.4/lib/lsp.h
    A code/libvorbis-1.3.4/lib/mapping0.c
    A code/libvorbis-1.3.4/lib/masking.h
    A code/libvorbis-1.3.4/lib/mdct.c
    A code/libvorbis-1.3.4/lib/mdct.h
    A code/libvorbis-1.3.4/lib/misc.h
    A code/libvorbis-1.3.4/lib/modes/floor_all.h
    A code/libvorbis-1.3.4/lib/modes/psych_11.h
    A code/libvorbis-1.3.4/lib/modes/psych_16.h
    A code/libvorbis-1.3.4/lib/modes/psych_44.h
    A code/libvorbis-1.3.4/lib/modes/psych_8.h
    A code/libvorbis-1.3.4/lib/modes/residue_16.h
    A code/libvorbis-1.3.4/lib/modes/residue_44.h
    A code/libvorbis-1.3.4/lib/modes/residue_44p51.h
    A code/libvorbis-1.3.4/lib/modes/residue_44u.h
    A code/libvorbis-1.3.4/lib/modes/residue_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_11.h
    A code/libvorbis-1.3.4/lib/modes/setup_16.h
    A code/libvorbis-1.3.4/lib/modes/setup_22.h
    A code/libvorbis-1.3.4/lib/modes/setup_32.h
    A code/libvorbis-1.3.4/lib/modes/setup_44.h
    A code/libvorbis-1.3.4/lib/modes/setup_44p51.h
    A code/libvorbis-1.3.4/lib/modes/setup_44u.h
    A code/libvorbis-1.3.4/lib/modes/setup_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_X.h
    A code/libvorbis-1.3.4/lib/os.h
    A code/libvorbis-1.3.4/lib/psy.c
    A code/libvorbis-1.3.4/lib/psy.h
    A code/libvorbis-1.3.4/lib/registry.c
    A code/libvorbis-1.3.4/lib/registry.h
    A code/libvorbis-1.3.4/lib/res0.c
    A code/libvorbis-1.3.4/lib/scales.h
    A code/libvorbis-1.3.4/lib/sharedbook.c
    A code/libvorbis-1.3.4/lib/smallft.c
    A code/libvorbis-1.3.4/lib/smallft.h
    A code/libvorbis-1.3.4/lib/synthesis.c
    A code/libvorbis-1.3.4/lib/vorbisenc.c
    A code/libvorbis-1.3.4/lib/vorbisfile.c
    A code/libvorbis-1.3.4/lib/window.c
    A code/libvorbis-1.3.4/lib/window.h

  Log Message:
  -----------
  Add vorbis 1.3.4 build support

  Commit: 31d8f954276ad9b252e6b6f2ac96371f01519d2b
      https://github.com/ioquake/ioq3/commit/31d8f954276ad9b252e6b6f2ac96371f01519d2b
  Author: hairball <xhairball at gmail.com>
  Date:   2014-02-08 (Sat, 08 Feb 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Remove unnecessary NEED_VORBIS since you have USE_CODEC_VORBIS

Thanks zturtleman for catching this

  Commit: 94e36c288c6ce6b5273055e61077c29e81fbd2bf
      https://github.com/ioquake/ioq3/commit/94e36c288c6ce6b5273055e61077c29e81fbd2bf
  Author: MAN-AT-ARMS <donny at ecgnetwork.com>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M code/server/sv_ccmds.c

  Log Message:
  -----------
  Fix colored name padding and allow IPv6 address to fit in output of
'status' command

  Commit: 8661e0509b2a0fa27736dadeae5fba697d16a64e
      https://github.com/ioquake/ioq3/commit/8661e0509b2a0fa27736dadeae5fba697d16a64e
  Author: MAN-AT-ARMS <donny at ecgnetwork.com>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M code/sys/sys_main.c

  Log Message:
  -----------
  Release netowrk bindings on shutdown

  Commit: 5e1011bf700f02c2eb0f076b3962611773064c9a
      https://github.com/ioquake/ioq3/commit/5e1011bf700f02c2eb0f076b3962611773064c9a
  Author: MAN-AT-ARMS <donny at ecgnetwork.com>
  Date:   2014-03-09 (Sun, 09 Mar 2014)

  Changed paths:
    M Makefile
    M code/SDL12/include/SDL_config.h
    A code/SDL12/include/SDL_config.h.default
    A code/SDL12/include/SDL_config.h.in
    R code/SDL12/include/SDL_config_amiga.h
    M code/SDL12/include/SDL_config_minimal.h
    A code/SDL12/include/doxyfile
    M code/libs/macosx/libSDL-1.2.0.dylib
    M code/libs/macosx/libSDLmain.a
    A code/libs/win32/SDL.dll
    R code/libs/win32/SDL.lib
    R code/libs/win32/SDLmain.lib
    A code/libs/win32/libSDL.a
    M code/libs/win32/libSDL.dll.a
    R code/libs/win32/libSDL.la
    M code/libs/win32/libSDLmain.a
    R code/libs/win64/SDL.lib
    A code/libs/win64/SDL64.dll
    R code/libs/win64/SDLmain.lib
    A code/libs/win64/libSDL64.a
    M code/libs/win64/libSDL64.dll.a
    A code/libs/win64/libSDL64main.a
    R code/libs/win64/libSDLmain.a

  Log Message:
  -----------
  Update SDL 1.2.15 to Revision 8040

  Commit: b98e6d5cc07ceffd0e1068ee1ba887b61eef3c8e
      https://github.com/ioquake/ioq3/commit/b98e6d5cc07ceffd0e1068ee1ba887b61eef3c8e
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M code/renderergl2/tr_bsp.c

  Log Message:
  -----------
  Fix error handling in R_ParseSpawnVars

When R_GetEntityToken returns qfalse it resets pointer for parsing, by
R_ParseSpawnVars not returning qfalse it could cause an infinite loop.

Also add newlines to printfs.

  Commit: 5a3e10d716cd6ff3d47256142b0a1d162ae54311
      https://github.com/ioquake/ioq3/commit/5a3e10d716cd6ff3d47256142b0a1d162ae54311
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M code/renderergl2/tr_main.c

  Log Message:
  -----------
  Don't say cubemap is outside lightgrid 6 times

  Commit: c8c7bb1dc3562723473e2eabaca30e7a9e0ecb28
      https://github.com/ioquake/ioq3/commit/c8c7bb1dc3562723473e2eabaca30e7a9e0ecb28
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M code/renderergl1/tr_bsp.c
    M code/renderergl2/tr_bsp.c

  Log Message:
  -----------
  Fix R_GetEntityToken ending prematurely

If spawn var key or value is "" it caused R_GetEntityToken (available to
cgame, used by opengl2) to stop parsing, whereas game VM would continue.

Changed it to match parsing used for game VM
(see G_GET_ENTITY_TOKEN in code/server/sv_game.c).

The map poq3dm5 has a "wait" key with value "".

  Commit: 07290a7d5205bc267ba7c1b30a2c93c9afdceee8
      https://github.com/ioquake/ioq3/commit/07290a7d5205bc267ba7c1b30a2c93c9afdceee8
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M code/renderergl1/tr_shader.c
    M code/renderergl2/tr_shader.c

  Log Message:
  -----------
  Fix typo in animMap and videoMap warnings

  Commit: 63d1911c18ea2f814da19cec7d89fe4439be6f90
      https://github.com/ioquake/ioq3/commit/63d1911c18ea2f814da19cec7d89fe4439be6f90
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M code/renderergl1/tr_shader.c

  Log Message:
  -----------
  Parse q3map_sunExt in OpenGL1 too

Used for drawing sun, which is supported by both OpenGL1 and OpenGL2.
OpenGL2 already parses it.

  Commit: a167110f43c7c606c24aacb68d63240f2ee9fe66
      https://github.com/ioquake/ioq3/commit/a167110f43c7c606c24aacb68d63240f2ee9fe66
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M code/client/snd_mix.c

  Log Message:
  -----------
  Don't mix sfx with NULL soundData

Caused a crash. Already done for looping sounds.

  Commit: 0e6632f464c08dcb76f26a52f33d97228e64fda1
      https://github.com/ioquake/ioq3/commit/0e6632f464c08dcb76f26a52f33d97228e64fda1
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M code/client/snd_mem.c

  Log Message:
  -----------
  DMA 44100Hz needs more memory for sound buffers

It doubles the size of the data compared to the default (22050),
so increase the buffer automatically. Likewise, decreasing speed
doesn't need as much (though that doesn't really matter).

  Commit: baca82d64e86c276b16694cc9230002774007fce
      https://github.com/ioquake/ioq3/commit/baca82d64e86c276b16694cc9230002774007fce
  Author: Tequila <tequila at smokin-guns.org>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M code/cgame/cg_effects.c
    M code/cgame/cg_localents.c
    M code/cgame/cg_players.c
    M code/cgame/cg_playerstate.c
    M code/cgame/cg_view.c
    M code/cgame/cg_weapons.c
    M code/client/snd_openal.c
    M code/game/ai_main.c
    M code/game/bg_pmove.c
    M code/game/g_client.c
    M code/game/g_cmds.c
    M code/game/g_combat.c
    M code/game/g_items.c
    M code/qcommon/common.c
    M code/qcommon/q_shared.h
    M code/renderercommon/tr_types.h
    M code/renderergl1/tr_bsp.c

  Log Message:
  -----------
  Bunch of comment fixes

  Commit: d0d18838951ee6354d43400c03d71e2c5e40a47e
      https://github.com/ioquake/ioq3/commit/d0d18838951ee6354d43400c03d71e2c5e40a47e
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M code/cgame/cg_effects.c
    M code/cgame/cg_localents.c
    M code/cgame/cg_players.c
    M code/cgame/cg_playerstate.c
    M code/cgame/cg_view.c
    M code/cgame/cg_weapons.c
    M code/client/snd_openal.c
    M code/game/ai_main.c
    M code/game/bg_pmove.c
    M code/game/g_client.c
    M code/game/g_cmds.c
    M code/game/g_combat.c
    M code/game/g_items.c
    M code/qcommon/common.c
    M code/qcommon/q_shared.h
    M code/renderercommon/tr_types.h
    M code/renderergl1/tr_bsp.c

  Log Message:
  -----------
  Merge pull request #60 from smokin-guns/master

Bunch of comment fixes

  Commit: 375f6247d4faf4a2a4d14885213d1cf7516b453d
      https://github.com/ioquake/ioq3/commit/375f6247d4faf4a2a4d14885213d1cf7516b453d
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_shade.c

  Log Message:
  -----------
  OpenGL2: Parallax corrected cubemap (cheaper trick)

  Commit: 0861d3c58352af59376b1a31b362b4371fd02ecd
      https://github.com/ioquake/ioq3/commit/0861d3c58352af59376b1a31b362b4371fd02ecd
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    M code/client/snd_mem.c

  Log Message:
  -----------
  Revert "DMA 44100Hz needs more memory for sound buffers"

This reverts commit 0e6632f464c08dcb76f26a52f33d97228e64fda1.

Cause crashes if com_soundMegs is 32.

  Commit: 67d9ecd0704f661a6d0cffa2b9cf0a6ddaeaec3a
      https://github.com/ioquake/ioq3/commit/67d9ecd0704f661a6d0cffa2b9cf0a6ddaeaec3a
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M code/qcommon/files.c

  Log Message:
  -----------
  Fix FS_FOpenFileReadDir non-zero file handle when file not found in pk3

If a pk3 search path is passed to FS_FOpenFileReadDir, a non-zero
file handle is returned if file is not found. This causes incorrect
behavior in FS_ReadFileDir (when a pk3 search path is passed in)
which only checks file handle, not length, for seeing if file exists.

I don't know of any issues in ioq3 caused by this.

  Commit: b099255748edaec547242e7f165c4016a8bad69b
      https://github.com/ioquake/ioq3/commit/b099255748edaec547242e7f165c4016a8bad69b
  Author: SmileTheory <SmileTheory at gmail.com>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_world.c

  Log Message:
  -----------
  #6095: OpenGL2: Use areamask and leaf cluster for PVS when VIS is missing.

  Commit: 9027365be6dd6a6b046353bc4126c79a1465d9b9
      https://github.com/ioquake/ioq3/commit/9027365be6dd6a6b046353bc4126c79a1465d9b9
  Author: Tim Angus <tim at ngus.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M Makefile
    M code/SDL12/include/SDL_config.h
    A code/SDL12/include/SDL_config.h.default
    A code/SDL12/include/SDL_config.h.in
    R code/SDL12/include/SDL_config_amiga.h
    M code/SDL12/include/SDL_config_minimal.h
    A code/SDL12/include/doxyfile
    M code/libs/macosx/libSDL-1.2.0.dylib
    M code/libs/macosx/libSDLmain.a
    A code/libs/win32/SDL.dll
    R code/libs/win32/SDL.lib
    R code/libs/win32/SDLmain.lib
    A code/libs/win32/libSDL.a
    M code/libs/win32/libSDL.dll.a
    R code/libs/win32/libSDL.la
    M code/libs/win32/libSDLmain.a
    R code/libs/win64/SDL.lib
    A code/libs/win64/SDL64.dll
    R code/libs/win64/SDLmain.lib
    A code/libs/win64/libSDL64.a
    M code/libs/win64/libSDL64.dll.a
    A code/libs/win64/libSDL64main.a
    R code/libs/win64/libSDLmain.a

  Log Message:
  -----------
  Merge pull request #59 from MAN-AT-ARMS/sdl_1215_hg

Update SDL 1.2.15 to Revision 8040

  Commit: 2393c8f44fa8b49887145e5d42e4df7c10fe5749
      https://github.com/ioquake/ioq3/commit/2393c8f44fa8b49887145e5d42e4df7c10fe5749
  Author: Tim Angus <tim at ngus.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/server/sv_ccmds.c

  Log Message:
  -----------
  Merge pull request #55 from MAN-AT-ARMS/status_command

Fix colored name padding and allow IPv6 address to fit in output of 'status' command

  Commit: 1cbb5e9771138a1903e9c63c4d9c1fc8a3ef56ad
      https://github.com/ioquake/ioq3/commit/1cbb5e9771138a1903e9c63c4d9c1fc8a3ef56ad
  Author: Tim Angus <tim at ngus.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M Makefile
    A code/libvorbis-1.3.4/include/vorbis/codec.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisenc.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisfile.h
    A code/libvorbis-1.3.4/lib/analysis.c
    A code/libvorbis-1.3.4/lib/backends.h
    A code/libvorbis-1.3.4/lib/bitrate.c
    A code/libvorbis-1.3.4/lib/bitrate.h
    A code/libvorbis-1.3.4/lib/block.c
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_51.h
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_stereo.h
    A code/libvorbis-1.3.4/lib/books/floor/floor_books.h
    A code/libvorbis-1.3.4/lib/books/uncoupled/res_books_uncoupled.h
    A code/libvorbis-1.3.4/lib/codebook.c
    A code/libvorbis-1.3.4/lib/codebook.h
    A code/libvorbis-1.3.4/lib/codec_internal.h
    A code/libvorbis-1.3.4/lib/envelope.c
    A code/libvorbis-1.3.4/lib/envelope.h
    A code/libvorbis-1.3.4/lib/floor0.c
    A code/libvorbis-1.3.4/lib/floor1.c
    A code/libvorbis-1.3.4/lib/highlevel.h
    A code/libvorbis-1.3.4/lib/info.c
    A code/libvorbis-1.3.4/lib/lookup.c
    A code/libvorbis-1.3.4/lib/lookup.h
    A code/libvorbis-1.3.4/lib/lookup_data.h
    A code/libvorbis-1.3.4/lib/lpc.c
    A code/libvorbis-1.3.4/lib/lpc.h
    A code/libvorbis-1.3.4/lib/lsp.c
    A code/libvorbis-1.3.4/lib/lsp.h
    A code/libvorbis-1.3.4/lib/mapping0.c
    A code/libvorbis-1.3.4/lib/masking.h
    A code/libvorbis-1.3.4/lib/mdct.c
    A code/libvorbis-1.3.4/lib/mdct.h
    A code/libvorbis-1.3.4/lib/misc.h
    A code/libvorbis-1.3.4/lib/modes/floor_all.h
    A code/libvorbis-1.3.4/lib/modes/psych_11.h
    A code/libvorbis-1.3.4/lib/modes/psych_16.h
    A code/libvorbis-1.3.4/lib/modes/psych_44.h
    A code/libvorbis-1.3.4/lib/modes/psych_8.h
    A code/libvorbis-1.3.4/lib/modes/residue_16.h
    A code/libvorbis-1.3.4/lib/modes/residue_44.h
    A code/libvorbis-1.3.4/lib/modes/residue_44p51.h
    A code/libvorbis-1.3.4/lib/modes/residue_44u.h
    A code/libvorbis-1.3.4/lib/modes/residue_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_11.h
    A code/libvorbis-1.3.4/lib/modes/setup_16.h
    A code/libvorbis-1.3.4/lib/modes/setup_22.h
    A code/libvorbis-1.3.4/lib/modes/setup_32.h
    A code/libvorbis-1.3.4/lib/modes/setup_44.h
    A code/libvorbis-1.3.4/lib/modes/setup_44p51.h
    A code/libvorbis-1.3.4/lib/modes/setup_44u.h
    A code/libvorbis-1.3.4/lib/modes/setup_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_X.h
    A code/libvorbis-1.3.4/lib/os.h
    A code/libvorbis-1.3.4/lib/psy.c
    A code/libvorbis-1.3.4/lib/psy.h
    A code/libvorbis-1.3.4/lib/registry.c
    A code/libvorbis-1.3.4/lib/registry.h
    A code/libvorbis-1.3.4/lib/res0.c
    A code/libvorbis-1.3.4/lib/scales.h
    A code/libvorbis-1.3.4/lib/sharedbook.c
    A code/libvorbis-1.3.4/lib/smallft.c
    A code/libvorbis-1.3.4/lib/smallft.h
    A code/libvorbis-1.3.4/lib/synthesis.c
    A code/libvorbis-1.3.4/lib/vorbisenc.c
    A code/libvorbis-1.3.4/lib/vorbisfile.c
    A code/libvorbis-1.3.4/lib/window.c
    A code/libvorbis-1.3.4/lib/window.h

  Log Message:
  -----------
  Merge pull request #44 from xhairball/features/add-vorbis-1.3.4

Add vorbis 1.3.4 support

  Commit: 3185ae6b1f3a0c82ccb3fc99ca167805d14d1f43
      https://github.com/ioquake/ioq3/commit/3185ae6b1f3a0c82ccb3fc99ca167805d14d1f43
  Author: Tim Angus <tim at ngus.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/sys/sys_main.c

  Log Message:
  -----------
  Merge pull request #56 from MAN-AT-ARMS/net_stop

Release network bindings on shutdown

  Commit: 9f3fd12501fe3b6e7e3be13c7b3726debedb4faf
      https://github.com/ioquake/ioq3/commit/9f3fd12501fe3b6e7e3be13c7b3726debedb4faf
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/renderergl1/tr_image.c
    M code/renderergl2/tr_image.c

  Log Message:
  -----------
  Remove unused extern qboolean charSet

No variable even exists.

  Commit: cf7d8ef9cfea13cc4ced637f731a87d0d3989de9
      https://github.com/ioquake/ioq3/commit/cf7d8ef9cfea13cc4ced637f731a87d0d3989de9
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Remove -falign-loops and -falign-jumps from Makefile

Clang warns and errors because of them on various platforms.

Based on pull request #43 by @xhairball.

  Commit: 63463d1bcffae247b555afc71c65c472030dd333
      https://github.com/ioquake/ioq3/commit/63463d1bcffae247b555afc71c65c472030dd333
  Author: Tobias Kuehnhammer <kuehnhammertobias at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/game/ai_dmq3.c

  Log Message:
  -----------
  Fix compiling game VM with OBSTACLEDEBUG defined

  Commit: 73aa7ef2c76955495c892b91126a935473cd75be
      https://github.com/ioquake/ioq3/commit/73aa7ef2c76955495c892b91126a935473cd75be
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/cgame/cg_effects.c
    M code/cgame/cg_localents.c
    M code/cgame/cg_players.c
    M code/cgame/cg_playerstate.c
    M code/cgame/cg_view.c
    M code/cgame/cg_weapons.c
    M code/client/snd_mix.c
    M code/client/snd_openal.c
    M code/game/ai_main.c
    M code/game/bg_pmove.c
    M code/game/g_client.c
    M code/game/g_cmds.c
    M code/game/g_combat.c
    M code/game/g_items.c
    M code/qcommon/common.c
    M code/qcommon/files.c
    M code/qcommon/q_shared.h
    M code/renderercommon/tr_types.h
    M code/renderergl1/tr_bsp.c
    M code/renderergl1/tr_shader.c
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_world.c

  Log Message:
  -----------
  Merge branch 'master' (early part) into sdl2

  Commit: 8b06986a9f6d2164d569a6ec3105daf2ef24ea47
      https://github.com/ioquake/ioq3/commit/8b06986a9f6d2164d569a6ec3105daf2ef24ea47
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Log Message:
  -----------
  Skip merging sdl1.2 commit into sdl2

  Commit: c55df2c9aa4eb64943fd9a91fc547a4f562fc9a5
      https://github.com/ioquake/ioq3/commit/c55df2c9aa4eb64943fd9a91fc547a4f562fc9a5
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M Makefile
    M code/game/ai_dmq3.c
    A code/libvorbis-1.3.4/include/vorbis/codec.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisenc.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisfile.h
    A code/libvorbis-1.3.4/lib/analysis.c
    A code/libvorbis-1.3.4/lib/backends.h
    A code/libvorbis-1.3.4/lib/bitrate.c
    A code/libvorbis-1.3.4/lib/bitrate.h
    A code/libvorbis-1.3.4/lib/block.c
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_51.h
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_stereo.h
    A code/libvorbis-1.3.4/lib/books/floor/floor_books.h
    A code/libvorbis-1.3.4/lib/books/uncoupled/res_books_uncoupled.h
    A code/libvorbis-1.3.4/lib/codebook.c
    A code/libvorbis-1.3.4/lib/codebook.h
    A code/libvorbis-1.3.4/lib/codec_internal.h
    A code/libvorbis-1.3.4/lib/envelope.c
    A code/libvorbis-1.3.4/lib/envelope.h
    A code/libvorbis-1.3.4/lib/floor0.c
    A code/libvorbis-1.3.4/lib/floor1.c
    A code/libvorbis-1.3.4/lib/highlevel.h
    A code/libvorbis-1.3.4/lib/info.c
    A code/libvorbis-1.3.4/lib/lookup.c
    A code/libvorbis-1.3.4/lib/lookup.h
    A code/libvorbis-1.3.4/lib/lookup_data.h
    A code/libvorbis-1.3.4/lib/lpc.c
    A code/libvorbis-1.3.4/lib/lpc.h
    A code/libvorbis-1.3.4/lib/lsp.c
    A code/libvorbis-1.3.4/lib/lsp.h
    A code/libvorbis-1.3.4/lib/mapping0.c
    A code/libvorbis-1.3.4/lib/masking.h
    A code/libvorbis-1.3.4/lib/mdct.c
    A code/libvorbis-1.3.4/lib/mdct.h
    A code/libvorbis-1.3.4/lib/misc.h
    A code/libvorbis-1.3.4/lib/modes/floor_all.h
    A code/libvorbis-1.3.4/lib/modes/psych_11.h
    A code/libvorbis-1.3.4/lib/modes/psych_16.h
    A code/libvorbis-1.3.4/lib/modes/psych_44.h
    A code/libvorbis-1.3.4/lib/modes/psych_8.h
    A code/libvorbis-1.3.4/lib/modes/residue_16.h
    A code/libvorbis-1.3.4/lib/modes/residue_44.h
    A code/libvorbis-1.3.4/lib/modes/residue_44p51.h
    A code/libvorbis-1.3.4/lib/modes/residue_44u.h
    A code/libvorbis-1.3.4/lib/modes/residue_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_11.h
    A code/libvorbis-1.3.4/lib/modes/setup_16.h
    A code/libvorbis-1.3.4/lib/modes/setup_22.h
    A code/libvorbis-1.3.4/lib/modes/setup_32.h
    A code/libvorbis-1.3.4/lib/modes/setup_44.h
    A code/libvorbis-1.3.4/lib/modes/setup_44p51.h
    A code/libvorbis-1.3.4/lib/modes/setup_44u.h
    A code/libvorbis-1.3.4/lib/modes/setup_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_X.h
    A code/libvorbis-1.3.4/lib/os.h
    A code/libvorbis-1.3.4/lib/psy.c
    A code/libvorbis-1.3.4/lib/psy.h
    A code/libvorbis-1.3.4/lib/registry.c
    A code/libvorbis-1.3.4/lib/registry.h
    A code/libvorbis-1.3.4/lib/res0.c
    A code/libvorbis-1.3.4/lib/scales.h
    A code/libvorbis-1.3.4/lib/sharedbook.c
    A code/libvorbis-1.3.4/lib/smallft.c
    A code/libvorbis-1.3.4/lib/smallft.h
    A code/libvorbis-1.3.4/lib/synthesis.c
    A code/libvorbis-1.3.4/lib/vorbisenc.c
    A code/libvorbis-1.3.4/lib/vorbisfile.c
    A code/libvorbis-1.3.4/lib/window.c
    A code/libvorbis-1.3.4/lib/window.h
    M code/renderergl1/tr_image.c
    M code/renderergl2/tr_image.c
    M code/server/sv_ccmds.c
    M code/sys/sys_main.c

  Log Message:
  -----------
  Merge branch 'master' into sdl2

Compare: https://github.com/ioquake/ioq3/compare/9f22ae9cb232...c55df2c9aa4e