stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							4a2a167f7d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 'bass-optional'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#   Attorney_Online.pro
#   include/aoapplication.h 
						
					 
					
						2019-07-20 16:20:05 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							2a5d569511 
							
						 
					 
					
						
						
							
							Merge branch 'less_insane_debugging' into 'master'  
						
						 
						
						... 
						
						
						
						Less insane debugging
See merge request AttorneyOnline/AO2-Client!75  
						
					 
					
						2019-07-12 23:00:25 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Skoland 
							
						 
					 
					
						
						
						
						
							
						
						
							5eccabcad1 
							
						 
					 
					
						
						
							
							Less insane debugging; minor refactoring ( !75 )  
						
						 
						
						
						
					 
					
						2019-07-12 23:00:25 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							621aa1adac 
							
						 
					 
					
						
						
							
							Merge branch 'fix82' into 'master'  
						
						 
						
						... 
						
						
						
						Fix bug #82  causing a client crash if /save_case was used without providing a courtroom state
Closes  #82 
See merge request AttorneyOnline/AO2-Client!74  
						
					 
					
						2019-07-12 22:57:54 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Windrammer 
							
						 
					 
					
						
						
						
						
							
						
						
							b15c6f15f0 
							
						 
					 
					
						
						
							
							Fix bug  #82  causing a client crash if /save_case was used without providing a courtroom state  
						
						 
						
						
						
					 
					
						2019-07-11 09:05:26 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							a504ca7f9a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 'master'  
						
						 
						
						... 
						
						
						
						Small bug fixing for /save_case
See merge request AttorneyOnline/AO2-Client!72  
						
					 
					
						2019-07-07 22:32:57 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							432069844a 
							
						 
					 
					
						
						
							
							Revert "More bug fixing."  
						
						 
						
						... 
						
						
						
						This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5 
						
					 
					
						2019-07-07 22:32:57 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							1552f3f19c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 'master'  
						
						 
						
						... 
						
						
						
						Fix escaped HTML characters screwing up the grapheme cluster sizes.
See merge request AttorneyOnline/AO2-Client!61  
						
					 
					
						2019-07-07 14:45:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							2ef6aecb0d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 'master'  
						
						 
						
						... 
						
						
						
						Fixed evidence not recognizing subfolder issue.
See merge request AttorneyOnline/AO2-Client!66  
						
					 
					
						2019-07-03 22:28:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							d07dd1d5fe 
							
						 
					 
					
						
						
							
							Permanent and not temporary solution for evidence. Supports up to infite subfolders.  
						
						 
						
						
						
					 
					
						2019-07-03 08:48:04 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							6c1d5ea41e 
							
						 
					 
					
						
						
							
							CI: install dependencies not in builder container (?!)  
						
						 
						
						
						
					 
					
						2019-07-03 02:47:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							f489f2064c 
							
						 
					 
					
						
						
							
							Merge branch 'ci' into 'master'  
						
						 
						
						
						
					 
					
						2019-07-02 21:11:59 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							ca3f113377 
							
						 
					 
					
						
						
							
							Fixed evidence not recognizing subfolder issue. Can support 1 folder tho.  
						
						 
						
						
						
					 
					
						2019-07-01 18:50:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							944b0be83b 
							
						 
					 
					
						
						
							
							Merge request  AttorneyOnline/AO2-Client!63  
						
						 
						
						... 
						
						
						
						Fixes issue #74  for client and #47  for tsuserver3 + /save_case feature
What the title says basically.
/save_case takes two parameters, name and cr status. E.g /save_case case1 lfp
Doc and cmdoc link are left blank if anybody wants to use them. 
						
					 
					
						2019-07-01 02:28:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							099fea176c 
							
						 
					 
					
						
						
							
							Indentation  
						
						 
						
						
						
					 
					
						2019-06-30 22:09:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							f826ba390b 
							
						 
					 
					
						
						
							
							New feature! /save_case . Takes two parameters, name and cr status.  
						
						 
						
						... 
						
						
						
						E.g: /save_case case1 lfp . It takes court evidence but leaves the doc and cmdoc options blank to be entered manually(if anybody actually puts anything). 
						
					 
					
						2019-06-30 21:47:48 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							236666b8e8 
							
						 
					 
					
						
						
							
							Merge branch 'mac_improvements' into 'master'  
						
						 
						
						... 
						
						
						
						Mac improvements 
						
					 
					
						2019-06-29 00:27:31 +00: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							ae85525780 
							
						 
					 
					
						
						
							
							Resolved requests/issues.  
						
						 
						
						
						
					 
					
						2019-06-03 09:00:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							09d8e9e7a4 
							
						 
					 
					
						
						
							
							Update courtroom.cpp  
						
						 
						
						
						
					 
					
						2019-05-31 21:52:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cents02 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9a1bdd5d 
							
						 
					 
					
						
						
							
							Fixed issues  #47  on both client and server  
						
						 
						
						
						
					 
					
						2019-05-31 21:47:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cerapter 
							
						 
					 
					
						
						
						
						
							
						
						
							c8a4f69d14 
							
						 
					 
					
						
						
							
							Fix escaped HTML characters fucking up the grapheme cluster sizes.  
						
						 
						
						
						
					 
					
						2019-05-10 20:49:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								oldmud0 
							
						 
					 
					
						
						
						
						
							
						
						
							15db260639 
							
						 
					 
					
						
						
							
							Merge branch 'unicode-blips' into 'master'  
						
						 
						
						... 
						
						
						
						Text is now advanced based on graphemes, rather than bytes.
`QTextBoundaryFinder` is used to determine the end of a grapheme cluster, and then the entire cluster is copied into `f_character`. This will not influence text comparisons, like when determining formatting characters.
The `f_character` being potentially more than one byte long is then used to advance the `tick_pos` to the correct position, using its length.
See merge request AttorneyOnline/AO2-Client!60  
						
					 
					
						2019-05-10 17:58:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cerapter 
							
						 
					 
					
						
						
						
						
							
						
						
							2e4f0117b0 
							
						 
					 
					
						
						
							
							Text is now advanced based on graphemes, rather than bytes.  
						
						 
						
						
						
					 
					
						2019-05-09 23:49:20 +02: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							785168f8d3 
							
						 
					 
					
						
						
							
							add a default for this  
						
						 
						
						
						
					 
					
						2019-03-13 22:05:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							44d433d941 
							
						 
					 
					
						
						
							
							sfx glitch  
						
						 
						
						
						
					 
					
						2019-03-13 22:05:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							bdde8822f4 
							
						 
					 
					
						
						
							
							begone, commented code  
						
						 
						
						
						
					 
					
						2019-03-13 21:36:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							ece08930e3 
							
						 
					 
					
						
						
							
							setVolume doesn't take floats  
						
						 
						
						
						
					 
					
						2019-03-13 13:06:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							1504aaf6b2 
							
						 
					 
					
						
						
							
							saves space i guess  
						
						 
						
						
						
					 
					
						2019-03-13 13:05:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							1514ffea6a 
							
						 
					 
					
						
						
							
							qt music  
						
						 
						
						
						
					 
					
						2019-03-12 20:47:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							71da60b5d6 
							
						 
					 
					
						
						
							
							sfx tested and works  
						
						 
						
						
						
					 
					
						2019-03-12 20:14:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							0b6f376f8f 
							
						 
					 
					
						
						
							
							qt can play the blips just fine  
						
						 
						
						
						
					 
					
						2019-03-12 19:53:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							6e93d6e1be 
							
						 
					 
					
						
						
							
							discord optional v2  
						
						 
						
						
						
					 
					
						2019-03-12 19:30:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							3fb6b50d10 
							
						 
					 
					
						
						
							
							cleanup qmakefile  
						
						 
						
						
						
					 
					
						2019-03-12 19:27:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								stonedDiscord 
							
						 
					 
					
						
						
						
						
							
						
						
							92c54ba2eb 
							
						 
					 
					
						
						
							
							Revert "make discord optional"  
						
						 
						
						... 
						
						
						
						This reverts commit 744c100159 . 
						
					 
					
						2019-03-12 19:27:13 +01:00