| 
						
					 | 
					
						
						
							
						
						3a5a4894c0
					 | 
					
						
						
							
							[nostalgia] Remove conan from main CMakeLists.txt, remove glfw & imgui includes from GBA build
						
						
						
						
						
						
					 | 
					
						2022-03-12 02:36:32 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						52df6efcfc
					 | 
					
						
						
							
							[jsoncpp] Switch to object library
						
						
						
						
						
						
					 | 
					
						2022-03-12 02:35:48 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						41cc78db66
					 | 
					
						
						
							
							[ox] Fix jsoncpp include path export
						
						
						
						
						
						
					 | 
					
						2022-03-12 02:34:04 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9801a968f
					 | 
					
						
						
							
							Squashed 'deps/imgui/' content from commit f33737806
						
						
						
						
						
						
						
						git-subtree-dir: deps/imgui
git-subtree-split: f3373780668fba1f9bd64c208d05c20b781c9a39 
						
						
					 | 
					
						2022-03-11 22:44:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f910961111
					 | 
					
						
						
							
							Merge commit 'f9801a968fb15cb74371f18a507c2004b852b4b6' as 'deps/imgui'
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:44:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d294bbde85
					 | 
					
						
						
							
							[imgui] Remove conan dest imgui dir
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:43:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7005ef0bcf
					 | 
					
						
						
							
							[ox] Make jsoncpp only included for builds using stdlib
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:36:14 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1b49962a8e
					 | 
					
						
						
							
							[nostalgia] Remove Conan jsoncpp package
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:30:59 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a4b539ac1
					 | 
					
						
						
							
							[ox] Bundle jsoncpp under deps
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:30:42 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b96d33bbb9
					 | 
					
						
						
							
							Merge commit '7eef3bf1545663791252b2a3cad437ec9fcfc9cc' as 'deps/ox/deps/jsoncpp'
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:21:02 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7eef3bf154
					 | 
					
						
						
							
							Squashed 'deps/ox/deps/jsoncpp/' content from commit 5defb4ed
						
						
						
						
						
						
						
						git-subtree-dir: deps/ox/deps/jsoncpp
git-subtree-split: 5defb4ed1a4293b8e2bf641e16b156fb9de498cc 
						
						
					 | 
					
						2022-03-11 22:21:02 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c152bb9a66
					 | 
					
						
						
							
							[nostalgia] Switch from Conan to bundled dep glfw
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:16:59 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a120e3f701
					 | 
					
						
						
							
							Squashed 'deps/glfw/' content from commit 7d5a16ce
						
						
						
						
						
						
						
						git-subtree-dir: deps/glfw
git-subtree-split: 7d5a16ce714f0b5f4efa3262de22e4d948851525 
						
						
					 | 
					
						2022-03-11 22:04:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e080b95d5
					 | 
					
						
						
							
							Merge commit 'a120e3f70101ebe90f92fe59436a37e6caf42adf' as 'deps/glfw'
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:04:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6885aca0e8
					 | 
					
						
						
							
							[nostalgia] Cleanup
						
						
						
						
						
						
					 | 
					
						2022-03-11 22:01:31 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7df978605f
					 | 
					
						
						
							
							[nostalgia/core] Add Fill command to tilesheet editor and make ClipboardObject more efficient
						
						
						
						
						
						
					 | 
					
						2022-03-11 20:41:36 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae80d22769
					 | 
					
						
						
							
							[nostalgia/core/studio] Fix TileSheet Editor paste bounds checking
						
						
						
						
						
						
					 | 
					
						2022-03-11 02:11:58 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						415c2574bb
					 | 
					
						
						
							
							[nostalgia/core/studio] Add copy/cut/paste support to TileSheet Editor
						
						
						
						
						
						
					 | 
					
						2022-03-10 20:42:21 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a6983ce53b
					 | 
					
						
						
							
							[nostalgia/core] Add object clipboard in addition to text clipboard
						
						
						
						
						
						
					 | 
					
						2022-03-10 20:41:22 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						92651973ce
					 | 
					
						
						
							
							[nostalgia/studio] Hook up Copy/Cut/Paste commands
						
						
						
						
						
						
					 | 
					
						2022-03-10 20:40:51 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4dd1d4331b
					 | 
					
						
						
							
							[nostalgia/geo] Fix Point + and * operators to return the computed result
						
						
						
						
						
						
					 | 
					
						2022-03-10 19:43:28 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b502b8cc30
					 | 
					
						
						
							
							[nostalgia/core/studio] Add ability to select pixels for copy/paste
						
						
						
						
						
						
					 | 
					
						2022-03-10 02:39:22 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3486734b50
					 | 
					
						
						
							
							[nostalgia/geo] Add ability to init Bounds from two Points
						
						
						
						
						
						
					 | 
					
						2022-03-10 02:38:25 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b6a36bedc
					 | 
					
						
						
							
							[nostalgia/studio] Make opening a new project close all currently open files
						
						
						
						
						
						
					 | 
					
						2022-03-06 14:57:19 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e4f3ec52d0
					 | 
					
						
						
							
							[nostalgia/core/studio] Add initialization for SubSheetEditor show var
						
						
						
						
						
						
					 | 
					
						2022-03-06 01:23:01 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0b2f37925
					 | 
					
						
						
							
							[nostalgia/core/studio] Adjust size of SubSheet Editor in cases without size input
						
						
						
						
						
						
					 | 
					
						2022-03-05 18:29:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						94653cb9af
					 | 
					
						
						
							
							[nostalgia/core] Fix TileSheet::SubSheet::setPixelCount
						
						
						
						
						
						
					 | 
					
						2022-03-05 18:27:45 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b225d976f5
					 | 
					
						
						
							
							[nostalgia/core/studio] Cleanup
						
						
						
						
						
						
					 | 
					
						2022-03-05 17:49:12 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f40c912365
					 | 
					
						
						
							
							[nostalgia/core] Cleanup reading of SubSheet::pixels
						
						
						
						
						
						
					 | 
					
						2022-03-05 16:00:32 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						20a61de9fd
					 | 
					
						
						
							
							[nostalgia/core/studio] Fix subsheet editor to allocate correct number of pixels
						
						
						
						
						
						
					 | 
					
						2022-03-05 15:51:39 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2f7c62f2ef
					 | 
					
						
						
							
							[nostalgia/core/studio] Add SubSheet editor
						
						
						
						
						
						
					 | 
					
						2022-03-05 11:40:54 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						921cb97a14
					 | 
					
						
						
							
							[nostalgia/core] Make clicks trigger 10 refreshes
						
						
						
						
						
						
					 | 
					
						2022-03-05 11:40:05 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4966aaffe4
					 | 
					
						
						
							
							[nostalgia/studio] Make About modal and ProjectExplorer hide-able
						
						
						
						
						
						
					 | 
					
						2022-03-05 11:39:13 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a092c393a6
					 | 
					
						
						
							
							[ox/claw] Improve Claw read error reporting
						
						
						
						
						
						
					 | 
					
						2022-03-05 11:38:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1372ea9bc9
					 | 
					
						
						
							
							[ox/std] Make toStr(Error)'s return type template-able
						
						
						
						
						
						
					 | 
					
						2022-03-05 11:37:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e90d6da01b
					 | 
					
						
						
							
							[ox/std] Fix problem with calling Vector::insert on end of list
						
						
						
						
						
						
					 | 
					
						2022-03-05 11:37:07 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						191298a4ca
					 | 
					
						
						
							
							[nostalgia/core/studio] Change some lambdas to capture by reference
						
						
						
						
						
						
					 | 
					
						2022-03-03 19:24:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebb7d54403
					 | 
					
						
						
							
							[nostalgia/core] Fix TileSheet::validateSubSheetIdx
						
						
						
						
						
						
					 | 
					
						2022-03-03 19:24:24 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d983746f6c
					 | 
					
						
						
							
							[nostalgia/sample_project] Change Claw headers to MC 2
						
						
						
						
						
						
					 | 
					
						2022-03-03 01:26:38 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6cebe52904
					 | 
					
						
						
							
							[ox] Fix MC negative int encoding and bump MC version to 2
						
						
						
						
						
						
					 | 
					
						2022-03-03 01:25:54 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd2dd3f000
					 | 
					
						
						
							
							[ox/std] Add Integer_c concept to fix string + and += duplication of std::size_t with some compilers/platforms
						
						
						
						
						
						
					 | 
					
						2022-03-02 23:42:12 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						187edcd1d3
					 | 
					
						
						
							
							[ox/std] Add is_move_constructible
						
						
						
						
						
						
					 | 
					
						2022-02-26 22:53:50 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a48692ee1
					 | 
					
						
						
							
							[nostalgia] Update Developer Handbook
						
						
						
						
						
						
					 | 
					
						2022-02-26 22:52:35 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e8a046c2dc
					 | 
					
						
						
							
							[nostalgia] Add basic support for subsheets
						
						
						
						
						
						
					 | 
					
						2022-02-26 22:48:18 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						329ecb3266
					 | 
					
						
						
							
							[ox/model] Cleanup template style
						
						
						
						
						
						
					 | 
					
						2022-02-26 22:47:19 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9762a38a44
					 | 
					
						
						
							
							[nostalgia/core] Make readObj move output object instead of copy
						
						
						
						
						
						
					 | 
					
						2022-02-26 10:12:25 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13ba8430c7
					 | 
					
						
						
							
							[ox/std] Change Result(type&&) to use forward
						
						
						
						
						
						
					 | 
					
						2022-02-26 10:05:11 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d0bf40037
					 | 
					
						
						
							
							[ox/std] Fix Vector copy assign not to assign to uninitialized memory
						
						
						
						
						
						
					 | 
					
						2022-02-26 03:02:16 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21883a046e
					 | 
					
						
						
							
							[ox/std] Add ox::join(del, strList)
						
						
						
						
						
						
					 | 
					
						2022-02-23 23:41:31 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7c6df56414
					 | 
					
						
						
							
							[ox/std] Add String::operator+=(std::size_t)
						
						
						
						
						
						
					 | 
					
						2022-02-23 23:40:48 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |