| 
						
					 | 
					
						
						
						
						
							
						
						
							ff362a6bdc
							
						
					 | 
					
						
						
							
							Merge branch 'staging' into unified_scene
						
						
						
						
						
						
					 | 
					
						2022-04-07 11:37:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e1a4dab3f7
							
						
					 | 
					
						
						
							
							resource scene added, small optimizations of environment
						
						
						
						
						
						
					 | 
					
						2022-04-06 14:36:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0596e060db
							
						
					 | 
					
						
						
							
							homebase done portal room done
						
						
						
						
						
						
					 | 
					
						2022-04-05 20:53:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ccafc9e970
							
						
					 | 
					
						
						
							
							unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character
						
						
						
						
						
						
					 | 
					
						2022-04-05 10:21:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							53893b63a6
							
						
					 | 
					
						
						
							
							Merge pull request 'staging' (#23) from staging into master
						
						
						
						
						
						
						
						Reviewed-on: #23 
						
						
					 | 
					
						2022-03-29 09:50:37 +00:00 | 
					
					
						
						
							
							
							
						
					 |