Skip to content

Ignore testing backportage #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 57 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
836cf52
Changed version number to 1.5
ccw808 Jan 17, 2015
1f74758
Incremented netcode.
ccw808 Jan 17, 2015
d884fe5
Changed default target dir to 'C:\Program Files\MTA San Andreas 1.5'
ccw808 Jan 17, 2015
745daca
Added XP compatibility to vs2013 projects
ccw808 Jan 20, 2015
4564bc5
Compile fix for vs120_xp
ccw808 Jan 20, 2015
7d737f4
Compile fix #2 for vs120_xp (Disabled Windows Games Explorer)
ccw808 Jan 20, 2015
f2c4dab
Nightly build compile fixes
ccw808 Jan 20, 2015
875ec27
Fixed #8733 (Custom weapons deal two times the expected damage)
sbx320 Jan 22, 2015
2ffbdda
Nightly build compile fixes (x64)
ccw808 Jan 24, 2015
4bac1b7
Merged revision(s) 7031-7032 from branches/1.4.1:
ccw808 Jan 26, 2015
ba95f86
Fixed #8722 (startResource in onResourcePreStart allows you to start …
ccw808 Jan 26, 2015
ace3d70
Fixed uptime issues (more than 49 days) for pickup spawning.
ccw808 Jan 26, 2015
5c3ac59
Fixed #8379 (Client-side File:read(0) doesn't return a warning while …
sbx320 Jan 27, 2015
9c9b5a0
Set the SubSystem option for some projects to fix build warnings
sbx320 Jan 27, 2015
6915bc1
Applied source patch #8737 (PointLight Creation) by Lex128.
ccw808 Jan 28, 2015
514dfa1
Netcode incremented. Older server builds will need updating.
ccw808 Jan 28, 2015
02bc237
Addendum to r7048 (Applied source patch #8737 (PointLight Creation) b…
ccw808 Jan 28, 2015
ddb6f9f
Fixed unreliable getTickCount (introduced in r7032)
ccw808 Jan 29, 2015
d676c65
Fixed unreliable getTickCount #2 (introduced in r7032)
ccw808 Feb 3, 2015
ee9cea6
Fixed #8747 (MTA forgets user made resources related binds)
ccw808 Feb 3, 2015
f838ed8
Reintegrated CEF branch into the trunk (revisions 6378-7062)
jushar Feb 3, 2015
72b26e0
Moved CEF data files to Shared/data/MTA San Andreas
jushar Feb 3, 2015
2381442
Moved icudtl.dat (CEF unicode support) to the correct folder
jushar Feb 3, 2015
36f47fe
Added/fixed nightly build configuration
jushar Feb 3, 2015
d9f9278
Add option to prepend network packets with 'mtasa' to help (or make w…
ccw808 Feb 5, 2015
3211f1f
Possible crash fix.
ccw808 Feb 5, 2015
33ff259
64 bit compile fix
ccw808 Feb 5, 2015
331159c
Improved CEF resource path security by introducing a custom URI schem…
jushar Feb 6, 2015
9d0adae
Fixed a crash when setting a train's model to a non-train model
sbx320 Feb 7, 2015
479b5e0
OOP: Fix #8752 and marker type functions
qaisjp Feb 10, 2015
482217f
Fixed crash when changing text in really, really, ridiculously thin l…
ccw808 Feb 11, 2015
9f3a23a
Fixed a crash when destroying browsers
jushar Feb 13, 2015
82b3aa2
Fixed a crash which can be caused by errors in localised stings.
ccw808 Feb 13, 2015
a93011e
Fixed #8750 (Guest account data is saved to database) Patch from Bpb_…
ccw808 Feb 13, 2015
806dec0
Added option to disable progress spinner animation
ccw808 Feb 14, 2015
9e6ed08
Added event identifiers to simplify CEF event debugging
jushar Feb 14, 2015
4e89dd8
Removed network encryption option as it's enabled all the time now (f…
ccw808 Feb 16, 2015
dd73303
Fixed #8766 (Player's parent element can't be resetted) Patch from Ne…
ccw808 Feb 16, 2015
39e862c
Fixed unicode path issues with VS2013 runtime
ccw808 Feb 18, 2015
45c264e
Test for using data strings in engineLoadCOL/TXD/DFF. Based on patch …
ccw808 Feb 18, 2015
be0e3d5
Fixed #8757 ([Request] setBanNick to identify the player, if the ban …
ccw808 Feb 25, 2015
c5bd849
Fixed #8771 (getElementSyncer issue)
ccw808 Feb 26, 2015
6f1ec0d
Some tick count wrap fixes and a debug command for up-time issues:
ccw808 Feb 26, 2015
6d345ff
Fixed #8767 - changed setCameraTarget to use the camera position inst…
jushar Feb 28, 2015
a0cc6c5
Fixed #8516 (Lua function errors give no resource or file when compiled)
ccw808 Mar 3, 2015
f2ad376
Added traincross1 (id: 1373) object to the allowed object list server…
jushar Mar 4, 2015
7ae2957
Sped up getAccountData() by caching values in random access memory
ccw808 Mar 6, 2015
edfeeb4
Removed some unused code.
ccw808 Mar 6, 2015
3bd948e
Improved logging of localization problems
ccw808 Mar 14, 2015
17078a2
Fixed nightly build
ccw808 Mar 21, 2015
96312d6
Fixed nightly build #2
ccw808 Mar 21, 2015
47f2f7c
Create .gitignore
qaisjp Mar 21, 2015
ea3b824
Update README.md
qaisjp Mar 21, 2015
84df7ef
Add ''reload'' to startup (#8620)
qaisjp Mar 21, 2015
d407f91
Create CONTRIBUTING.md
qaisjp Mar 21, 2015
ca6be18
Fixed #8753 (destroy projectile with bind = crash)
jushar Mar 21, 2015
1597570
Fix #8745 (getResourceConfig crash the server)
sbx320 Mar 21, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
257 changes: 257 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,257 @@
#### General system gitignore contents:
#### Source: https://raw.githubusercontent.com/github/gitignore/master/Global/Linux.gitignore
*~

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

#### General system gitignore contents:
#### Source: https://raw.githubusercontent.com/github/gitignore/master/Global/Windows.gitignore
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

#### General system gitignore contents:
#### Source: https://raw.githubusercontent.com/github/gitignore/master/Global/OSX.gitignore
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

#### Visual Studio gitignore contents:
#### Source: https://raw.githubusercontent.com/github/gitignore/master/VisualStudio.gitignore
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/

# Visual Studo 2015 cache/options directory
.vs/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding addin-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config

# Windows Azure Build Output
csx/
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
*.[Cc]ache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Our project's code repository can be found on the [multitheftauto/mtasa-blue](https://github.com/multitheftauto/mtasa-blue/) Git repository at [GitHub](https://github.com/). We are always looking for new developers, so if you're interested, here are some useful links:

* [Nightly Builds](https://nightly.mtasa.com/)
* [Bugtracker Roadmap](https://bugs.mtasa.com/roadmap_page.php)
* [Wiki Roadmap](https://wiki.mtasa.com/wiki/Roadmap)

Before committing, please review the [coding guidelines](https://wiki.mtasa.com/index.php?title=Coding_guidelines).
104 changes: 104 additions & 0 deletions MTA10/ceflauncher/CCefApp.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*****************************************************************************
*
* PROJECT: Multi Theft Auto v1.0
* (Shared logic for modifications)
* LICENSE: See LICENSE in the top level directory
* FILE: ceflauncher/CCefApp.h
* PURPOSE: CefApp implementation
*
*****************************************************************************/
#include <cef3/include/cef_app.h>
#include <string>
#include <sstream>
#include "V8Helpers.h"
using V8Helpers::CV8Handler;

class CCefApp : public CefApp, public CefRenderProcessHandler
{
public:
CCefApp() {}
virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler () override { return this; };

// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
virtual void OnFocusedNodeChanged ( CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node ) override
{
if ( m_bHasInputFocus )
{
if ( node )
return;

// Tell MTA that we lost input focus
auto message = CefProcessMessage::Create ( "InputFocus" );
message->GetArgumentList ()->SetBool ( 0, false );
browser->SendProcessMessage ( PID_BROWSER, message );

// Set variable to ensure that the event does not trigger twice
m_bHasInputFocus = false;
return;
}
else
{
if ( !node )
return;

if ( node->GetType () == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT && !node->GetFormControlElementType ().empty () )
{
auto message = CefProcessMessage::Create ( "InputFocus" );
message->GetArgumentList ()->SetBool ( 0, true );
browser->SendProcessMessage ( PID_BROWSER, message );

// Set variable to ensure that the event does not trigger twice
m_bHasInputFocus = true;
}
}
}

virtual void OnRegisterCustomSchemes ( CefRefPtr < CefSchemeRegistrar > registrar ) override
{
// Register custom MTA scheme (has to be called in all proceseses)
registrar->AddCustomScheme ( "mtalocal", false, false, false );
}


// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E) //
virtual void OnContextCreated ( CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context ) override
{
// Get global object and create a v8 handler instance
CefRefPtr<CefV8Value> globalObject = context->GetGlobal ();
CefRefPtr<CV8Handler> handler = new CV8Handler ( frame );

// Create MTA object
CefRefPtr<CefV8Value> mtaObject = CefV8Value::CreateObject ( NULL );

// Bind V8 --> C++ functions
V8Helpers::BindV8Function ( handler, mtaObject, "triggerEvent", Javascript_triggerEvent );
// V8Helpers::BindV8Function ( handler, mtaObject, "triggerServerEvent", Javascript_triggerServerEvent ); // Disabled due to security issues

// Assign mtaObject to global object
globalObject->SetValue ( "mta", mtaObject, V8_PROPERTY_ATTRIBUTE_NONE );
}

static void Javascript_triggerEvent ( CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments )
{
if ( arguments.size () == 0 )
return;

CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments ( "TriggerLuaEvent", arguments );
frame->GetBrowser ()->SendProcessMessage ( PID_BROWSER, message );
}

static void Javascript_triggerServerEvent ( CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments )
{
if ( arguments.size () == 0 )
return;

CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments ( "TriggerServerLuaEvent", arguments );
frame->GetBrowser ()->SendProcessMessage ( PID_BROWSER, message );
}

public:
IMPLEMENT_REFCOUNTING(CCefApp);

private:
bool m_bHasInputFocus = false;
};
Loading