Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								e296e1309a 
								
							 
						 
						
							
							
								
								YAY, round 2  
							
							 
							
							
							
						 
						
							2020-08-09 21:02:56 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								4ab8b07fbc 
								
							 
						 
						
							
							
								
								Merge assets/README.txt  
							
							 
							
							
							
						 
						
							2020-08-06 10:23:22 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sally Coolatta 
								
							 
						 
						
							
							
							
							
								
							
							
								536054b3f0 
								
							 
						 
						
							
							
								
								Merge assets/CMakeLists.txt  
							
							 
							
							
							
						 
						
							2020-08-06 10:23:12 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								502de28d38 
								
							 
						 
						
							
							
								
								CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo  
							
							 
							
							
							
						 
						
							2020-06-08 00:01:15 -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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								4f5694fa14 
								
							 
						 
						
							
							
								
								Enable use of the patch file  
							
							 
							
							
							
						 
						
							2020-02-22 16:42:24 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								126dbc4a82 
								
							 
						 
						
							
							
								
								Deployer fixes for 2.2.0  
							
							 
							
							
							
						 
						
							2019-12-07 13:56:05 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									MascaraSnake 
								
							 
						 
						
							
							
							
							
								
							
							
								c0bc5f7c5a 
								
							 
						 
						
							
							
								
								Minor changes to the readme  
							
							 
							
							
							
						 
						
							2019-12-07 00:11:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sphere 
								
							 
						 
						
							
							
							
							
								
							
							
								a225970360 
								
							 
						 
						
							
							
								
								Use zones.pk3 instead of zones.dta.  
							
							 
							
							
							
						 
						
							2019-09-29 05:31:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								26e34a1fa1 
								
							 
						 
						
							
							
								
								Use maps.pk3  
							
							 
							
							
							
						 
						
							2019-09-16 03:04:26 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								da7e79ac83 
								
							 
						 
						
							
							
								
								Adjust file loading  
							
							 
							
							... 
							
							
							
							Many files converted to pk3, and we now have a distinct IWAD 
							
						 
						
							2019-05-12 20:58:26 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								380bce88a0 
								
							 
						 
						
							
							
								
								remove whitespaces  
							
							 
							
							
							
						 
						
							2019-02-05 15:42:37 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								1f0c7425f9 
								
							 
						 
						
							
							
								
								Add HISTORY.txt to assets; correct default lists for capitalization  
							
							 
							
							
							
						 
						
							2019-01-02 17:31:04 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								a213898fdf 
								
							 
						 
						
							
							
								
								Corrected CMake hashed assets; add kart to assets/gitignore  
							
							 
							
							
							
						 
						
							2019-01-02 17:27:15 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								f25bdead73 
								
							 
						 
						
							
							
								
								Don't download individual asset files; support only archives  
							
							 
							
							
							
						 
						
							2018-12-31 19:11:01 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								a22e5d9a4f 
								
							 
						 
						
							
							
								
								Don't download individual asset files; support only archives  
							
							 
							
							
							
						 
						
							2018-12-31 19:08:27 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								337e0da8e4 
								
							 
						 
						
							
							
								
								Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge]  
							
							 
							
							
							
						 
						
							2018-12-30 15:41:58 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								6e2d757219 
								
							 
						 
						
							
							
								
								Implement deployer scripts for Travis -- OSX and Linux package building  
							
							 
							
							
							
						 
						
							2018-12-30 15:22:50 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								a1bdfb1272 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'srb2public/next' into merge-next  
							
							 
							
							
							
						 
						
							2018-12-03 00:31:23 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sryder 
								
							 
						 
						
							
							
							
							
								
							
							
								7836dce57d 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git  
							
							 
							
							
							
						 
						
							2018-11-29 22:19:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								4507ee18fd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'srb2public/next' into merge-next  
							
							 
							
							
							
						 
						
							2018-11-29 08:49:50 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								e09b1446f4 
								
							 
						 
						
							
							
								
								Add wget to assets deb depends  
							
							 
							
							
							
						 
						
							2018-11-27 18:16:20 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								949bc3694a 
								
							 
						 
						
							
							
								
								Separate asset files from clean step; No more hacky NOCLEAN file  
							
							 
							
							
							
						 
						
							2018-11-27 00:49:07 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								1ca83f728a 
								
							 
						 
						
							
							
								
								Do not clean files before source building  
							
							 
							
							
							
						 
						
							2018-11-27 00:39:34 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								70615ca21b 
								
							 
						 
						
							
							
								
								Don't clean files on Launchpad build  
							
							 
							
							
							
						 
						
							2018-11-26 23:02:02 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								6a87d4dd87 
								
							 
						 
						
							
							
								
								Keep the assets/ files; ignore the assets/debian/tmp files in source packaging  
							
							 
							
							
							
						 
						
							2018-11-26 22:39:22 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								84be3913d0 
								
							 
						 
						
							
							
								
								Only package debian/tmp/[data]/file in asset source package; extra instructions  
							
							 
							
							
							
						 
						
							2018-11-26 22:23:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								efbe1c4ebd 
								
							 
						 
						
							
							
								
								Fixed broken date strings in debian package files; skip asset download if that file already exists  
							
							 
							
							
							
						 
						
							2018-11-26 21:49:25 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								e2a3bd18a1 
								
							 
						 
						
							
							
								
								More debian 2.1.21 tweaks; update some copyright info to STJr  
							
							 
							
							
							
						 
						
							2018-11-26 14:40:59 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								564d736bb6 
								
							 
						 
						
							
							
								
								Add README and LICENSE to cmake install  
							
							 
							
							
							
						 
						
							2018-11-25 08:12:34 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c0581bfc 
								
							 
						 
						
							
							
								
								Finish 3rd party library license file  
							
							 
							
							
							
						 
						
							2018-11-22 23:24:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								4cf48536b9 
								
							 
						 
						
							
							
								
								Add README and LICENSE for installs  
							
							 
							
							
							
						 
						
							2018-11-22 07:41:35 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								2a2d32ec3c 
								
							 
						 
						
							
							
								
								Restore patch.dta, but commented out just in case.  
							
							 
							
							
							
						 
						
							2018-11-19 18:22:11 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								3c871c31f8 
								
							 
						 
						
							
							
								
								Update CMakeLists.txt  
							
							 
							
							
							
						 
						
							2018-11-19 13:55:33 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								48f3c27625 
								
							 
						 
						
							
							
								
								Remove music.dta from loading  
							
							 
							
							... 
							
							
							
							We've replaced/changed out all vanilla songs, so we no longer need it. 
							
						 
						
							2018-11-15 19:17:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								87f767fad0 
								
							 
						 
						
							
							
								
								Add textures.kart, re-define DEVELOP mode,  
							
							 
							
							... 
							
							
							
							Disabling DEVELOP can be another branch; this means this can get in master quicker 
							
						 
						
							2018-11-03 03:17:20 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								c5436ee2e5 
								
							 
						 
						
							
							
								
								Add more hash stuff  
							
							 
							
							... 
							
							
							
							UNFINISHED, still need to add in legitimate hashes for non-CMake builds when we've finalized the content. 
							
						 
						
							2018-10-17 20:30:34 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									TehRealSalt 
								
							 
						 
						
							
							
							
							
								
							
							
								5cf0381286 
								
							 
						 
						
							
							
								
								Closer to done HUD tweaking?  
							
							 
							
							... 
							
							
							
							Splitscreen in Battle is left 
							
						 
						
							2017-12-23 19:14:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mikeyd 
								
							 
						 
						
							
							
							
							
								
							
							
								40dff2c123 
								
							 
						 
						
							
							
								
								missing space for "proper" Debian formatting  
							
							 
							
							
							
						 
						
							2016-02-06 22:00:59 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								f9d23370b6 
								
							 
						 
						
							
							
								
								debian: the data package should be native  
							
							 
							
							
							
						 
						
							2016-02-06 17:10:55 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								bac39b1bc0 
								
							 
						 
						
							
							
								
								debian: untested update for Debian packages  
							
							 
							
							
							
						 
						
							2016-02-06 12:31:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								a713509493 
								
							 
						 
						
							
							
								
								Refactor CMake to allow source grouping and separation of interfaces.  
							
							 
							
							... 
							
							
							
							Core and SDL2 are two separate targets now. Core is a static library
that is linked into SRB2SDL2. The sources for both are separated.
When using an IDE like Visual Studio or Xcode, the source code
organized into groups that explain what that group of sources does.
In the future, "Main" could be split into a few more groups based on
file prefixes, but I think the way it is set up works for now.
Makefile targets are not affected by source_groups and typing `make`
will automatically compile both the "Core" library and SRB2SDL2
itself. 
							
						 
						
							2015-03-08 03:26:54 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								8cccfa558a 
								
							 
						 
						
							
							
								
								do not include anything in assets folder unless forced  
							
							 
							
							
							
						 
						
							2015-02-05 17:04:24 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								68f8a5b0f9 
								
							 
						 
						
							
							
								
								cmake: build bundle and dmg on install/package  
							
							 
							
							
							
						 
						
							2015-01-28 19:29:16 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								0909fce2e3 
								
							 
						 
						
							
							
								
								cmake: Configure source via cmake  
							
							 
							
							... 
							
							
							
							silently fixing a bad malloc here too shhhhhhhhh 
							
						 
						
							2015-01-28 18:03:41 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								53799eb390 
								
							 
						 
						
							
							
								
								cmake: Add CPack Package Generation  
							
							 
							
							... 
							
							
							
							Generates zips only at the moment 
							
						 
						
							2015-01-28 16:42:05 -06:00