Skip to content

Commit

Permalink
Engine & Performance Update
Browse files Browse the repository at this point in the history 
This actually has its own rendering engine now, which will make it run
much faster on all computers.
  • Loading branch information
Diogenesthecynic committed Sep 2, 2013
1 parent bb54be2 commit 0a1f05b
Show file tree
Hide file tree
Showing 89 changed files with 7,725 additions and 6,117 deletions.
22 changes: 22 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
163 changes: 163 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

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

# Build results
[Dd]ebug/
[Rr]elease/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
.builds
*.dotCover

## TODO: If you have NuGet Package Restore enabled, uncomment this
#packages/

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

# Visual Studio profiler
*.psess
*.vsp

# ReSharper is a .NET coding add-in
_ReSharper*

# 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

# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# 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



############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg

# Mac crap
.DS_Store
84 changes: 42 additions & 42 deletions Maps/World12.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ map.areas = [
new Area("Overworld", function() {
setLocationGeneration(0);

pushPreScenery("Castle", -16, castlev);
pushPreCastle();
pushPrePattern("backcloud", 0, 4, 1);
pushPreFloor(0, 0, 24);
pushPreThing(PipeSide, 80, 16, 1);
Expand All @@ -19,7 +19,6 @@ map.areas = [
new Area("Underworld", function() {
setLocationGeneration(1);

// pushPreThingsVert(Brick, 0, 0, 8, 11);
fillPreThing(Brick, 0, 8, 1, 11, 8, 8);
pushPreFloor(0, 0, 80);
makeCeiling(48, 83);
Expand All @@ -38,47 +37,48 @@ map.areas = [
pushPreThing(Brick, 232, 40, Coin);
pushPreThing(Stone, 248, 24, 1, 3);
pushPreThing(Stone, 264, 16, 1, 2);
fillPreThing(Brick, 310, 32, 1, 3, 8, 8);
pushPreThing(Brick, 318, 32);
pushPreThing(Coin, 319, 39);
fillPreThing(Brick, 326, 32, 1, 3, 8, 8);
pushPreThing(Coin, 328, 62);
pushPreThing(Brick, 334, 48);
pushPreThing(Coin, 336, 62);
pushPreThing(Brick, 342, 48);
pushPreThing(Coin, 344, 62);
pushPreThing(Koopa, 350, 12);
fillPreThing(Brick, 350, 32, 1, 3, 8, 8);
pushPreThing(Coin, 352, 62);
pushPreThing(Brick, 358, 32);
pushPreThing(Koopa, 360, 12);
fillPreThing(Brick, 366, 32, 1, 2, 8, 8);
pushPreThing(Coin, 359, 39, 8, 4);
pushPreThing(Brick, 366, 48, Star);
fillPreThing(Brick, 414, 32, 2, 5, 8, 8);
fillPreThing(Brick, 430, 16, 2, 3, 8, 8);
fillPreThing(Brick, 430, 72, 2, 2, 8, 8);
pushPreThing(Koopa, 462, 12);
fillPreThing(Brick, 462, 32, 4, 1, 8, 8);
fillPreThing(Brick, 462, 72, 5, 2, 8, 8);
fillPreThing(Coin, 463, 39, 4, 1, 8, 8);
fillPreThing(Brick, 494, 32, 2, 7, 8, 8);

fillPreThing(Brick, 312, 32, 1, 3, 8, 8);
pushPreThing(Brick, 320, 32);
pushPreThing(Coin, 321, 39);
fillPreThing(Brick, 328, 32, 1, 3, 8, 8);
fillPreThing(Coin, 330, 63, 4, 1, 8, 8);
pushPreThing(Brick, 336, 48);
pushPreThing(Brick, 344, 48);
fillPreThing(Koopa, 352, 12, 2, 1, 12);
fillPreThing(Brick, 352, 32, 1, 3, 8, 8);

// pushPreThing(Coin, 360, 62);
pushPreThing(Brick, 360, 32);
fillPreThing(Brick, 368, 32, 1, 2, 8, 8);
pushPreThing(Coin, 361, 39);
pushPreThing(Brick, 368, 48, Star);
fillPreThing(Brick, 416, 32, 2, 5, 8, 8);
fillPreThing(Brick, 432, 16, 2, 3, 8, 8);
fillPreThing(Brick, 432, 72, 2, 2, 8, 8);
fillPreThing(Brick, 464, 32, 4, 1, 8, 8);
fillPreThing(Brick, 464, 72, 5, 2, 8, 8);
fillPreThing(Coin, 465, 39, 4, 1, 8, 8);
pushPreThing(Koopa, 472, 12);
fillPreThing(Brick, 496, 32, 2, 7, 8, 8);
pushPreThing(Goomba, 494, 8);
pushPreThing(Goomba, 510, 8);
fillPreThing(Brick, 534, 72, 4, 2, 8, 8);
fillPreThing(Brick, 542, 32, 1, 5, 8, 8);
fillPreThing(Brick, 550, 32, 2, 1, 8, 8);
pushPreThing(Coin, 551, 39);
pushPreThing(Brick, 558, 40, Mushroom);
fillPreThing(Brick, 582, 32, 2, 1, 8, 8);
pushPreThing(Brick, 582, 40);
fillPreThing(Brick, 582, 48, 2, 3, 8, 8);
pushPreThing(Brick, 590, 40, Coin);
pushPreThing(Goomba, 590, 72);
fillPreThing(Brick, 608, 32, 4, 1, 8, 8);
fillPreThing(Brick, 608, 72, 4, 2, 8, 8);
pushPreThing(Goomba, 608, 40);
pushPreThing(Goomba, 618, 40);

fillPreThing(Brick, 528, 72, 4, 2, 8, 8);
fillPreThing(Brick, 536, 32, 1, 5, 8, 8);
fillPreThing(Brick, 544, 32, 2, 1, 8, 8);
pushPreThing(Coin, 545, 39);
pushPreThing(Brick, 552, 40, Mushroom);

fillPreThing(Brick, 576, 32, 2, 1, 8, 8);
pushPreThing(Brick, 576, 40);
fillPreThing(Brick, 576, 48, 2, 3, 8, 8);
pushPreThing(Brick, 584, 40, Coin);
pushPreThing(Goomba, 584, 72);

fillPreThing(Brick, 608, 32, 4, 1, 8);
fillPreThing(Brick, 608, 72, 4, 2, 8);
fillPreThing(Goomba, 608, 40, 2, 1, 12);

pushPreFloor(664, 0, 34);
fillPreThing(Brick, 672, 40, 6, 2, 8, 8);
Expand Down Expand Up @@ -148,6 +148,6 @@ map.areas = [
pushPreThing(Stone, 56, 48, 1, 6);
pushPreThing(Stone, 64, 56, 1, 7);
pushPreThing(Stone, 72, 64, 2, 8);
endCastleOutside(148, 0, castlev);
endCastleOutside(148);
})
];
6 changes: 3 additions & 3 deletions Maps/World13.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ map.areas = [
new Area("Overworld", function() {
setLocationGeneration(0);

pushPreScenery("Castle", -16, castlev);
pushPreCastle();
pushPrePattern("backcloud", 0, 4, 5);
pushPreFloor(0, 0, 16);

pushPreTree(144, 8, 4);
pushPreTree(192, 32, 8);
pushPreTree(208, 64, 5);
fillPreThing(Coin, 217, 71, 3, 1, 8, 8);
fillPreThing(Coin, 217, 71, 3, 1, 8, 8, true);
pushPreThing(Koopa, 240, 76, true);
pushPreTree(256, 8, 3);
pushPreThing(Coin, 266, 15);
Expand Down Expand Up @@ -58,6 +58,6 @@ map.areas = [
pushPreThing(Stone, 1136, 64, 1, 8);
pushPreThing(Stone, 1144, 64, 1, 8);

endCastleOutside(1220, 0, 0, 11);
endCastleOutside(1220, 0, true, 11);
})
];
36 changes: 18 additions & 18 deletions Maps/World14.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,46 @@ map.areas = [

startCastleInside();

pushPreThing(GenericStone, 40, 88, 19, 3);
pushPreThing(Stone, 40, 88, 19, 3);
pushPreFloor(40, 24, 8);
fillPreWater(104, 8, 4);

pushPreFloor(120, 24, 11);
pushPreThing(GenericStone, 184, 64, 1, 1);
pushPreThing(Stone, 184, 64, 1, 1);
pushPreThing(CastleBlock, 184, 56);
makeCeilingCastle(192, 136);
fillPreWater(208, 0, 6);

pushPreFloor(232, 24, 3);
pushPreThing(CastleBlock, 240, 24, 6, 1);
pushPreThing(CastleBlock, 240, 24, 6);
pushPreThing(Block, 240, 56, Mushroom);
fillPreWater(256, 0, 6);

pushPreThing(GenericStone, 280, 32, 37, 1);
pushPreThing(GenericStone, 280, 24, 69, 3);
pushPreThing(Stone, 280, 32, 37, 1);
pushPreThing(Stone, 280, 24, 69, 3);
pushPreFloor(280, 0, 93);
pushPreThing(GenericStone, 296, 80, 35, 3);
pushPreThing(Stone, 296, 80, 35, 3);
pushPreThing(CastleBlock, 296, 56);
pushPreThing(CastleBlock, 392, 56, 6, 1);
pushPreThing(CastleBlock, 480, 56, 6, 1);
pushPreThing(CastleBlock, 536, 56, 6, 1);
pushPreThing(CastleBlock, 608, 32, 6, 1);
pushPreThing(GenericStone, 640, 80, 1, 1);
pushPreThing(CastleBlock, 392, 56, 6);
pushPreThing(CastleBlock, 480, 56, 6);
pushPreThing(CastleBlock, 536, 56, 6);
pushPreThing(CastleBlock, 608, 32, 6);
pushPreThing(Stone, 640, 80, 1, 1);
pushPreThing(CastleBlock, 640, 72);
pushPreThing(CastleBlock, 672, 32, 6, 1);
pushPreThing(GenericStone, 704, 80, 1, 1);
pushPreThing(CastleBlock, 704, 72, 6, -1);
pushPreThing(CastleBlock, 672, 32, 6);
pushPreThing(Stone, 704, 80, 1, 1);
pushPreThing(CastleBlock, 704, 72, 6, true);
pushPreThing(CastleBlock, 736, 32);
pushPreThing(GenericStone, 776, 80, 7, 2);
pushPreThing(Stone, 776, 80, 7, 2);
pushPreThing(Block, 848, 32, Coin, true);
pushPreThing(Block, 872, 32, Coin, true);
pushPreThing(Block, 896, 32, Coin, true);
pushPreThing(Block, 856, 64, Coin, true);
pushPreThing(Block, 880, 64, Coin, true);
pushPreThing(Block, 904, 64, Coin, true);
pushPreThing(GenericStone, 928, 24, 4, 3);
pushPreThing(GenericStone, 984, 24, 5, 3);
pushPreThing(GenericStone, 984, 80, 5, 2);
pushPreThing(Stone, 928, 24, 4, 3);
pushPreThing(Stone, 984, 24, 5, 3);
pushPreThing(Stone, 984, 80, 5, 2);

endCastleInside(1024);
pushPreThing(Platform, 1108, 56, 4, [moveSliding, 1080, 1112]).object.nocollidechar = true;
Expand Down
Loading

0 comments on commit 0a1f05b

Please sign in to comment.