q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-23 10:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
f9bfaf7435
Serious-Engine/Sources/SeriousSam/GUI/Menus
History
Ryan C. Gordon 1a2ccb8f50 Merge github.com:Croteam-Official/Serious-Engine 
Conflicts:
	Sources/Ecc/Parser.cpp
	Sources/Ecc/Scanner.cpp
	Sources/Engine/Base/Scanner.cpp
	Sources/Engine/GameAgent/GameAgent.cpp
	Sources/Engine/Graphics/Gfx_wrapper.h
	Sources/Engine/Network/Network.cpp
	Sources/Engine/Sound/SoundDecoder.h
	Sources/Engine/Templates/HashTableTemplate.cpp
	Sources/Engine/Terrain/Terrain.h
	Sources/EntitiesMP/ParticleCloudsHolder.es
	Sources/EntitiesMP/ParticleCloudsMarker.es
	Sources/SeriousSam/CDCheck.h
	Sources/SeriousSam/Menu.cpp
	Sources/SeriousSam/MenuGadgets.cpp
	Sources/SeriousSam/SeriousSam.cpp
	Sources/SeriousSam/SplashScreen.cpp
	Sources/SeriousSam/StdH.cpp
	Sources/SeriousSam/StdH.h
	Sources/Shaders/StdH.cpp
2016-04-02 23:56:12 -04:00
..
GameMenu.cpp Fix the License. 2016-04-01 01:12:10 +03:00
GameMenu.h Fix the License. 2016-04-01 01:12:10 +03:00
MAudioOptions.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MAudioOptions.h Fix the License. 2016-04-01 01:12:10 +03:00
MConfirm.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MConfirm.h Fix the License. 2016-04-01 01:12:10 +03:00
MControls.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MControls.h Fix the License. 2016-04-01 01:12:10 +03:00
MCredits.h Fix the License. 2016-04-01 01:12:10 +03:00
MCustomizeAxis.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MCustomizeAxis.h Fix the License. 2016-04-01 01:12:10 +03:00
MCustomizeKeyboard.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MCustomizeKeyboard.h Fix the License. 2016-04-01 01:12:10 +03:00
MDisabled.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MDisabled.h Fix the License. 2016-04-01 01:12:10 +03:00
Menu.cpp Fix the License. 2016-04-01 01:12:10 +03:00
Menu.h Fix the License. 2016-04-01 01:12:10 +03:00
MenuActions.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MenuActions.h Fix the License. 2016-04-01 01:12:10 +03:00
MenuManager.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MenuManager.h Fix the License. 2016-04-01 01:12:10 +03:00
MenuPrinting.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
MenuPrinting.h Resolve conflicts 2016-04-01 01:00:14 +03:00
MenuStarters.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MenuStarters.h Fix the License. 2016-04-01 01:12:10 +03:00
MenuStartersAF.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MenuStartersAF.h Fix the License. 2016-04-01 01:12:10 +03:00
MenuStuff.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
MenuStuff.h Fix the License. 2016-04-01 01:12:10 +03:00
MHighScore.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MHighScore.h Fix the License. 2016-04-01 01:12:10 +03:00
MInGame.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MInGame.h Fix the License. 2016-04-01 01:12:10 +03:00
MLevels.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MLevels.h Fix the License. 2016-04-01 01:12:10 +03:00
MLoadSave.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MLoadSave.h Fix the License. 2016-04-01 01:12:10 +03:00
MMain.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MMain.h Fix the License. 2016-04-01 01:12:10 +03:00
MNetwork.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MNetwork.h Fix the License. 2016-04-01 01:12:10 +03:00
MNetworkJoin.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MNetworkJoin.h Fix the License. 2016-04-01 01:12:10 +03:00
MNetworkOpen.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MNetworkOpen.h Fix the License. 2016-04-01 01:12:10 +03:00
MNetworkStart.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MNetworkStart.h Fix the License. 2016-04-01 01:12:10 +03:00
MOptions.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MOptions.h Fix the License. 2016-04-01 01:12:10 +03:00
MPlayerProfile.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MPlayerProfile.h Fix the License. 2016-04-01 01:12:10 +03:00
MRenderingOptions.h Fix the License. 2016-04-01 01:12:10 +03:00
MSelectPlayers.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MSelectPlayers.h Fix the License. 2016-04-01 01:12:10 +03:00
MServers.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MServers.h Fix the License. 2016-04-01 01:12:10 +03:00
MSinglePlayer.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MSinglePlayer.h Fix the License. 2016-04-01 01:12:10 +03:00
MSinglePlayerNew.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MSinglePlayerNew.h Fix the License. 2016-04-01 01:12:10 +03:00
MSplitScreen.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MSplitScreen.h Fix the License. 2016-04-01 01:12:10 +03:00
MSplitStart.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MSplitStart.h Fix the License. 2016-04-01 01:12:10 +03:00
MVar.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MVar.h Fix the License. 2016-04-01 01:12:10 +03:00
MVideoOptions.cpp Fix the License. 2016-04-01 01:12:10 +03:00
MVideoOptions.h Fix the License. 2016-04-01 01:12:10 +03:00