diff --git a/marble/client/scripts/default.bind.cs b/marble/client/scripts/default.bind.cs index edf5740..34fabe4 100644 --- a/marble/client/scripts/default.bind.cs +++ b/marble/client/scripts/default.bind.cs @@ -42,7 +42,7 @@ moveMap.bindCmd(keyboard, "escape", "", "escapeFromGame();"); // respawn key TODO: make this one remapable // usage: bindCmd(device, action, onDown, onUp) -moveMap.bindCmd(keyboard, "r", "", "if($Game::State !$= \"End\"){ClientGroup.getObject(0).respawnPlayer();}"); +moveMap.bindCmd(keyboard, "r", "", "if($gamePaused) {return;} if($Game::State !$= \"End\"){LocalClientConnection.respawnPlayer();}"); //------------------------------------------------------------------------------ // Movement Keys diff --git a/marble/client/scripts/game.cs b/marble/client/scripts/game.cs index bfad3a1..2969e1e 100644 --- a/marble/client/scripts/game.cs +++ b/marble/client/scripts/game.cs @@ -157,7 +157,7 @@ function formatTime(%time) //%hundredthOne = mFloor(%hundredth % 10); //%hundredthTen = mFloor(%hundredth / 10); %thousandthOne = mFloor(%thousandth % 10); - %thousandthTen = mFloor(mFloor(%thousandth / 10) % 10); + %thousandthTen = mFloor(%thousandth / 10) % 10; %thousandthHundred = mFloor(%thousandth / 100); return %isNeg @ %minutesTen @ %minutesOne @ ":" @ diff --git a/marble/client/scripts/playgui.cs b/marble/client/scripts/playgui.cs index d0999cb..9abec96 100644 --- a/marble/client/scripts/playgui.cs +++ b/marble/client/scripts/playgui.cs @@ -214,25 +214,27 @@ function PlayGui::updateControls(%this) %drawNeg = true; } - %hundredth = mFloor((%et % 1000) / 10); + %thousandth = mFloor(%et % 1000); %totalSeconds = mFloor(%et / 1000); %seconds = %totalSeconds % 60; - %minutes = (%totalSeconds - %seconds) / 60; + %minutes = %totalSeconds / 60; - %secondsOne = %seconds % 10; - %secondsTen = (%seconds - %secondsOne) / 10; - %minutesOne = %minutes % 10; - %minutesTen = (%minutes - %minutesOne) / 10; - %hundredthOne = %hundredth % 10; - %hundredthTen = (%hundredth - %hundredthOne) / 10; + %secondsOne = mFloor(%seconds % 10); + %secondsTen = mFloor(%seconds / 10); + %minutesOne = mFloor(%minutes % 10); + %minutesTen = mFloor(%minutes / 10); + %thousandthOne = mFloor(%thousandth % 10); + %thousandthTen = mFloor(%thousandth / 10) % 10; + %thousandthHundred = mFloor(%thousandth / 100); // Update the controls Min_Ten.setNumber(%minutesTen); Min_One.setNumber(%minutesOne); Sec_Ten.setNumber(%secondsTen); Sec_One.setNumber(%secondsOne); - Sec_Tenth.setNumber(%hundredthTen); - Sec_Hundredth.setNumber(%hundredthOne); + Sec_Tenth.setNumber(%thousandthHundred); + Sec_Hundredth.setNumber(%thousandthTen); + Sec_Thousandth.setNumber(%thousandthOne); PG_NegSign.setVisible(%drawNeg); } diff --git a/marble/client/scripts/tttimer.cs b/marble/client/scripts/tttimer.cs index f145b6f..70ea30b 100644 --- a/marble/client/scripts/tttimer.cs +++ b/marble/client/scripts/tttimer.cs @@ -53,7 +53,7 @@ function initTMTimer() { profile = "GuiDefaultProfile"; horizSizing = "center"; //HiGuy: Center it! - position = mfloor((getWord(PlayGui.getExtent(), 0) - 237) / 2) SPC "62"; + position = mfloor((getWord(PlayGui.getExtent(), 0) - 227) / 2) SPC "52"; extent = "237 46"; visible = "0"; @@ -105,6 +105,12 @@ function initTMTimer() { extent = "30 38"; bitmap = $Con::Root @ "/client/ui/game/numbers/0_green.png"; }; + new GuiBitmapCtrl(TMSec_Thousandth) { + profile = "GuiDefaultProfile"; + position = "172 3"; + extent = "30 38"; + bitmap = $Con::Root @ "/client/ui/game/numbers/0_green.png"; + }; }; //HiGuy: Add it to the PlayGui PlayGui.add(PG_TMTimer); @@ -154,25 +160,27 @@ package TMTimer { PG_TMTimer.setVisible(%bt); if (%bt) { - %hundredth = mFloor((%bt % 1000) / 10); + %thousandth = mFloor(%bt % 1000); %totalSeconds = mFloor(%bt / 1000); - %seconds = %totalSeconds % 60; - %minutes = (%totalSeconds - %seconds) / 60; + %seconds = mFloor(%totalSeconds % 60); + %minutes = mFloor(%totalSeconds / 60); - %secondsOne = %seconds % 10; - %secondsTen = (%seconds - %secondsOne) / 10; - %minutesOne = %minutes % 10; - %minutesTen = (%minutes - %minutesOne) / 10; - %hundredthOne = %hundredth % 10; - %hundredthTen = (%hundredth - %hundredthOne) / 10; + %secondsOne = mFloor(%seconds % 10); + %secondsTen = mFloor(%seconds / 10); + %minutesOne = mFloor(%minutes % 10); + %minutesTen = mFloor(%minutes / 10); + %thousandthOne = mFloor(%thousandth % 10); + %thousandthTen = mFloor(%thousandth / 10) % 10; + %thousandthHundred = mFloor(%thousandth / 100); // Update the controls TMMin_Ten.setTimeNumber(%minutesTen); TMMin_One.setTimeNumber(%minutesOne); TMSec_Ten.setTimeNumber(%secondsTen); TMSec_One.setTimeNumber(%secondsOne); - TMSec_Tenth.setTimeNumber(%hundredthTen); - TMSec_Hundredth.setTimeNumber(%hundredthOne); + TMSec_Tenth.setTimeNumber(%thousandthHundred); + TMSec_Hundredth.setTimeNumber(%thousandthTen); + TMSec_Thousandth.setTimeNumber(%thousandthOne); TMMinSec_Colon.setTimeNumber("colon"); TMMinSec_Point.setTimeNumber("point"); diff --git a/marble/client/ui/ExitGameDlg.gui b/marble/client/ui/ExitGameDlg.gui index 4a9a832..7c958bd 100644 --- a/marble/client/ui/ExitGameDlg.gui +++ b/marble/client/ui/ExitGameDlg.gui @@ -80,6 +80,7 @@ new GuiControl(ExitGameDlg) { command = "Canvas.popDialog(ExitGameDlg); resumeGame(); restartLevel();"; helpTag = "0"; text = "button"; + accelerator = "r"; groupNum = "-1"; buttonType = "PushButton"; bitmap = "common/ui/restart"; diff --git a/marble/client/ui/playGui.gui b/marble/client/ui/playGui.gui index 2bfd203..051d0e2 100644 --- a/marble/client/ui/playGui.gui +++ b/marble/client/ui/playGui.gui @@ -200,7 +200,7 @@ new GameTSCtrl(PlayGUI) { horizSizing = "center"; vertSizing = "bottom"; position = "215 1"; - extent = "210 58"; + extent = "230 58"; minExtent = "8 8"; visible = "1"; helpTag = "0"; @@ -301,6 +301,18 @@ new GameTSCtrl(PlayGUI) { bitmap = "./game/numbers/5.png"; wrap = "0"; }; + new GuiBitmapCtrl(Sec_Thousandth) { + profile = "GuiDefaultProfile"; + horizSizing = "right"; + vertSizing = "bottom"; + position = "192 0"; + extent = "43 55"; + minExtent = "8 8"; + visible = "1"; + helpTag = "0"; + bitmap = "./game/numbers/9.png"; + wrap = "0"; + }; new GuiBitmapCtrl(PG_NegSign) { profile = "GuiDefaultProfile"; horizSizing = "right"; diff --git a/marble/data/interiors/EGYPTIAN004.jpg b/marble/data/interiors/EGYPTIAN004.jpg index 6f61438..0e56d7f 100644 Binary files a/marble/data/interiors/EGYPTIAN004.jpg and b/marble/data/interiors/EGYPTIAN004.jpg differ diff --git a/marble/data/interiors/EGYPTIAN005.jpg b/marble/data/interiors/EGYPTIAN005.jpg index 6f61438..f1e7713 100644 Binary files a/marble/data/interiors/EGYPTIAN005.jpg and b/marble/data/interiors/EGYPTIAN005.jpg differ diff --git a/marble/data/interiors/EGYPTIAN022.jpg b/marble/data/interiors/EGYPTIAN022.jpg index 6f61438..a277748 100644 Binary files a/marble/data/interiors/EGYPTIAN022.jpg and b/marble/data/interiors/EGYPTIAN022.jpg differ diff --git a/marble/data/interiors/FLOOR2.jpg b/marble/data/interiors/FLOOR2.jpg index 6f61438..39098f2 100644 Binary files a/marble/data/interiors/FLOOR2.jpg and b/marble/data/interiors/FLOOR2.jpg differ diff --git a/marble/data/interiors/FLOOR4.jpg b/marble/data/interiors/FLOOR4.jpg index 6f61438..eb8e28d 100644 Binary files a/marble/data/interiors/FLOOR4.jpg and b/marble/data/interiors/FLOOR4.jpg differ diff --git a/marble/data/interiors/GREEK_ROMAN002.jpg b/marble/data/interiors/GREEK_ROMAN002.jpg index 6f61438..b59fd3c 100644 Binary files a/marble/data/interiors/GREEK_ROMAN002.jpg and b/marble/data/interiors/GREEK_ROMAN002.jpg differ diff --git a/marble/data/interiors/GREEK_ROMAN003.jpg b/marble/data/interiors/GREEK_ROMAN003.jpg index 6f61438..132e2c4 100644 Binary files a/marble/data/interiors/GREEK_ROMAN003.jpg and b/marble/data/interiors/GREEK_ROMAN003.jpg differ diff --git a/marble/data/interiors/Image1.jpg b/marble/data/interiors/Image1.jpg index 6f61438..6518dcb 100644 Binary files a/marble/data/interiors/Image1.jpg and b/marble/data/interiors/Image1.jpg differ diff --git a/marble/data/interiors/Image2.jpg b/marble/data/interiors/Image2.jpg index 6f61438..8737ba7 100644 Binary files a/marble/data/interiors/Image2.jpg and b/marble/data/interiors/Image2.jpg differ diff --git a/marble/data/interiors/Image3.jpg b/marble/data/interiors/Image3.jpg index 6f61438..9fe2cab 100644 Binary files a/marble/data/interiors/Image3.jpg and b/marble/data/interiors/Image3.jpg differ diff --git a/marble/data/interiors/Image3_x_edged.jpg b/marble/data/interiors/Image3_x_edged.jpg index 6f61438..d03b33a 100644 Binary files a/marble/data/interiors/Image3_x_edged.jpg and b/marble/data/interiors/Image3_x_edged.jpg differ diff --git a/marble/data/interiors/Image4.jpg b/marble/data/interiors/Image4.jpg index 6f61438..6ce0807 100644 Binary files a/marble/data/interiors/Image4.jpg and b/marble/data/interiors/Image4.jpg differ diff --git a/marble/data/interiors/Snow.jpg b/marble/data/interiors/Snow.jpg index 6f61438..f0e58b3 100644 Binary files a/marble/data/interiors/Snow.jpg and b/marble/data/interiors/Snow.jpg differ diff --git a/marble/data/interiors/TV-DM2.JPG b/marble/data/interiors/TV-DM2.JPG index 6f61438..5c1ff51 100644 Binary files a/marble/data/interiors/TV-DM2.JPG and b/marble/data/interiors/TV-DM2.JPG differ diff --git a/marble/data/interiors/WoodChair1.JPG b/marble/data/interiors/WoodChair1.JPG index 6f61438..d320e00 100644 Binary files a/marble/data/interiors/WoodChair1.JPG and b/marble/data/interiors/WoodChair1.JPG differ diff --git a/marble/data/interiors/blue_grid.jpg b/marble/data/interiors/blue_grid.jpg index 64d8fbe..4d77957 100644 Binary files a/marble/data/interiors/blue_grid.jpg and b/marble/data/interiors/blue_grid.jpg differ diff --git a/marble/data/interiors/checkerboard2.jpg b/marble/data/interiors/checkerboard2.jpg index 5ee8a17..f60cd5c 100644 Binary files a/marble/data/interiors/checkerboard2.jpg and b/marble/data/interiors/checkerboard2.jpg differ diff --git a/marble/data/interiors/cyberspace1.jpg b/marble/data/interiors/cyberspace1.jpg index 6f61438..a505aeb 100644 Binary files a/marble/data/interiors/cyberspace1.jpg and b/marble/data/interiors/cyberspace1.jpg differ diff --git a/marble/data/interiors/cyberspace2.jpg b/marble/data/interiors/cyberspace2.jpg index 6f61438..a505aeb 100644 Binary files a/marble/data/interiors/cyberspace2.jpg and b/marble/data/interiors/cyberspace2.jpg differ diff --git a/marble/data/interiors/cyberspace3.jpg b/marble/data/interiors/cyberspace3.jpg index 6f61438..a505aeb 100644 Binary files a/marble/data/interiors/cyberspace3.jpg and b/marble/data/interiors/cyberspace3.jpg differ diff --git a/marble/data/interiors/cyberspace4.jpg b/marble/data/interiors/cyberspace4.jpg index 6f61438..a505aeb 100644 Binary files a/marble/data/interiors/cyberspace4.jpg and b/marble/data/interiors/cyberspace4.jpg differ diff --git a/marble/data/interiors/cyberspace5.jpg b/marble/data/interiors/cyberspace5.jpg index 6f61438..a505aeb 100644 Binary files a/marble/data/interiors/cyberspace5.jpg and b/marble/data/interiors/cyberspace5.jpg differ diff --git a/marble/data/interiors/floor3.jpg b/marble/data/interiors/floor3.jpg index 6f61438..fb14208 100644 Binary files a/marble/data/interiors/floor3.jpg and b/marble/data/interiors/floor3.jpg differ diff --git a/marble/data/interiors/grass1.jpg b/marble/data/interiors/grass1.jpg index 6f61438..876d1a4 100644 Binary files a/marble/data/interiors/grass1.jpg and b/marble/data/interiors/grass1.jpg differ diff --git a/marble/data/interiors/grass_border_strait.jpg b/marble/data/interiors/grass_border_strait.jpg index 6f61438..8ac4be8 100644 Binary files a/marble/data/interiors/grass_border_strait.jpg and b/marble/data/interiors/grass_border_strait.jpg differ diff --git a/marble/data/interiors/graveStone.jpg b/marble/data/interiors/graveStone.jpg index 6f61438..f7a88b9 100644 Binary files a/marble/data/interiors/graveStone.jpg and b/marble/data/interiors/graveStone.jpg differ diff --git a/marble/data/interiors/graveStoneText.jpg b/marble/data/interiors/graveStoneText.jpg index 6f61438..cc14803 100644 Binary files a/marble/data/interiors/graveStoneText.jpg and b/marble/data/interiors/graveStoneText.jpg differ diff --git a/marble/data/interiors/graystone2.jpg b/marble/data/interiors/graystone2.jpg index 6f61438..ecefef6 100644 Binary files a/marble/data/interiors/graystone2.jpg and b/marble/data/interiors/graystone2.jpg differ diff --git a/marble/data/interiors/graywithblackdots.jpg b/marble/data/interiors/graywithblackdots.jpg index 6f61438..420c705 100644 Binary files a/marble/data/interiors/graywithblackdots.jpg and b/marble/data/interiors/graywithblackdots.jpg differ diff --git a/marble/data/interiors/greenball.jpg b/marble/data/interiors/greenball.jpg index 6f61438..a47cb84 100644 Binary files a/marble/data/interiors/greenball.jpg and b/marble/data/interiors/greenball.jpg differ diff --git a/marble/data/interiors/greenleaves.jpg b/marble/data/interiors/greenleaves.jpg index 6f61438..89c4aef 100644 Binary files a/marble/data/interiors/greenleaves.jpg and b/marble/data/interiors/greenleaves.jpg differ diff --git a/marble/data/interiors/grey.jpg b/marble/data/interiors/grey.jpg index 6f61438..624fce8 100644 Binary files a/marble/data/interiors/grey.jpg and b/marble/data/interiors/grey.jpg differ diff --git a/marble/data/interiors/grid_mbublue.jpg b/marble/data/interiors/grid_mbublue.jpg index 6f61438..feeb770 100644 Binary files a/marble/data/interiors/grid_mbublue.jpg and b/marble/data/interiors/grid_mbublue.jpg differ diff --git a/marble/data/interiors/iron1.jpg b/marble/data/interiors/iron1.jpg index 6f61438..54c28ca 100644 Binary files a/marble/data/interiors/iron1.jpg and b/marble/data/interiors/iron1.jpg differ diff --git a/marble/data/interiors/iron1_x_fuschia.jpg b/marble/data/interiors/iron1_x_fuschia.jpg index 6f61438..bdf52c7 100644 Binary files a/marble/data/interiors/iron1_x_fuschia.jpg and b/marble/data/interiors/iron1_x_fuschia.jpg differ diff --git a/marble/data/interiors/iron1_x_grey.jpg b/marble/data/interiors/iron1_x_grey.jpg index 6f61438..217bb40 100644 Binary files a/marble/data/interiors/iron1_x_grey.jpg and b/marble/data/interiors/iron1_x_grey.jpg differ diff --git a/marble/data/interiors/jplat1.jpg b/marble/data/interiors/jplat1.jpg index 6f61438..f8a6757 100644 Binary files a/marble/data/interiors/jplat1.jpg and b/marble/data/interiors/jplat1.jpg differ diff --git a/marble/data/interiors/maroon.jpg b/marble/data/interiors/maroon.jpg index 6f61438..0ead5ba 100644 Binary files a/marble/data/interiors/maroon.jpg and b/marble/data/interiors/maroon.jpg differ diff --git a/marble/data/interiors/parts/halftubes/blue_grid.jpg b/marble/data/interiors/parts/halftubes/blue_grid.jpg index c18dc71..986fb83 100644 Binary files a/marble/data/interiors/parts/halftubes/blue_grid.jpg and b/marble/data/interiors/parts/halftubes/blue_grid.jpg differ diff --git a/marble/data/interiors/parts/halftubes/blue_grid2.jpg b/marble/data/interiors/parts/halftubes/blue_grid2.jpg index 340cf22..f51e331 100644 Binary files a/marble/data/interiors/parts/halftubes/blue_grid2.jpg and b/marble/data/interiors/parts/halftubes/blue_grid2.jpg differ diff --git a/marble/data/interiors/parts/tubes/blue_grid.jpg b/marble/data/interiors/parts/tubes/blue_grid.jpg index ad9949c..6acb1dd 100644 Binary files a/marble/data/interiors/parts/tubes/blue_grid.jpg and b/marble/data/interiors/parts/tubes/blue_grid.jpg differ diff --git a/marble/data/interiors/parts/tubes/blue_grid2.jpg b/marble/data/interiors/parts/tubes/blue_grid2.jpg index 340cf22..f51e331 100644 Binary files a/marble/data/interiors/parts/tubes/blue_grid2.jpg and b/marble/data/interiors/parts/tubes/blue_grid2.jpg differ diff --git a/marble/data/interiors/parts/white.jpg b/marble/data/interiors/parts/white.jpg index f6e4e51..535d4b4 100644 Binary files a/marble/data/interiors/parts/white.jpg and b/marble/data/interiors/parts/white.jpg differ diff --git a/marble/data/interiors/sand005.jpg b/marble/data/interiors/sand005.jpg index 6f61438..b587447 100644 Binary files a/marble/data/interiors/sand005.jpg and b/marble/data/interiors/sand005.jpg differ diff --git a/marble/data/interiors/sand014.jpg b/marble/data/interiors/sand014.jpg index 6f61438..ff1097d 100644 Binary files a/marble/data/interiors/sand014.jpg and b/marble/data/interiors/sand014.jpg differ diff --git a/marble/data/interiors/sidewalk.jpg b/marble/data/interiors/sidewalk.jpg index 6f61438..2ffb562 100644 Binary files a/marble/data/interiors/sidewalk.jpg and b/marble/data/interiors/sidewalk.jpg differ diff --git a/marble/data/interiors/snow_gravel.jpg b/marble/data/interiors/snow_gravel.jpg index 6f61438..8420854 100644 Binary files a/marble/data/interiors/snow_gravel.jpg and b/marble/data/interiors/snow_gravel.jpg differ diff --git a/marble/data/interiors/snowpine1.jpg b/marble/data/interiors/snowpine1.jpg index 6f61438..5078292 100644 Binary files a/marble/data/interiors/snowpine1.jpg and b/marble/data/interiors/snowpine1.jpg differ diff --git a/marble/data/interiors/snowwindow1.jpg b/marble/data/interiors/snowwindow1.jpg index 6f61438..45e6c76 100644 Binary files a/marble/data/interiors/snowwindow1.jpg and b/marble/data/interiors/snowwindow1.jpg differ diff --git a/marble/data/interiors/snowwood1.jpg b/marble/data/interiors/snowwood1.jpg index 6f61438..8ff2831 100644 Binary files a/marble/data/interiors/snowwood1.jpg and b/marble/data/interiors/snowwood1.jpg differ diff --git a/marble/data/interiors/solid_black.jpg b/marble/data/interiors/solid_black.jpg index 6f61438..db0e412 100644 Binary files a/marble/data/interiors/solid_black.jpg and b/marble/data/interiors/solid_black.jpg differ diff --git a/marble/data/interiors/solid_dkblue.jpg b/marble/data/interiors/solid_dkblue.jpg index 6f61438..c753fcd 100644 Binary files a/marble/data/interiors/solid_dkblue.jpg and b/marble/data/interiors/solid_dkblue.jpg differ diff --git a/marble/data/interiors/solid_dkbrown.jpg b/marble/data/interiors/solid_dkbrown.jpg index 6f61438..6527dfa 100644 Binary files a/marble/data/interiors/solid_dkbrown.jpg and b/marble/data/interiors/solid_dkbrown.jpg differ diff --git a/marble/data/interiors/solid_dkgreen.jpg b/marble/data/interiors/solid_dkgreen.jpg index 6f61438..f4dace3 100644 Binary files a/marble/data/interiors/solid_dkgreen.jpg and b/marble/data/interiors/solid_dkgreen.jpg differ diff --git a/marble/data/interiors/solid_dkred.jpg b/marble/data/interiors/solid_dkred.jpg index 6f61438..f029446 100644 Binary files a/marble/data/interiors/solid_dkred.jpg and b/marble/data/interiors/solid_dkred.jpg differ diff --git a/marble/data/interiors/solid_dktan.jpg b/marble/data/interiors/solid_dktan.jpg index 6f61438..c039179 100644 Binary files a/marble/data/interiors/solid_dktan.jpg and b/marble/data/interiors/solid_dktan.jpg differ diff --git a/marble/data/interiors/solid_dkwhite.jpg b/marble/data/interiors/solid_dkwhite.jpg index 6f61438..6c9a7b4 100644 Binary files a/marble/data/interiors/solid_dkwhite.jpg and b/marble/data/interiors/solid_dkwhite.jpg differ diff --git a/marble/data/interiors/solid_dkyellow.jpg b/marble/data/interiors/solid_dkyellow.jpg index 6f61438..f341c30 100644 Binary files a/marble/data/interiors/solid_dkyellow.jpg and b/marble/data/interiors/solid_dkyellow.jpg differ diff --git a/marble/data/interiors/solid_ltblue.jpg b/marble/data/interiors/solid_ltblue.jpg index 6f61438..240b691 100644 Binary files a/marble/data/interiors/solid_ltblue.jpg and b/marble/data/interiors/solid_ltblue.jpg differ diff --git a/marble/data/interiors/solid_ltbrown.jpg b/marble/data/interiors/solid_ltbrown.jpg index 6f61438..30a512b 100644 Binary files a/marble/data/interiors/solid_ltbrown.jpg and b/marble/data/interiors/solid_ltbrown.jpg differ diff --git a/marble/data/interiors/solid_ltgreen.jpg b/marble/data/interiors/solid_ltgreen.jpg index 6f61438..6453635 100644 Binary files a/marble/data/interiors/solid_ltgreen.jpg and b/marble/data/interiors/solid_ltgreen.jpg differ diff --git a/marble/data/interiors/solid_ltgrey.jpg b/marble/data/interiors/solid_ltgrey.jpg index 6f61438..31fc2a0 100644 Binary files a/marble/data/interiors/solid_ltgrey.jpg and b/marble/data/interiors/solid_ltgrey.jpg differ diff --git a/marble/data/interiors/solid_ltred.jpg b/marble/data/interiors/solid_ltred.jpg index 6f61438..922e627 100644 Binary files a/marble/data/interiors/solid_ltred.jpg and b/marble/data/interiors/solid_ltred.jpg differ diff --git a/marble/data/interiors/solid_lttan.jpg b/marble/data/interiors/solid_lttan.jpg index 6f61438..fd9f425 100644 Binary files a/marble/data/interiors/solid_lttan.jpg and b/marble/data/interiors/solid_lttan.jpg differ diff --git a/marble/data/interiors/solid_lttan_inbounds.jpg b/marble/data/interiors/solid_lttan_inbounds.jpg index 6f61438..fd9f425 100644 Binary files a/marble/data/interiors/solid_lttan_inbounds.jpg and b/marble/data/interiors/solid_lttan_inbounds.jpg differ diff --git a/marble/data/interiors/solid_ltyellow.jpg b/marble/data/interiors/solid_ltyellow.jpg index 6f61438..d8f4439 100644 Binary files a/marble/data/interiors/solid_ltyellow.jpg and b/marble/data/interiors/solid_ltyellow.jpg differ diff --git a/marble/data/interiors/solid_mdwhite.jpg b/marble/data/interiors/solid_mdwhite.jpg index 6f61438..3f91791 100644 Binary files a/marble/data/interiors/solid_mdwhite.jpg and b/marble/data/interiors/solid_mdwhite.jpg differ diff --git a/marble/data/interiors/stonewall_grasstop.jpg b/marble/data/interiors/stonewall_grasstop.jpg index 6f61438..403c185 100644 Binary files a/marble/data/interiors/stonewall_grasstop.jpg and b/marble/data/interiors/stonewall_grasstop.jpg differ diff --git a/marble/data/interiors/trail_warning.jpg b/marble/data/interiors/trail_warning.jpg index 6f61438..12c3fea 100644 Binary files a/marble/data/interiors/trail_warning.jpg and b/marble/data/interiors/trail_warning.jpg differ diff --git a/marble/data/interiors/tube_cool.jpg b/marble/data/interiors/tube_cool.jpg index 1f2085e..4d77957 100644 Binary files a/marble/data/interiors/tube_cool.jpg and b/marble/data/interiors/tube_cool.jpg differ diff --git a/marble/data/interiors/tube_neutral.jpg b/marble/data/interiors/tube_neutral.jpg index 3931cc2..ed95297 100644 Binary files a/marble/data/interiors/tube_neutral.jpg and b/marble/data/interiors/tube_neutral.jpg differ diff --git a/marble/data/interiors/tube_warm.jpg b/marble/data/interiors/tube_warm.jpg index bd55c4b..3672084 100644 Binary files a/marble/data/interiors/tube_warm.jpg and b/marble/data/interiors/tube_warm.jpg differ diff --git a/marble/data/interiors/white.jpg b/marble/data/interiors/white.jpg index eca572c..535d4b4 100644 Binary files a/marble/data/interiors/white.jpg and b/marble/data/interiors/white.jpg differ diff --git a/marble/data/interiors/whiteball.jpg b/marble/data/interiors/whiteball.jpg index 6f61438..535d4b4 100644 Binary files a/marble/data/interiors/whiteball.jpg and b/marble/data/interiors/whiteball.jpg differ diff --git a/marble/data/interiors/whiteedge.jpg b/marble/data/interiors/whiteedge.jpg index 6f61438..2ef5bf0 100644 Binary files a/marble/data/interiors/whiteedge.jpg and b/marble/data/interiors/whiteedge.jpg differ diff --git a/marble/data/interiors/whitewood.jpg b/marble/data/interiors/whitewood.jpg index 6f61438..b57afcb 100644 Binary files a/marble/data/interiors/whitewood.jpg and b/marble/data/interiors/whitewood.jpg differ diff --git a/marble/data/interiors/wood1.jpg b/marble/data/interiors/wood1.jpg index 6f61438..0cf5381 100644 Binary files a/marble/data/interiors/wood1.jpg and b/marble/data/interiors/wood1.jpg differ diff --git a/marble/data/interiors/wrappingpaper1.jpg b/marble/data/interiors/wrappingpaper1.jpg index 6f61438..f7dd89b 100644 Binary files a/marble/data/interiors/wrappingpaper1.jpg and b/marble/data/interiors/wrappingpaper1.jpg differ diff --git a/marble/data/interiors/yellow_woodend.jpg b/marble/data/interiors/yellow_woodend.jpg index 6f61438..7fd3a50 100644 Binary files a/marble/data/interiors/yellow_woodend.jpg and b/marble/data/interiors/yellow_woodend.jpg differ diff --git a/marble/data/interiors/yellow_woodside.jpg b/marble/data/interiors/yellow_woodside.jpg index 6f61438..8438ccd 100644 Binary files a/marble/data/interiors/yellow_woodside.jpg and b/marble/data/interiors/yellow_woodside.jpg differ diff --git a/marble/data/interiors/yellow_woodvert.jpg b/marble/data/interiors/yellow_woodvert.jpg index 6f61438..c016857 100644 Binary files a/marble/data/interiors/yellow_woodvert.jpg and b/marble/data/interiors/yellow_woodvert.jpg differ diff --git a/marble/data/interiors/yellowball.jpg b/marble/data/interiors/yellowball.jpg index 6f61438..917628c 100644 Binary files a/marble/data/interiors/yellowball.jpg and b/marble/data/interiors/yellowball.jpg differ diff --git a/marble/data/shapes/_missing.jpg b/marble/data/shapes/_missing.jpg new file mode 100644 index 0000000..eca572c Binary files /dev/null and b/marble/data/shapes/_missing.jpg differ diff --git a/marble/data/shapes/blah.jpg b/marble/data/shapes/blah.jpg index 393f999..583bb83 100644 Binary files a/marble/data/shapes/blah.jpg and b/marble/data/shapes/blah.jpg differ diff --git a/marble/data/shapes/box01test.jpg b/marble/data/shapes/box01test.jpg new file mode 100644 index 0000000..eca572c Binary files /dev/null and b/marble/data/shapes/box01test.jpg differ diff --git a/marble/data/shapes/hazards/friction_high.jpg b/marble/data/shapes/hazards/friction_high.jpg index a2376d7..d6162e4 100644 Binary files a/marble/data/shapes/hazards/friction_high.jpg and b/marble/data/shapes/hazards/friction_high.jpg differ diff --git a/marble/data/shapes/hazards/friction_low.jpg b/marble/data/shapes/hazards/friction_low.jpg index e3cc333..0db6a15 100644 Binary files a/marble/data/shapes/hazards/friction_low.jpg and b/marble/data/shapes/hazards/friction_low.jpg differ diff --git a/marble/data/shapes/hazards/friction_low2.jpg b/marble/data/shapes/hazards/friction_low2.jpg index 41c4b62..933ae02 100644 Binary files a/marble/data/shapes/hazards/friction_low2.jpg and b/marble/data/shapes/hazards/friction_low2.jpg differ diff --git a/marble/data/shapes/hazards/friction_none.jpg b/marble/data/shapes/hazards/friction_none.jpg index b6e66e0..04a813f 100644 Binary files a/marble/data/shapes/hazards/friction_none.jpg and b/marble/data/shapes/hazards/friction_none.jpg differ diff --git a/marble/data/shapes/hazards/friction_none2.jpg b/marble/data/shapes/hazards/friction_none2.jpg index 90b969e..36482e0 100644 Binary files a/marble/data/shapes/hazards/friction_none2.jpg and b/marble/data/shapes/hazards/friction_none2.jpg differ diff --git a/marble/data/shapes/signs/custom_woodblockside.jpg b/marble/data/shapes/signs/custom_woodblockside.jpg index f42a30c..c0af2b2 100644 Binary files a/marble/data/shapes/signs/custom_woodblockside.jpg and b/marble/data/shapes/signs/custom_woodblockside.jpg differ diff --git a/marble/data/shapes/signs/signwood.jpg b/marble/data/shapes/signs/signwood.jpg index f42a30c..c0af2b2 100644 Binary files a/marble/data/shapes/signs/signwood.jpg and b/marble/data/shapes/signs/signwood.jpg differ diff --git a/marble/data/shapes/signwood.jpg b/marble/data/shapes/signwood.jpg index 59e526f..a62df82 100644 Binary files a/marble/data/shapes/signwood.jpg and b/marble/data/shapes/signwood.jpg differ diff --git a/marble/server/scripts/easterEgg.cs b/marble/server/scripts/easterEgg.cs index 15d54c8..5272341 100644 --- a/marble/server/scripts/easterEgg.cs +++ b/marble/server/scripts/easterEgg.cs @@ -22,7 +22,6 @@ datablock AudioProfile(GotThatEggAlready) function EasterEgg::onPickup(%this,%obj,%user,%amount) { - echo("onPickup"); Parent::onPickup(%this,%obj,%user,%amount); %user.client.onFoundEasterEgg(%amount); return true;