Merge branch 'main' of https://github.com/Thomasluigi07/MORBLOX-WEBSITE
This commit is contained in:
Thomas G
commit
7cd3a38c25
|
|
@ -126,6 +126,11 @@ class PageController extends Controller
|
|||
return view('pages.gamepage');
|
||||
}
|
||||
|
||||
public function thomasgame()
|
||||
{
|
||||
return view('pages.thomasgame');
|
||||
}
|
||||
|
||||
public function avatar()
|
||||
{
|
||||
return view('pages.avatar');
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 201 KiB |
|
|
@ -0,0 +1,10 @@
|
|||
<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.archblox.com/archblox.xsd" version="4">
|
||||
<External>null</External>
|
||||
<External>nil</External>
|
||||
<Item class="Shirt" referent="RBX0">
|
||||
<Properties>
|
||||
<string name="Name">Clothing</string>
|
||||
<Content name="ShirtTemplate"><url>http://morblox.us/asset/?id=400</url></Content>
|
||||
</Properties>
|
||||
</Item>
|
||||
</roblox>
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -538,13 +538,25 @@ iframe {
|
|||
}
|
||||
|
||||
.leftgamecontainer {
|
||||
height: 270px;
|
||||
text-align: center;
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
width: inherit;
|
||||
width: 70%;
|
||||
}
|
||||
|
||||
.rightgamecontainer {
|
||||
height: 270px;
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-content: space-around;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
flex-wrap: nowrap;
|
||||
text-align: right;
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
|
||||
// OLD JOIN SCRIPT DO NOT USE //
|
||||
header("content-type:text/plain");
|
||||
|
||||
$username = addslashes($_GET["username"]);
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,12 +1,21 @@
|
|||
@php
|
||||
header("content-type:text/plain");
|
||||
$userId = addslashes($_GET["userId"]);
|
||||
$headcolor = 11;
|
||||
$leftarmcolor = 11;
|
||||
$leftlegcolor = 1003;
|
||||
$rightarmcolor = 11;
|
||||
$rightlegcolor = 1003;
|
||||
$torsocolor = 1003;
|
||||
if ($userId == 0) {
|
||||
$headcolor = 2;
|
||||
$leftarmcolor = 1003;
|
||||
$leftlegcolor = 1003;
|
||||
$rightarmcolor = 1003;
|
||||
$rightlegcolor = 1003;
|
||||
$torsocolor = 1003;
|
||||
} else {
|
||||
$headcolor = 11;
|
||||
$leftarmcolor = 11;
|
||||
$leftlegcolor = 1003;
|
||||
$rightarmcolor = 11;
|
||||
$rightlegcolor = 1003;
|
||||
$torsocolor = 1003;
|
||||
}
|
||||
//TODO: add avatar system
|
||||
@endphp
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
|
|
|
|||
|
|
@ -2,13 +2,23 @@
|
|||
header("content-type:application/xml");
|
||||
ob_start();
|
||||
$userId = addslashes($_GET["userId"]);
|
||||
$hat1 = 300;
|
||||
$hat2 = 0;
|
||||
$hat3 = 0;
|
||||
$shirt = 0;
|
||||
$pants = 0;
|
||||
$shirtgraphic = 303;
|
||||
$face = 0;
|
||||
if ($userId == 0) {
|
||||
$hat1 = 300;
|
||||
$hat2 = 0;
|
||||
$hat3 = 0;
|
||||
$shirt = 401;
|
||||
$pants = 0;
|
||||
$shirtgraphic = 0;
|
||||
$face = 0;
|
||||
} else {
|
||||
$hat1 = 300;
|
||||
$hat2 = 0;
|
||||
$hat3 = 0;
|
||||
$shirt = 0;
|
||||
$pants = 0;
|
||||
$shirtgraphic = 303;
|
||||
$face = 0;
|
||||
}
|
||||
//TODO: add catalog + avatar system
|
||||
@endphp
|
||||
http://morblox.us/Asset/BodyColors.ashx?userId=@php echo $userId @endphp;http://morblox.us/asset/?id=@php echo $hat1 @endphp;http://morblox.us/asset/?id=@php echo $hat2 @endphp;http://morblox.us/asset/?id=@php echo $hat3 @endphp;http://morblox.us/asset/?id=@php echo $shirt @endphp;http://morblox.us/asset/?id=@php echo $pants @endphp;http://morblox.us/asset/?id=@php echo $shirtgraphic @endphp;http://morblox.us/asset/?id=@php echo $face @endphp
|
||||
|
|
@ -8,14 +8,18 @@ $port = addslashes($_GET["port"]);
|
|||
$id = addslashes($_GET["id"]);
|
||||
$app = addslashes($_GET["app"]);*/
|
||||
|
||||
$authorised = 0;
|
||||
|
||||
if (Auth::check()) {
|
||||
$username = addslashes(Auth::user()->name);
|
||||
$authorised = 1;
|
||||
$id = addslashes(Auth::id());
|
||||
$app = 'http://morblox.us/Asset/CharacterFetch.ashx?userId=' . addslashes(Auth::id());
|
||||
} else {
|
||||
$randName = mt_rand(1, 9999);
|
||||
$username = "Guest " . $randName;
|
||||
$id = 0;
|
||||
$authorised = 0;
|
||||
$id = mt_rand(1000, 9999);
|
||||
$app = 'http://morblox.us/Asset/CharacterFetch.ashx?userId=0';
|
||||
}
|
||||
$ip = addslashes($_GET["ip"]);
|
||||
|
|
@ -116,10 +120,10 @@ function setMessage(message)
|
|||
end
|
||||
|
||||
-- Check if client is not logged in
|
||||
if <?php echo $id; ?> == 0 then
|
||||
setMessage("You are not logged in. (ID: 400)", "Kick", "Kick")
|
||||
error("Not logged in")
|
||||
end
|
||||
--if "<?php echo $authorised; ?>" == "0" then
|
||||
-- setMessage("You are not logged in. (ID: 400)", "Kick", "Kick")
|
||||
-- error("Not logged in")
|
||||
--end
|
||||
|
||||
function showErrorWindow(message, errorType, errorCategory)
|
||||
game:SetMessage(message)
|
||||
|
|
@ -226,10 +230,20 @@ local success, err = pcall(function()
|
|||
|
||||
playerConnectSucces, player = pcall(function() return client:PlayerConnect(<?php echo $id; ?>, "<?php echo $ip; ?>", <?php echo $port; ?>, 0, threadSleepTime) end)
|
||||
|
||||
player:SetSuperSafeChat(false)
|
||||
pcall(function() player:SetUnder13(false) end)
|
||||
pcall(function() player:SetMembershipType(Enum.MembershipType.None) end)
|
||||
pcall(function() player:SetAccountAge(365) end)
|
||||
if "<?php echo $authorised; ?>" == "0" then
|
||||
-- guest
|
||||
player:SetSuperSafeChat(true)
|
||||
pcall(function() player:SetUnder13(true) end)
|
||||
pcall(function() player:SetMembershipType(Enum.MembershipType.None) end)
|
||||
pcall(function() player:SetAccountAge(0) end)
|
||||
else
|
||||
-- user
|
||||
player:SetSuperSafeChat(false)
|
||||
pcall(function() player:SetUnder13(false) end)
|
||||
pcall(function() player:SetMembershipType(Enum.MembershipType.None) end)
|
||||
pcall(function() player:SetAccountAge(365) end)
|
||||
end
|
||||
|
||||
player.Idled:connect(onPlayerIdled)
|
||||
|
||||
-- Overriden
|
||||
|
|
|
|||
|
|
@ -30,4 +30,4 @@ echo "Copy failed.";
|
|||
$textbox = ($id . "+" . $width[1] . "+" . $height[1] );
|
||||
header("Location: http://www.morblox.us/stamper/icons/{$textbox}");
|
||||
exit();
|
||||
@endphp
|
||||
@endphp
|
||||
|
|
@ -14,15 +14,15 @@
|
|||
<p class="important">You must be logged in to join games. Use studio to log in to your account.</p>
|
||||
<br>
|
||||
<p><strong>Requires .NET Framework 4.0, and Windows XP or newer. Not recommended for anything running Windows 7 or newer.</strong></p>
|
||||
<p><a href="{{ asset('xp/ARCHBLOXLauncher_XP.exe') }}">Windows XP/Vista Launcher v1.2</a> | <a href="{{ asset('xp/ARCHBLOXBootstrapper_XP.exe') }}">Windows XP/Vista Studio v1.1</a></p>
|
||||
<p><a href="{{ asset('xp/ARCHBLOXLauncher_XP.exe') }}">Windows XP/Vista Launcher v1.3</a> | <a href="{{ asset('xp/ARCHBLOXBootstrapper_XP.exe') }}">Windows XP/Vista Studio v1.2</a></p>
|
||||
<br>
|
||||
<p><strong>The below downloads require Windows 7 or newer and they require .NET Core 3.1. These are recommended for anything running Windows 7 or newer.</strong></p>
|
||||
<br>
|
||||
<p>ARCHBLOX Launcher v2.8</p>
|
||||
<p>ARCHBLOX Launcher v2.9</p>
|
||||
<p><a href="{{ asset('launcher/ARCHBLOXLauncher-32bit.exe') }}">32 Bit</a> | <a
|
||||
href="{{ asset('launcher/ARCHBLOXLauncher-64bit.exe') }}">64 Bit</a></p>
|
||||
<br>
|
||||
<p>ARCHBLOX Studio Bootstrapper v1.4</p>
|
||||
<p>ARCHBLOX Studio Bootstrapper v1.5</p>
|
||||
<p><a href="{{ asset('bootstrapper/ARCHBLOXBootstrapper-32bit.exe') }}">32 Bit</a> | <a
|
||||
href="{{ asset('bootstrapper/ARCHBLOXBootstrapper-64bit.exe') }}">64 Bit</a></p>
|
||||
<br>
|
||||
|
|
|
|||
|
|
@ -19,18 +19,20 @@
|
|||
<img class="gamethumbnail_large">
|
||||
</div>
|
||||
<div class="rightgamecontainer">
|
||||
<h1>Natural Disaster Survival</h1>
|
||||
<p>By <a href="{{ route('profile', 1) }}">ARCHBLOX</a></p>
|
||||
<p style="text-align: center;">
|
||||
<div>
|
||||
<h1>Natural Disaster Survival</h1>
|
||||
<p>By <a href="{{ route('profile', 1) }}">ARCHBLOX</a></p>
|
||||
</div>
|
||||
<div style="width: 100%;">
|
||||
<button onclick="openClientPopup('localhost','53640','temp.rbxl','hostandjoin')" class="greenbutton" style="width: 70%; height: 50px; font-size: x-large; margin-top: 115px; align-content: center;">Host & Play</button>
|
||||
<button onclick="openClientPopup(null,'53640','temp.rbxl','host')" class="greenbutton" style="width: 27%;height: 50px;margin-top: 0px;font-size: x-large;align-content: center;">Host</button>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<p>Test place.</p>
|
||||
<p>Natural Disaster Survival is a game where you survive disasters.</p>
|
||||
<br>
|
||||
<div style="text-align: center;">
|
||||
<p><!--Visits: 0 | -->Created: 28/8/2022 | Last updated: 28/8/2022</p>
|
||||
<p><!--Visits: 0 | -->Created: 28/8/2022 | Last updated: 22/10/2022</p>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -9,10 +9,6 @@
|
|||
<meta content="ARCHBLOX is a work in progress 2012 ROBLOX revival with a heavy emphasis on Skeuomorphic UI." property="og:description" />
|
||||
@endsection
|
||||
|
||||
@section('alert')
|
||||
<div id="alert">Note that this page does not support joining yet. If you would like to play your own game that you are currently hosting, <a style="cursor: pointer;" onclick="openClientPopup('localhost','53640',null,'join')">click here</a>.</div>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="PageTitleBar">
|
||||
<h1>Games</h1>
|
||||
|
|
@ -33,10 +29,10 @@
|
|||
<p>By <a href="{{ route('profile', 1) }}">ARCHBLOX</a></p>
|
||||
</div>
|
||||
<div class="gameitem">
|
||||
<a href="#"><img style="background-image: url(/img/reviewpending.png);" class="gamethumbnail_small"></a>
|
||||
<a href="{{ route('thomasgame')}}"><img style="background-image: url(/img/reviewpending.png);" class="gamethumbnail_small"></a>
|
||||
<br>
|
||||
<a href="#">PLACEHOLDER</a>
|
||||
<p>By <a href="{{ route('profile', 1) }}">ARCHBLOX</a></p>
|
||||
<a href="#">dummy place</a>
|
||||
<p>By <a href="{{ route('thomasgame')}}">Thomas</a></p>
|
||||
</div>
|
||||
<div class="gameitem">
|
||||
<a href="#"><img style="background-image: url(/img/reviewpending.png);" class="gamethumbnail_small"></a>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
@extends('layouts.app')
|
||||
@section('title')
|
||||
<title>dummy place - {{ env('APP_NAME') }}</title>
|
||||
@endsection
|
||||
@section('titlediscord')
|
||||
<meta content="dummy place - {{ env('APP_NAME') }}" property="og:title" />
|
||||
@endsection
|
||||
@section('descdiscord')
|
||||
<meta content="ARCHBLOX is a work in progress 2012 ROBLOX revival with a heavy emphasis on Skeuomorphic UI." property="og:description" />
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="content_special" id="gametopcontainer">
|
||||
<div class="leftgamecontainer">
|
||||
<img style="background-image: url(/img/reviewpending.png);" class="gamethumbnail_large">
|
||||
</div>
|
||||
<div class="rightgamecontainer">
|
||||
<div>
|
||||
<h1>dummy place</h1>
|
||||
<p>By <a href="{{ route('profile', 2) }}">Thomas</a></p>
|
||||
</div>
|
||||
<div>
|
||||
<p>This place requires Radmin VPN.</p>
|
||||
<button onclick="openClientPopup('26.220.138.92','53640', null, 'join')" class="greenbutton" style="width: 100%;height: 50px;font-size: x-large;align-content: center;">Play</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<p>Test joining place. Will not be open forever.</p>
|
||||
<br>
|
||||
<div style="text-align: center;">
|
||||
<p><!--Visits: 0 | -->Created: 22/10/2022 | Last updated: 22/10/2022</p>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -31,6 +31,10 @@ Route::get('/incomplete', [App\Http\Controllers\PageController::class, 'incomple
|
|||
Route::get('/not-approved', [App\Http\Controllers\PageController::class, 'notapproved'])->name('notapproved');
|
||||
Route::get('/maintenance', [App\Http\Controllers\PageController::class, 'maintenance'])->name('maintenance');
|
||||
Route::get('/buttonhell', [App\Http\Controllers\PageController::class, 'buttonhell'])->name('buttonhell');
|
||||
// games & game page
|
||||
Route::get('/games', [App\Http\Controllers\PageController::class, 'games'])->name('games');
|
||||
Route::get('/games/1', [App\Http\Controllers\PageController::class, 'gamepage'])->name('gamepage');
|
||||
Route::get('/games/2', [App\Http\Controllers\PageController::class, 'thomasgame'])->name('thomasgame');
|
||||
|
||||
// Must be logged in
|
||||
Route::middleware(['auth'])->group(function () {
|
||||
|
|
@ -42,11 +46,6 @@ Route::middleware(['auth'])->group(function () {
|
|||
// avatar
|
||||
Route::get('/my/avatar', [App\Http\Controllers\PageController::class, 'avatar'])->name('avatar');
|
||||
|
||||
// games & game page
|
||||
Route::get('/games', [App\Http\Controllers\PageController::class, 'games'])->name('games');
|
||||
Route::get('/games/1', [App\Http\Controllers\PageController::class, 'gamepage'])->name('gamepage');
|
||||
|
||||
|
||||
// Rate limit + auth
|
||||
Route::middleware(['throttle:feed_post'])->group(function () {
|
||||
Route::post('/home', [App\Http\Controllers\HomeController::class, 'feed_post'])->name('feed_post'); // Posting to the feed
|
||||
|
|
|
|||
Loading…
Reference in New Issue