birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '5f22dc817c'
${ noResults }
o3de/Code/LauncherUnified
History
Esteban Papp 37ffe90353 Merge branch 'development' into cmake/SPEC-7182 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/QtUtil.h
#	Code/Legacy/CryCommon/Linux_Win32Wrapper.h
#	Code/Legacy/CryCommon/ProjectDefines.h
#	Code/Legacy/CryCommon/StringUtils.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CryCommon/UnicodeEncoding.h
#	Code/Legacy/CryCommon/UnicodeFunctions.h
#	Code/Legacy/CryCommon/UnicodeIterator.h
#	Code/Legacy/CryCommon/WinBase.cpp
#	Code/Legacy/CryCommon/platform.h
#	Code/Legacy/CryCommon/platform_impl.cpp
#	Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
#	Gems/Maestro/Code/Source/Cinematics/Movie.cpp
 		5 years ago
..
Platform Linux fixes 5 years ago
Resources Initial commit 5 years ago
Tests Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
FindLauncherGenerator.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Game.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Launcher.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Launcher.h removing files that got added by rebase 5 years ago
LauncherProject.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Server.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
StaticModules.in Revert previous change 5 years ago
launcher_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
launcher_game_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
launcher_generator.cmake Issues/2126 PhysX Gem can't be used as build dependency in engine SDK Part (#2337) (#2340) 5 years ago
launcher_project_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
launcher_server_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
launcher_test_files.cmake Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago