Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								481cb3cfb0 
								
							 
						 
						
							
							
								
								Remove unnecessary ACSVM files from libs  
							
							 
							
							... 
							
							
							
							C API and Exec are unused, and ACSVM compiles based on what folders are present. 
							
						 
						
							2022-12-27 08:32:13 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								93cdac681b 
								
							 
						 
						
							
							
								
								Keep track of script activators  
							
							 
							
							... 
							
							
							
							Can supply the activating object, line, line side, polyobject, and (added for SRB2) sector. 
							
						 
						
							2022-10-08 05:39:56 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								1d373d2c81 
								
							 
						 
						
							
							
								
								Add ChangeFloor/Ceiling, fix Random  
							
							 
							
							
							
						 
						
							2022-10-07 18:32:05 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								df47a5fe39 
								
							 
						 
						
							
							
								
								Commentate code, add a few more CallFuncs  
							
							 
							
							
							
						 
						
							2022-10-06 02:48:43 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								cb8dddbedc 
								
							 
						 
						
							
							
								
								ACS basic implementation  
							
							 
							
							... 
							
							
							
							- BEHAVIOR lumps successfully load & run from maps. Currently they do not get unloaded between maps, though.
- Print and Timer are the only implemented CallFuncs. All of the base language functions (Delay, etc) are already implemented by the VM though.
- ACS compiler files are included, for use with GDCC. (Picked instead of ACC because it's less ZDoom-centric)
- Additionally, also added the configs for Zone Builder to be able to compile it in editor. Syntax highlighting is very incomplete atm. 
							
						 
						
							2022-10-04 03:23:17 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								26477941ed 
								
							 
						 
						
							
							
								
								Attempt using ACSVM to implement  
							
							 
							
							... 
							
							
							
							It's having trouble linking the dll on Windows currently 
							
						 
						
							2022-10-03 01:23:58 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James R 
								
							 
						 
						
							
							
							
							
								
							
							
								fd3b045f80 
								
							 
						 
						
							
							
								
								Update libs/SDL2 to 2.0.22  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	libs/SDL2/COPYING.txt
#	libs/SDL2/WhatsNew.txt
#	libs/SDL2/docs/README-android.md
#	libs/SDL2/docs/README-linux.md
#	libs/SDL2/i686-w64-mingw32/bin/SDL2.dll
#	libs/SDL2/i686-w64-mingw32/bin/sdl2-config
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_egl.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_endian.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_error.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_events.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_filesystem.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gamecontroller.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gesture.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_haptic.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hints.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_joystick.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keyboard.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keycode.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_loadso.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_log.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_main.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_messagebox.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mouse.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mutex.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_name.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles2.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_pixels.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_platform.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_power.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_quit.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rect.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_render.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_revision.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rwops.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_scancode.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_sensor.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_shape.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_stdinc.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_surface.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_system.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_syswm.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_assert.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_common.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_compare.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_crc32.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_font.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_fuzzer.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_harness.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_images.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_log.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_md5.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_memory.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_random.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_thread.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_timer.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_touch.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_types.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_version.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_video.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_vulkan.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/begin_code.h
#	libs/SDL2/i686-w64-mingw32/include/SDL2/close_code.h
#	libs/SDL2/i686-w64-mingw32/lib/libSDL2.a
#	libs/SDL2/i686-w64-mingw32/lib/libSDL2.dll.a
#	libs/SDL2/i686-w64-mingw32/lib/libSDL2.la
#	libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.a
#	libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.la
#	libs/SDL2/i686-w64-mingw32/lib/libSDL2main.a
#	libs/SDL2/i686-w64-mingw32/lib/libSDL2main.la
#	libs/SDL2/i686-w64-mingw32/lib/pkgconfig/sdl2.pc
#	libs/SDL2/test/Makefile.in
#	libs/SDL2/test/Makefile.os2
#	libs/SDL2/test/checkkeys.c
#	libs/SDL2/test/configure.ac
#	libs/SDL2/test/controllermap.c
#	libs/SDL2/test/loopwave.c
#	libs/SDL2/test/loopwavequeue.c
#	libs/SDL2/test/testatomic.c
#	libs/SDL2/test/testaudiocapture.c
#	libs/SDL2/test/testaudiohotplug.c
#	libs/SDL2/test/testaudioinfo.c
#	libs/SDL2/test/testautomation.c
#	libs/SDL2/test/testbounds.c
#	libs/SDL2/test/testcustomcursor.c
#	libs/SDL2/test/testdisplayinfo.c
#	libs/SDL2/test/testdraw2.c
#	libs/SDL2/test/testdrawchessboard.c
#	libs/SDL2/test/testdropfile.c
#	libs/SDL2/test/testerror.c
#	libs/SDL2/test/testfile.c
#	libs/SDL2/test/testfilesystem.c
#	libs/SDL2/test/testgamecontroller.c
#	libs/SDL2/test/testgesture.c
#	libs/SDL2/test/testgl2.c
#	libs/SDL2/test/testgles.c
#	libs/SDL2/test/testgles2.c
#	libs/SDL2/test/testhotplug.c
#	libs/SDL2/test/testiconv.c
#	libs/SDL2/test/testime.c
#	libs/SDL2/test/testintersections.c
#	libs/SDL2/test/testjoystick.c
#	libs/SDL2/test/testkeys.c
#	libs/SDL2/test/testloadso.c
#	libs/SDL2/test/testlock.c
#	libs/SDL2/test/testmessage.c
#	libs/SDL2/test/testmultiaudio.c
#	libs/SDL2/test/testnative.c
#	libs/SDL2/test/testnative.h
#	libs/SDL2/test/testnativew32.c
#	libs/SDL2/test/testnativex11.c
#	libs/SDL2/test/testoverlay2.c
#	libs/SDL2/test/testplatform.c
#	libs/SDL2/test/testpower.c
#	libs/SDL2/test/testqsort.c
#	libs/SDL2/test/testrelative.c
#	libs/SDL2/test/testrendercopyex.c
#	libs/SDL2/test/testrendertarget.c
#	libs/SDL2/test/testresample.c
#	libs/SDL2/test/testrumble.c
#	libs/SDL2/test/testscale.c
#	libs/SDL2/test/testsem.c
#	libs/SDL2/test/testsensor.c
#	libs/SDL2/test/testshader.c
#	libs/SDL2/test/testshape.c
#	libs/SDL2/test/testsprite2.c
#	libs/SDL2/test/testspriteminimal.c
#	libs/SDL2/test/teststreaming.c
#	libs/SDL2/test/testthread.c
#	libs/SDL2/test/testtimer.c
#	libs/SDL2/test/testver.c
#	libs/SDL2/test/testviewport.c
#	libs/SDL2/test/testvulkan.c
#	libs/SDL2/test/testwm2.c
#	libs/SDL2/test/testyuv.c
#	libs/SDL2/test/testyuv_cvt.c
#	libs/SDL2/test/testyuv_cvt.h
#	libs/SDL2/test/torturethread.c
#	libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll
#	libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_assert.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_atomic.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_audio.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_bits.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_blendmode.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_clipboard.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_config.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_cpuinfo.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_egl.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_endian.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_error.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_events.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_filesystem.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gamecontroller.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gesture.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_haptic.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hints.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_joystick.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keyboard.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keycode.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_loadso.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_log.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_main.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_messagebox.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mouse.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mutex.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_name.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles2.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_pixels.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_platform.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_power.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_quit.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rect.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_render.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_revision.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rwops.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_scancode.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_sensor.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_shape.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_stdinc.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_surface.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_system.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_syswm.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_assert.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_common.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_compare.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_crc32.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_font.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_fuzzer.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_harness.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_images.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_log.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_md5.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_memory.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_random.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_thread.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_timer.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_touch.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_types.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_version.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_video.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_vulkan.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/begin_code.h
#	libs/SDL2/x86_64-w64-mingw32/include/SDL2/close_code.h
#	libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.a
#	libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.dll.a
#	libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.la
#	libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.a
#	libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.la
#	libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.a
#	libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.la
#	libs/SDL2/x86_64-w64-mingw32/lib/pkgconfig/sdl2.pc 
							
						 
						
							2022-09-05 15:13:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eidolon 
								
							 
						 
						
							
							
							
							
								
							
							
								eff3767216 
								
							 
						 
						
							
							
								
								Remove FMOD files  
							
							 
							
							... 
							
							
							
							Aren't used and definitely should not be in here anymore 
							
						 
						
							2022-07-23 12:57:46 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								b5fcd74ef9 
								
							 
						 
						
							
							
								
								Merge master  
							
							 
							
							... 
							
							
							
							Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V 
							
						 
						
							2020-09-25 12:00:50 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								e656a7d92d 
								
							 
						 
						
							
							
								
								Link with exchndl, instead of dynamically loading it.  
							
							 
							
							... 
							
							
							
							It caused problems with crash reports not being made if the current working directory gets changed. Not even recommended anymore per the drmingw readme
https://github.com/jrfonseca/drmingw#exchndl  
							
						 
						
							2020-09-17 15:59:02 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								74bad0e34c 
								
							 
						 
						
							
							
								
								Attempt to improve discord-rpc checking in CMake  
							
							 
							
							... 
							
							
							
							Haven't ever gotten CMake to compile SRB2, so I'm unable to really check if this works 
							
						 
						
							2020-08-23 06:45:35 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								a235062557 
								
							 
						 
						
							
							
								
								Move the .dll's to libs\dll-binaries  
							
							 
							
							
							
						 
						
							2020-08-23 05:58:09 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								a92ec01f43 
								
							 
						 
						
							
							
								
								Update win 32 bit libraries, implement win 64 bit libraries  
							
							 
							
							
							
						 
						
							2020-08-23 05:47:55 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								632df264a3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'public/next' into discord-rpc-support  
							
							 
							
							
							
						 
						
							2020-08-16 20:57:31 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								63917ffccc 
								
							 
						 
						
							
							
								
								The start of the scary 2.2 merge  
							
							 
							
							... 
							
							
							
							All conflicts are left in-tact. We should be collaborating on solving these files one at a time. 
							
						 
						
							2020-05-29 13:43:38 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									wolfs 
								
							 
						 
						
							
							
							
							
								
							
							
								4a264ffba9 
								
							 
						 
						
							
							
								
								Merge branch 'http-downloads' into 'awful-mix'  
							
							 
							
							... 
							
							
							
							Support for http downloads
See merge request SinnamonLat/Kart-Public!1  
							
						 
						
							2020-04-12 21:38:33 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								5e0eca9fe9 
								
							 
						 
						
							
							
								
								Support for http downloads  
							
							 
							
							
							
						 
						
							2020-04-07 18:22:29 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								f80b5cf8c9 
								
							 
						 
						
							
							
								
								Update DLL-README.txt  
							
							 
							
							
							
						 
						
							2019-12-06 13:22:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								c87acdeac1 
								
							 
						 
						
							
							
								
								Fix compiling Mingw binaries on an Unix host  
							
							 
							
							
							
						 
						
							2019-12-05 12:50:14 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								ed33758b5f 
								
							 
						 
						
							
							
								
								Fix building libpng and zlib with MSVC  
							
							 
							
							
							
						 
						
							2019-12-05 12:33:18 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								713935ad88 
								
							 
						 
						
							
							
								
								Someone wants PNGLCONF_H  
							
							 
							
							
							
						 
						
							2019-12-04 13:42:14 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								bbce679a73 
								
							 
						 
						
							
							
								
								Libs: move pngconf.h out of top level libpng source folder  
							
							 
							
							
							
						 
						
							2019-12-04 10:41:54 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								b23877cada 
								
							 
						 
						
							
							
								
								libpng: rebuild 32-bit libpng static lib with GCC 3.4.5  
							
							 
							
							
							
						 
						
							2019-12-02 13:07:12 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								f926e55b37 
								
							 
						 
						
							
							
								
								libs: clean up libpng  
							
							 
							
							
							
						 
						
							2019-12-02 12:29:11 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								9bee40b006 
								
							 
						 
						
							
							
								
								Update ARM/ARM64 arch of SDL to 2.0.10  
							
							 
							
							
							
						 
						
							2019-10-31 16:27:28 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								1f60836eb3 
								
							 
						 
						
							
							
								
								Rebuild libpng and zlib using GCC 4.8.1  
							
							 
							
							... 
							
							
							
							Which should resolve those undefined references errors with libpng.
Rebuilt zlib just to be safe. 
							
						 
						
							2019-10-30 16:10:43 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								77e1c7090f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-34a41977' into 'master'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !435  
							
						 
						
							2019-10-30 10:37:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								bdf425adab 
								
							 
						 
						
							
							
								
								Revert "Revert "Merge branch 'revert-55b91940' into 'master'""  
							
							 
							
							... 
							
							
							
							This reverts commit 34a4197716 
							
						 
						
							2019-10-30 10:09:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								34a4197716 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-55b91940' into 'master'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !434  
							
						 
						
							2019-10-30 09:59:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								2cfa7b307d 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'update-libs' into 'master'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !433  
							
						 
						
							2019-10-30 09:07:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								938ed06173 
								
							 
						 
						
							
							
								
								Update SDL2 to 2.0.10  
							
							 
							
							
							
						 
						
							2019-10-28 22:48:19 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								dddf161dc9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into update-libs  
							
							 
							
							
							
						 
						
							2019-10-27 16:04:56 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								727b5e460b 
								
							 
						 
						
							
							
								
								Update these files that I forgot to update.  
							
							 
							
							... 
							
							
							
							Better than not updating it at all and having a inconsistency between versions reported from the header and internal lib version. 
							
						 
						
							2019-10-14 20:41:37 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								65bc2ef0d6 
								
							 
						 
						
							
							
								
								Fix crash if speed is too high  
							
							 
							
							... 
							
							
							
							Also update libopenmpt 
							
						 
						
							2019-09-27 23:53:19 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jaime Passos 
								
							 
						 
						
							
							
							
							
								
							
							
								6a7454acf7 
								
							 
						 
						
							
							
								
								Read user chunks  
							
							 
							
							
							
						 
						
							2019-09-11 20:18:04 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								5fa4954c02 
								
							 
						 
						
							
							
								
								Update libpng and zlib  
							
							 
							
							
							
						 
						
							2019-08-18 13:21:20 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									toaster 
								
							 
						 
						
							
							
							
							
								
							
							
								534b98251b 
								
							 
						 
						
							
							
								
								Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""  
							
							 
							
							... 
							
							
							
							This reverts commit a76668f55a . 
							
						 
						
							2019-08-04 12:03:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									toaster 
								
							 
						 
						
							
							
							
							
								
							
							
								a76668f55a 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'musicplus-aug2019-b' into 'master'"  
							
							 
							
							... 
							
							
							
							This reverts commit 0f89fb123f , reversing
changes made to 8fb211d8cf . 
							
						 
						
							2019-08-04 11:32:55 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								f7936876be 
								
							 
						 
						
							
							
								
								Merge branch 'master' into musicplus-sdlmixerx  
							
							 
							
							
							
						 
						
							2019-06-29 19:31:01 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								8e5593c207 
								
							 
						 
						
							
							
								
								Merge branch 'public-musicplus-libopenmpt' of  https://git.magicalgirl.moe/STJr/SRB2  into public_libopenmpt  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props 
							
						 
						
							2019-06-11 17:48:00 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Latapostrophe 
								
							 
						 
						
							
							
							
							
								
							
							
								a35cea9243 
								
							 
						 
						
							
							
								
								chaos conflict  
							
							 
							
							
							
						 
						
							2019-06-11 17:02:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								d5c1fe6467 
								
							 
						 
						
							
							
								
								Merge branch 'gme-msvc' into 'master'  
							
							 
							
							... 
							
							
							
							Add GME to MSVC 10 solution
See merge request STJr/SRB2!448  
							
						 
						
							2019-06-07 18:06:51 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								ff040ccced 
								
							 
						 
						
							
							
								
								Update libopenmpt to 0.4.4  
							
							 
							
							
							
						 
						
							2019-05-23 22:05:28 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								2ede6dd29f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into public-musicplus-libopenmpt  
							
							 
							
							
							
						 
						
							2019-05-20 21:33:10 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								65cf8c5da2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into upstream-merge  
							
							 
							
							
							
						 
						
							2019-03-01 11:10:57 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									SeventhSentinel 
								
							 
						 
						
							
							
							
							
								
							
							
								1d58c6b8c2 
								
							 
						 
						
							
							
								
								merge srb2 next  
							
							 
							
							
							
						 
						
							2019-01-05 15:59:23 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Z 
								
							 
						 
						
							
							
							
							
								
							
							
								67d829174e 
								
							 
						 
						
							
							
								
								Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC  
							
							 
							
							
							
						 
						
							2019-01-04 21:18:55 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Z 
								
							 
						 
						
							
							
							
							
								
							
							
								35f8ff191a 
								
							 
						 
						
							
							
								
								Add GME to VC10 SRB2SDL project  
							
							 
							
							
							
						 
						
							2019-01-04 20:43:42 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								281cdb5597 
								
							 
						 
						
							
							
								
								Notes for Ubuntu backporting libopenmpt  
							
							 
							
							
							
						 
						
							2019-01-04 18:43:48 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								deca1a14f6 
								
							 
						 
						
							
							
								
								DLL-README update for libopenmpt  
							
							 
							
							
							
						 
						
							2019-01-03 21:19:00 -05:00