Skip to content

Commit

Permalink
* Moved blamlib and YeloLib code into source directory in root of wor…
Browse files Browse the repository at this point in the history
…kspace

* Moved third party code into external_libraries in root of workspace
  • Loading branch information
TheFieryScythe committed Dec 24, 2017
1 parent 7a7389e commit 5bfb369
Show file tree
Hide file tree
Showing 987 changed files with 3,980 additions and 59,105 deletions.
8 changes: 4 additions & 4 deletions OpenSauce/Halo1/Halo1_BlamLib/Common/Precompile.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@

#include "Common/Platform.hpp"

#include <blamlib/Halo1/cseries/cseries.hpp>
#include <blamlib/cseries/cseries.hpp>
#include <blamlib/scenario/scenario_location.hpp>
#include <YeloLib/Halo1/open_sauce/blam_memory_upgrades.hpp>
#include <YeloLib/open_sauce/blam_memory_upgrades.hpp>

#include <YeloLib/cseries/errors_yelo.hpp>
#include <blamlib/Halo1/cseries/errors.hpp>
#include <YeloLib/Halo1/cseries/memory_yelo.hpp>
#include <blamlib/cseries/errors.hpp>
#include <YeloLib/cseries/memory_yelo.hpp>
668 changes: 334 additions & 334 deletions OpenSauce/Halo1/Halo1_BlamLib/Halo1_BlamLib.vcxproj

Large diffs are not rendered by default.

668 changes: 334 additions & 334 deletions OpenSauce/Halo1/Halo1_BlamLib/Halo1_BlamLib.vcxproj.filters

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions OpenSauce/Halo1/Halo1_CE/Common/DebugDump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

#include <ErrorRep.h>
#pragma comment (lib, "Faultrep.lib")
#include <YeloLib/Halo1/shell/shell_windows_command_line.hpp>
#include <YeloLib/shell/shell_windows_command_line.hpp>

#include "Memory/MemoryInterface.hpp"

#if PLATFORM_IS_USER
#include <blamlib/Halo1/main/console.hpp>
#include <blamlib/Halo1/saved_games/game_state_structures.hpp>
#include <blamlib/Halo1/game/game_globals.hpp>
#include <blamlib/Halo1/game/game_globals_structures.hpp>
#include <blamlib/main/console.hpp>
#include <blamlib/saved_games/game_state_structures.hpp>
#include <blamlib/game/game_globals.hpp>
#include <blamlib/game/game_globals_structures.hpp>

#include <YeloLib/cseries/pc_crashreport.hpp>

Expand Down
8 changes: 4 additions & 4 deletions OpenSauce/Halo1/Halo1_CE/Common/Precompile.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@
#define API_NO_ZIP_CODEC
#endif

#include <blamlib/Halo1/cseries/cseries.hpp>
#include <blamlib/cseries/cseries.hpp>
#include <blamlib/scenario/scenario_location.hpp>
#include <YeloLib/Halo1/open_sauce/blam_memory_upgrades.hpp>
#include <YeloLib/open_sauce/blam_memory_upgrades.hpp>

#include <YeloLib/cseries/errors_yelo.hpp>
#include <blamlib/Halo1/cseries/errors.hpp>
#include <YeloLib/Halo1/cseries/memory_yelo.hpp>
#include <blamlib/cseries/errors.hpp>
#include <YeloLib/cseries/memory_yelo.hpp>

#include "Settings/Settings.hpp"
6 changes: 3 additions & 3 deletions OpenSauce/Halo1/Halo1_CE/Game/AI.Transform.inl
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
See license\OpenSauce\Halo1_CE for specific license information
*/

#include <YeloLib/Halo1/ai/c_actor_variant_transform_manager.hpp>
#include <YeloLib/Halo1/saved_games/game_state_yelo.hpp>
#include <YeloLib/Halo1/units/units_yelo.hpp>
#include <YeloLib/ai/c_actor_variant_transform_manager.hpp>
#include <YeloLib/saved_games/game_state_yelo.hpp>
#include <YeloLib/units/units_yelo.hpp>

namespace Yelo
{
Expand Down
6 changes: 3 additions & 3 deletions OpenSauce/Halo1/Halo1_CE/Game/AI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include "Common/Precompile.hpp"
#include "Game/AI.hpp"

#include <blamlib/Halo1/ai/actor_structures.hpp>
#include <blamlib/Halo1/ai/prop_structures.hpp>
#include <blamlib/ai/actor_structures.hpp>
#include <blamlib/ai/prop_structures.hpp>

#include <YeloLib/Halo1/ai/ai_yelo.hpp>
#include <YeloLib/ai/ai_yelo.hpp>

#include "Memory/MemoryInterface.hpp"
#include "Objects/Objects.hpp"
Expand Down
14 changes: 7 additions & 7 deletions OpenSauce/Halo1/Halo1_CE/Game/AI.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
*/
#pragma once

#include <blamlib/Halo1/ai/actions.hpp>
#include <blamlib/Halo1/ai/actor_types.hpp>
#include <blamlib/Halo1/ai/ai.hpp>
#include <blamlib/Halo1/ai/ai_communication.hpp>
#include <blamlib/Halo1/ai/encounters.hpp>
#include <blamlib/Halo1/ai/props.hpp>
#include <blamlib/Halo1/memory/data.hpp>
#include <blamlib/ai/actions.hpp>
#include <blamlib/ai/actor_types.hpp>
#include <blamlib/ai/ai.hpp>
#include <blamlib/ai/ai_communication.hpp>
#include <blamlib/ai/encounters.hpp>
#include <blamlib/ai/props.hpp>
#include <blamlib/memory/data.hpp>

namespace Yelo
{
Expand Down
8 changes: 4 additions & 4 deletions OpenSauce/Halo1/Halo1_CE/Game/Camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

#if PLATFORM_IS_USER

#include <blamlib/Halo1/camera/director_structures.hpp>
#include <blamlib/Halo1/objects/objects.hpp>
#include <blamlib/Halo1/units/unit_structures.hpp>
#include <blamlib/camera/director_structures.hpp>
#include <blamlib/objects/objects.hpp>
#include <blamlib/units/unit_structures.hpp>

#include <YeloLib/Halo1/units/units_yelo.hpp>
#include <YeloLib/units/units_yelo.hpp>

#include "Settings/Settings.hpp"
#include "Memory/MemoryInterface.hpp"
Expand Down
2 changes: 1 addition & 1 deletion OpenSauce/Halo1/Halo1_CE/Game/Camera.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once

#if PLATFORM_IS_USER
#include <blamlib/Halo1/camera/director.hpp>
#include <blamlib/camera/director.hpp>
#include <YeloLib/configuration/c_configuration_value.hpp>
#include <YeloLib/configuration/c_configuration_container.hpp>
#include <YeloLib/open_sauce/settings/c_settings_singleton.hpp>
Expand Down
6 changes: 3 additions & 3 deletions OpenSauce/Halo1/Halo1_CE/Game/CameraFov.inl
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include "Game/Players.hpp"
#include "TagGroups/CacheFiles.hpp"

#include <YeloLib/Halo1/cache/shared_cache_files.hpp>
#include <BlamLib/Halo1/cache/cache_files.hpp>
#include <BlamLib/Halo1/cache/cache_files_globals.hpp>
#include <YeloLib/cache/shared_cache_files.hpp>
#include <BlamLib/cache/cache_files.hpp>
#include <BlamLib/cache/cache_files_globals.hpp>

namespace Yelo
{
Expand Down
6 changes: 3 additions & 3 deletions OpenSauce/Halo1/Halo1_CE/Game/Console.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/
#pragma once

#include <blamlib/Halo1/interface/terminal.hpp>
#include <blamlib/Halo1/main/console.hpp>
#include <blamlib/Halo1/memory/data.hpp>
#include <blamlib/interface/terminal.hpp>
#include <blamlib/main/console.hpp>
#include <blamlib/memory/data.hpp>

namespace Yelo
{
Expand Down
4 changes: 2 additions & 2 deletions OpenSauce/Halo1/Halo1_CE/Game/Effects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "Common/Precompile.hpp"
#include "Game/Effects.hpp"

#include <YeloLib/Halo1/shell/shell_windows_command_line.hpp>
#include <YeloLib/shell/shell_windows_command_line.hpp>

#include "Game/GameState.hpp"
#include "Memory/MemoryInterface.hpp"
Expand Down Expand Up @@ -36,7 +36,7 @@ namespace Yelo
s_decal_vertex_cache_data* DecalVertexCache() DPTR_IMP_GET(decal_vertex_cache);


#include <YeloLib/Halo1/render/render_particles_upgrades.inl>
#include <YeloLib/render/render_particles_upgrades.inl>
static void InitializePerMapUpgrades()
{
#if PLATFORM_IS_USER
Expand Down
16 changes: 8 additions & 8 deletions OpenSauce/Halo1/Halo1_CE/Game/Effects.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
*/
#pragma once

#include <blamlib/Halo1/memory/data.hpp>
#include <blamlib/Halo1/memory/lruv_cache.hpp>

#include <blamlib/Halo1/effects/contrails.hpp>
#include <blamlib/Halo1/effects/effects.hpp>
#include <blamlib/Halo1/effects/particle_systems.hpp>
#include <blamlib/Halo1/effects/particles.hpp>
#include <blamlib/Halo1/effects/weather_particle_systems.hpp>
#include <blamlib/memory/data.hpp>
#include <blamlib/memory/lruv_cache.hpp>

#include <blamlib/effects/contrails.hpp>
#include <blamlib/effects/effects.hpp>
#include <blamlib/effects/particle_systems.hpp>
#include <blamlib/effects/particles.hpp>
#include <blamlib/effects/weather_particle_systems.hpp>
#include <YeloLib/cseries/cseries_yelo_base.hpp>

namespace Yelo
Expand Down
28 changes: 14 additions & 14 deletions OpenSauce/Halo1/Halo1_CE/Game/EngineFunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
#include "Common/Precompile.hpp"
#include "Game/EngineFunctions.hpp"

#include <blamlib/Halo1/cache/cache_files.hpp>
#include <blamlib/Halo1/camera/director.hpp>
#include <blamlib/Halo1/interface/hud_draw.hpp>
#include <blamlib/Halo1/main/console.hpp>
#include <blamlib/Halo1/main/main_structures.hpp>
#include <blamlib/Halo1/math/periodic_functions.hpp>
#include <blamlib/Halo1/memory/data.hpp>
#include <blamlib/Halo1/models/model_animation_definitions.hpp>
#include <blamlib/Halo1/objects/damage.hpp>
#include <blamlib/Halo1/objects/objects.hpp>
#include <blamlib/Halo1/tag_files/tag_groups.hpp>
#include <blamlib/Halo1/ai/actor_structures.hpp>
#include <blamlib/Halo1/units/unit_structures.hpp>
#include <blamlib/Halo1/units/unit_script.hpp>
#include <blamlib/cache/cache_files.hpp>
#include <blamlib/camera/director.hpp>
#include <blamlib/interface/hud_draw.hpp>
#include <blamlib/main/console.hpp>
#include <blamlib/main/main_structures.hpp>
#include <blamlib/math/periodic_functions.hpp>
#include <blamlib/memory/data.hpp>
#include <blamlib/models/model_animation_definitions.hpp>
#include <blamlib/objects/damage.hpp>
#include <blamlib/objects/objects.hpp>
#include <blamlib/tag_files/tag_groups.hpp>
#include <blamlib/ai/actor_structures.hpp>
#include <blamlib/units/unit_structures.hpp>
#include <blamlib/units/unit_script.hpp>

#include "Game/Console.hpp"
#include "Game/GameState.hpp"
Expand Down
2 changes: 1 addition & 1 deletion OpenSauce/Halo1/Halo1_CE/Game/GameBuildNumber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "Common/Precompile.hpp"
#include "Game/GameBuildNumber.hpp"

#include <blamlib/Halo1/saved_games/game_state_structures.hpp>
#include <blamlib/saved_games/game_state_structures.hpp>

#include "Memory/MemoryInterface.hpp"

Expand Down
12 changes: 6 additions & 6 deletions OpenSauce/Halo1/Halo1_CE/Game/GameEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
#include "Common/Precompile.hpp"
#include "Game/GameEngine.hpp"

#include <blamlib/Halo1/game/game_engine_ctf.hpp>
#include <blamlib/Halo1/game/game_engine_king.hpp>
#include <blamlib/Halo1/game/game_engine_oddball.hpp>
#include <blamlib/Halo1/game/game_engine_race.hpp>
#include <blamlib/Halo1/game/game_engine_slayer.hpp>
#include <blamlib/Halo1/game/game_globals_structures.hpp>
#include <blamlib/game/game_engine_ctf.hpp>
#include <blamlib/game/game_engine_king.hpp>
#include <blamlib/game/game_engine_oddball.hpp>
#include <blamlib/game/game_engine_race.hpp>
#include <blamlib/game/game_engine_slayer.hpp>
#include <blamlib/game/game_globals_structures.hpp>

#include "Memory/MemoryInterface.hpp"
#include "Game/GameState.hpp"
Expand Down
6 changes: 3 additions & 3 deletions OpenSauce/Halo1/Halo1_CE/Game/GameEngine.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/
#pragma once

#include <blamlib/Halo1/game/game_engine.hpp>
#include <blamlib/Halo1/objects/vehicle_remapper.hpp>
#include <blamlib/Halo1/saved_games/game_variant.hpp>
#include <blamlib/game/game_engine.hpp>
#include <blamlib/objects/vehicle_remapper.hpp>
#include <blamlib/saved_games/game_variant.hpp>

namespace Yelo
{
Expand Down
26 changes: 13 additions & 13 deletions OpenSauce/Halo1/Halo1_CE/Game/GameState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
#include "Common/Precompile.hpp"
#include "Game/GameState.hpp"

#include <blamlib/Halo1/cache/physical_memory_map_structures.hpp>
#include <blamlib/Halo1/game/game_allegiance_structures.hpp>
#include <blamlib/Halo1/game/game_globals_definitions.hpp>
#include <blamlib/Halo1/game/game_globals_structures.hpp>
#include <blamlib/Halo1/game/game_time_structures.hpp>
#include <blamlib/Halo1/main/console.hpp> // for data_array_info only
#include <blamlib/Halo1/main/main_structures.hpp>
#include <blamlib/Halo1/scenario/scenario.hpp>
#include <blamlib/Halo1/saved_games/game_state_structures.hpp>
#include <blamlib/cache/physical_memory_map_structures.hpp>
#include <blamlib/game/game_allegiance_structures.hpp>
#include <blamlib/game/game_globals_definitions.hpp>
#include <blamlib/game/game_globals_structures.hpp>
#include <blamlib/game/game_time_structures.hpp>
#include <blamlib/main/console.hpp> // for data_array_info only
#include <blamlib/main/main_structures.hpp>
#include <blamlib/scenario/scenario.hpp>
#include <blamlib/saved_games/game_state_structures.hpp>

#include <YeloLib/cseries/random.hpp>
#include <YeloLib/Halo1/open_sauce/blam_memory_upgrades.hpp>
#include <YeloLib/Halo1/open_sauce/project_yellow_scenario.hpp>
#include <YeloLib/Halo1/open_sauce/project_yellow_scenario_definitions.hpp>
#include <YeloLib/Halo1/shell/shell_windows_command_line.hpp>
#include <YeloLib/open_sauce/blam_memory_upgrades.hpp>
#include <YeloLib/open_sauce/project_yellow_scenario.hpp>
#include <YeloLib/open_sauce/project_yellow_scenario_definitions.hpp>
#include <YeloLib/shell/shell_windows_command_line.hpp>

#include "Memory/MemoryInterface.hpp"
#include "Common/GameSystems.hpp"
Expand Down
16 changes: 8 additions & 8 deletions OpenSauce/Halo1/Halo1_CE/Game/GameState.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "Memory/MemoryInterface.hpp" // for CRC

#include <blamlib/Halo1/cache/physical_memory_map.hpp>
#include <blamlib/Halo1/game/game_allegiance.hpp>
#include <blamlib/Halo1/game/game_globals.hpp>
#include <blamlib/Halo1/game/game_time.hpp>
#include <blamlib/Halo1/main/main.hpp>
#include <blamlib/Halo1/physics/physics.hpp>
#include <blamlib/Halo1/physics/point_physics.hpp>
#include <blamlib/Halo1/saved_games/game_state.hpp>
#include <blamlib/cache/physical_memory_map.hpp>
#include <blamlib/game/game_allegiance.hpp>
#include <blamlib/game/game_globals.hpp>
#include <blamlib/game/game_time.hpp>
#include <blamlib/main/main.hpp>
#include <blamlib/physics/physics.hpp>
#include <blamlib/physics/point_physics.hpp>
#include <blamlib/saved_games/game_state.hpp>

namespace Yelo
{
Expand Down
2 changes: 1 addition & 1 deletion OpenSauce/Halo1/Halo1_CE/Game/GameStateRuntimeData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "Common/Precompile.hpp"
#include "Game/GameStateRuntimeData.hpp"

#include <YeloLib/Halo1/saved_games/game_state_yelo.hpp>
#include <YeloLib/saved_games/game_state_yelo.hpp>

#include "Game/GameState.hpp"
#include "Game/ScriptLibrary.hpp"
Expand Down
2 changes: 1 addition & 1 deletion OpenSauce/Halo1/Halo1_CE/Game/Lights.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
#pragma once

#include <blamlib/Halo1/memory/data.hpp>
#include <blamlib/memory/data.hpp>
#include <YeloLib/cseries/cseries_yelo_base.hpp>

namespace Yelo
Expand Down
14 changes: 7 additions & 7 deletions OpenSauce/Halo1/Halo1_CE/Game/Players.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
#include "Common/Precompile.hpp"
#include "Game/Players.hpp"

#include <blamlib/Halo1/game/player_structures.hpp>
#include <blamlib/Halo1/scenario/scenario.hpp>
#include <blamlib/Halo1/scenario/scenario_definitions.hpp>
#include <blamlib/Halo1/units/unit_structures.hpp>
#include <YeloLib/Halo1/open_sauce/project_yellow_global_definitions.hpp>
#include <YeloLib/Halo1/open_sauce/project_yellow_scenario.hpp>
#include <YeloLib/Halo1/open_sauce/project_yellow_scenario_definitions.hpp>
#include <blamlib/game/player_structures.hpp>
#include <blamlib/scenario/scenario.hpp>
#include <blamlib/scenario/scenario_definitions.hpp>
#include <blamlib/units/unit_structures.hpp>
#include <YeloLib/open_sauce/project_yellow_global_definitions.hpp>
#include <YeloLib/open_sauce/project_yellow_scenario.hpp>
#include <YeloLib/open_sauce/project_yellow_scenario_definitions.hpp>

#include "Game/EngineFunctions.hpp"
#include "Game/GameEngine.hpp"
Expand Down
8 changes: 4 additions & 4 deletions OpenSauce/Halo1/Halo1_CE/Game/Players.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*/
#pragma once

#include <blamlib/Halo1/effects/player_effects.hpp>
#include <blamlib/Halo1/game/player_control.hpp>
#include <blamlib/Halo1/game/players.hpp>
#include <blamlib/Halo1/memory/data.hpp>
#include <blamlib/effects/player_effects.hpp>
#include <blamlib/game/player_control.hpp>
#include <blamlib/game/players.hpp>
#include <blamlib/memory/data.hpp>

namespace Yelo
{
Expand Down
8 changes: 4 additions & 4 deletions OpenSauce/Halo1/Halo1_CE/Game/ScriptLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include "Common/Precompile.hpp"
#include "Game/ScriptLibrary.hpp"

#include <blamlib/Halo1/hs/hs_structures.hpp>
#include <blamlib/Halo1/networking/network_server_manager_structures.hpp>
#include <YeloLib/Halo1/open_sauce/blam_memory_upgrades.hpp>
#include <YeloLib/Halo1/open_sauce/project_yellow_global_definitions.hpp>
#include <blamlib/hs/hs_structures.hpp>
#include <blamlib/networking/network_server_manager_structures.hpp>
#include <YeloLib/open_sauce/blam_memory_upgrades.hpp>
#include <YeloLib/open_sauce/project_yellow_global_definitions.hpp>

#include "Settings/Settings.hpp"
#include "Game/Camera.hpp"
Expand Down
Loading

0 comments on commit 5bfb369

Please sign in to comment.