Conflicts:
	libs/fmodex/lib/libfmodex64_vc.a
	libs/fmodex/lib/libfmodexL64_vc.a
	libs/fmodex/lib/libfmodexL_vc.a
	libs/fmodex/lib/libfmodex_vc.a

Conflicts:
	libs/fmodex/lib/libfmodex64_vc.a
	libs/fmodex/lib/libfmodexL64_vc.a
	libs/fmodex/lib/libfmodexL_vc.a
	libs/fmodex/lib/libfmodex_vc.a

wolfs authored 10 years ago and Alam Ed Arias committed 10 years ago

Switch the Linux symbolic links with manual copy-pastes, should fix compiling on Windows for most users.

Switch the Linux symbolic links with manual copy-pastes

Switch the Linux symbolic links with manual copy-pastes, should fix compiling on Windows for most users.

Add the Jump Thok ability and water running flag for use by custom characters

Also clean up whitespaces

wolfs authored 10 years ago and Alam Ed Arias committed 10 years ago

I don't know too much about this but I THINK I did it right.

Ensures that the force shield's sprite returns to the proper state after receiving an invincibility monitor.
Fixes http://mb.srb2.org/showthread.php?p=752815

Also, fix the issue pointed out by Alam.

Improved fix by changing the formula for how memory is allocated to arbitrary sample rate conversion.

And fix it on FreeBSD, where _BIG_ENDIAN is not a flag indicating
big endian machine, but a constant to compare _BYTE_ORDER to.