oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							bbdad2a40d 
							
						 
					 
					
						
						
							
							Merge branch '2.7-rc'  
						
						 
						
						... 
						
						
						
						Includes full code reformat.
# Conflicts:
#	src/aomusicplayer.cpp
#	src/path_functions.cpp 
						
					 
					
						2020-05-02 21:29:06 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sD 
							
						 
					 
					
						
						
						
						
							
						
						
							607e70aeba 
							
						 
					 
					
						
						
							
							compress it more  
						
						 
						
						
						
					 
					
						2020-04-18 15:08:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sD 
							
						 
					 
					
						
						
						
						
							
						
						
							f4f441c24c 
							
						 
					 
					
						
						
							
							this and post_build do the same thing  
						
						 
						
						
						
					 
					
						2020-04-18 15:07:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sD 
							
						 
					 
					
						
						
						
						
							
						
						
							1883d4c269 
							
						 
					 
					
						
						
							
							zip it and upload the correct file  
						
						 
						
						
						
					 
					
						2020-04-18 14:33:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							13942345c6 
							
						 
					 
					
						
						
							
							Run clang-format on entire project  
						
						 
						
						... 
						
						
						
						Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style.
Lines reflow at 80 characters. One-line method bodies are on the same
line as the signature. Space always after `//`. No indentation
on preprocessor macros. Includes are sorted lexicographically.
If you don't want to see this commit on blames, use the hidden
whitespace option on GitHub, or use `-w` in git-blame. 
						
					 
					
						2020-04-17 21:57:16 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mac builder 
							
						 
					 
					
						
						
						
						
							
						
						
							5bdb57a8ba 
							
						 
					 
					
						
						
							
							forgot macdeployqt  
						
						 
						
						
						
					 
					
						2019-08-13 19:13:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mac builder 
							
						 
					 
					
						
						
						
						
							
						
						
							172406efa2 
							
						 
					 
					
						
						
							
							post build executable  
						
						 
						
						
						
					 
					
						2019-08-13 18:59:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mac builder 
							
						 
					 
					
						
						
						
						
							
						
						
							3052b53aa4 
							
						 
					 
					
						
						
							
							bruh moment, qmake isn't in path  
						
						 
						
						
						
					 
					
						2019-08-13 18:54:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								windrammer 
							
						 
					 
					
						
						
						
						
							
						
						
							c8b219136e 
							
						 
					 
					
						
						
							
							Add double quotes around ${ROOT_DIR} ( #91 )  
						
						 
						
						... 
						
						
						
						Without this the script fails with ./configure_ubuntu.sh: line 10: cd: too many arguments if there's any space in the patch of the root folder 
						
					 
					
						2019-08-05 09:40:54 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							d71aad9d72 
							
						 
					 
					
						
						
							
							Revert "make default clone compileable to improve new dev experience and switch to qt on linux"  
						
						 
						
						... 
						
						
						
						This reverts commit bf8aad33de . 
						
					 
					
						2019-07-31 22:33:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							bf8aad33de 
							
						 
					 
					
						
						
							
							make default clone compileable to improve new dev experience and switch to qt on linux  
						
						 
						
						
						
					 
					
						2019-07-31 21:50:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							326425f54b 
							
						 
					 
					
						
						
							
							Update configure_ubuntu.sh  
						
						 
						
						
						
					 
					
						2019-07-29 08:14:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							abff73de3c 
							
						 
					 
					
						
						
							
							Ubuntu config gets curl too  
						
						 
						
						... 
						
						
						
						Config now gets curl incase of fresh vm. 
						
					 
					
						2019-07-29 08:11:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c09fdc49a7 
							
						 
					 
					
						
						
							
							CI: Add libarchive for launcher builds  
						
						 
						
						
						
					 
					
						2019-07-27 12:34:18 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ede4c512ae 
							
						 
					 
					
						
						
							
							CI: Fix entry point bug in build artifact  
						
						 
						
						
						
					 
					
						2019-07-27 12:33:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								windrammer 
							
						 
					 
					
						
						
						
						
							
						
						
							16947224a2 
							
						 
					 
					
						
						
							
							Change the shebang of configure_ubuntu.sh from sh to bash  
						
						 
						
						... 
						
						
						
						because the script it's using the bash only variable BASH_SOURCE 
						
					 
					
						2019-07-20 17:30:46 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							f489f2064c 
							
						 
					 
					
						
						
							
							Merge branch 'ci' into 'master'  
						
						 
						
						
						
					 
					
						2019-07-02 21:11:59 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							f2a4ac013d 
							
						 
					 
					
						
						
							
							Mac improvements  
						
						 
						
						... 
						
						
						
						Just modifying build scripts to make it less painful to build and release on Mac
See merge request AttorneyOnline/AO2-Client!64  
						
					 
					
						2019-06-29 00:27:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nnoodle 
							
						 
					 
					
						
						
						
						
							
						
						
							744cf727f0 
							
						 
					 
					
						
						
							
							Use /bin/sh and exit immediately if a command fails.  
						
						 
						
						
						
					 
					
						2019-04-11 11:30:29 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							93b482cbc7 
							
						 
					 
					
						
						
							
							Use --name-status instead of --summary  
						
						 
						
						
						
					 
					
						2019-04-03 23:24:37 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							eae8ed1552 
							
						 
					 
					
						
						
							
							I hate JavaScript sometimes  
						
						 
						
						
						
					 
					
						2019-04-03 23:18:28 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							9b4c18e8dc 
							
						 
					 
					
						
						
							
							Cover rename and deleted directory cases  
						
						 
						
						
						
					 
					
						2019-04-03 22:58:05 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							f4b31356df 
							
						 
					 
					
						
						
							
							Fix typo in getting added/modified files  
						
						 
						
						
						
					 
					
						2019-04-03 17:22:05 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							ed41f3c4e5 
							
						 
					 
					
						
						
							
							Remove S3_MANIFESTS and S3_ARCHIVES  
						
						 
						
						
						
					 
					
						2019-04-03 17:14:44 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							190b0d7c1e 
							
						 
					 
					
						
						
							
							Fix issues parsing deletions file  
						
						 
						
						
						
					 
					
						2019-04-03 17:10:24 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							a5435183e4 
							
						 
					 
					
						
						
							
							Stronger check for array length  
						
						 
						
						
						
					 
					
						2019-04-03 17:04:39 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							bc92942d29 
							
						 
					 
					
						
						
							
							Allow overwriting versions of same name  
						
						 
						
						
						
					 
					
						2019-04-03 16:47:16 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							153c458f9e 
							
						 
					 
					
						
						
							
							Fix type errors during argument parsing  
						
						 
						
						
						
					 
					
						2019-04-03 16:32:10 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							d75cee4996 
							
						 
					 
					
						
						
							
							Fix unbound variable (again)  
						
						 
						
						
						
					 
					
						2019-04-03 16:21:51 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							458eea04d3 
							
						 
					 
					
						
						
							
							Fix unbound variable EXECUTABLE  
						
						 
						
						
						
					 
					
						2019-04-03 16:18:05 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							4561f1809f 
							
						 
					 
					
						
						
							
							Fix some bugs in manifest script  
						
						 
						
						
						
					 
					
						2019-04-03 16:12:31 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							edb3c6b538 
							
						 
					 
					
						
						
							
							Continue work on manifest scripts  
						
						 
						
						
						
					 
					
						2019-04-03 15:28:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							5d0044b93c 
							
						 
					 
					
						
						
							
							Add a bunch of scripts  
						
						 
						
						
						
					 
					
						2019-03-29 21:03:43 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							9a32aa6e84 
							
						 
					 
					
						
						
							
							Add BASSOPUS to all target platforms  
						
						 
						
						
						
					 
					
						2019-02-10 02:45:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							f05c3defcf 
							
						 
					 
					
						
						
							
							Keep fixing issues with the Mac build script  
						
						 
						
						
						
					 
					
						2019-02-10 02:08:48 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							200008fd81 
							
						 
					 
					
						
						
							
							Actually save the discord-rpc zip  
						
						 
						
						
						
					 
					
						2019-02-10 02:00:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							f23d163a27 
							
						 
					 
					
						
						
							
							Okay, let's try this again...  
						
						 
						
						
						
					 
					
						2019-02-10 01:52:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							6261be1dc8 
							
						 
					 
					
						
						
							
							Add Travis script for Mac builds  
						
						 
						
						
						
					 
					
						2019-02-10 01:04:28 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							f0069768a7 
							
						 
					 
					
						
						
							
							updated macos build script  
						
						 
						
						
						
					 
					
						2019-01-06 21:50:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							e2034188be 
							
						 
					 
					
						
						
							
							remove old mac script  
						
						 
						
						
						
					 
					
						2019-01-05 22:58:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							5b9bf086cf 
							
						 
					 
					
						
						
							
							adjusted macos post build script  
						
						 
						
						
						
					 
					
						2019-01-03 00:09:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							bb27b6095d 
							
						 
					 
					
						
						
							
							added macos post build script  
						
						 
						
						
						
					 
					
						2019-01-03 00:04:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							ec1057b5d7 
							
						 
					 
					
						
						
							
							added dynamic linking fix script for macos  
						
						 
						
						
						
					 
					
						2018-12-26 22:48:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							68145616f5 
							
						 
					 
					
						
						
							
							removed redundant statement from ubuntu config script  
						
						 
						
						
						
					 
					
						2018-12-26 19:34:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							73a13d9d88 
							
						 
					 
					
						
						
							
							added lib folder to ubuntu configure script  
						
						 
						
						
						
					 
					
						2018-12-26 18:02:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							1f754776b4 
							
						 
					 
					
						
						
							
							finished ubuntu build script and made default plugin mode dynamic linking  
						
						 
						
						
						
					 
					
						2018-12-26 17:31:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							45eae60445 
							
						 
					 
					
						
						
							
							added ubuntu config script  
						
						 
						
						
						
					 
					
						2018-12-26 17:14:10 +01:00