Skip to content

Commit

Permalink
Updated openfl to 2.0.0, and flixel to 3.3.4
Browse files Browse the repository at this point in the history 
Also integrated crashdumper for investigating mysterious crashes
  • Loading branch information
@Ohmnivore
Ohmnivore committed Jun 3, 2014
1 parent 6cee713 commit 10e00cf
Show file tree
Hide file tree
Showing 30 changed files with 94 additions and 25 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
haxe
obj
flash
log
9 changes: 5 additions & 4 deletions Client/Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@

<!--------------------------------LIBRARIES------------------------------------->

<haxelib name="openfl" version="1.4.0"/>
<haxelib name="lime" version="0.9.7"/>
<haxelib name="flixel" version="3.3.3"/>
<haxelib name="crashdumper"/>
<haxelib name="openfl" version="2.0.0"/>
<haxelib name="lime" version="1.0.0"/>
<haxelib name="flixel" version="3.3.4"/>
<haxelib name="flixel-ui"/>
<haxelib name="flixel-addons"/>

Expand Down Expand Up @@ -72,5 +73,5 @@
<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />

<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
<haxedef name="FLX_NO_DEBUG" unless="debug" />
<!--haxedef name="FLX_NO_DEBUG" unless="debug" /-->
</project>
Binary file removed Client/export/windows/cpp/bin/EnetTesting.ndll.old
View file
Binary file not shown.
Binary file modified Client/export/windows/cpp/bin/SkullRush.exe
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion Client/export/windows/cpp/bin/config.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
version=0.1.4
version=0.1.5
name=Ohmnivore
team=1
ip=
masterserver=http://skullrush.elementfx.com/laravel/public/
fullscreen=false
showping=true
crashdump=true
2 changes: 2 additions & 0 deletions Client/export/windows/cpp/bin/crashdumper/cpu.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
wmic cpu get name /Value
4 changes: 4 additions & 0 deletions Client/export/windows/cpp/bin/crashdumper/gpu.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off
wmic PATH Win32_VideoController get name /Value
echo ,
wmic PATH Win32_VideoController get driverversion /Value
2 changes: 2 additions & 0 deletions Client/export/windows/cpp/bin/crashdumper/memory.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
wmic OS get TotalVisibleMemorySize /Value
2 changes: 2 additions & 0 deletions Client/export/windows/cpp/bin/crashdumper/os.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call ver
Binary file modified Client/export/windows/cpp/bin/lime.ndll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Client/export/windows/cpp/bin/manifest
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
acy16:openfl.AssetDatay4:pathy34:assets%2Fdata%2Fdata-goes-here.txty4:typewy16:openfl.AssetTypey4:TEXT:0y2:idR2gcR0R1y29:assets%2Fgfx%2Fui%2Fpalma.pngR3wR4y5:IMAGE:0R6R7gcR0R1y29:assets%2Fgfx%2Fui%2Fpalma.psdR3wR4y6:BINARY:0R6R9gcR0R1y34:assets%2Fgfx%2Fui%2Ftitle_back.pngR3wR4R8:0R6R11gcR0R1y36:assets%2Fimages%2Fimages-go-here.txtR3wR4R5:0R6R12gcR0R1y17:assets%2Flogo.psdR3wR4R10:0R6R13gcR0R1y36:assets%2Fmusic%2Fmusic-goes-here.txtR3wR4R5:0R6R14gcR0R1y36:assets%2Fsounds%2Fsounds-go-here.txtR3wR4R5:0R6R15gcR0R1y30:assets%2Fxml%2Fempty_popup.xmlR3wR4R5:0R6R16gcR0R1y23:assets%2Fxml%2Fhome.xmlR3wR4R5:0R6R17gcR0R1y30:assets%2Fxml%2F_ui_globals.xmlR3wR4R5:0R6R18gcR0R1y39:shared%2Fimages%2Fexplosionparticle.pngR3wR4R8:0R6R19gcR0R1y28:shared%2Fimages%2Fflag_b.pngR3wR4R8:0R6R20gcR0R1y29:shared%2Fimages%2Fflag_bh.pngR3wR4R8:0R6R21gcR0R1y28:shared%2Fimages%2Fflag_g.pngR3wR4R8:0R6R22gcR0R1y29:shared%2Fimages%2Fflag_gh.pngR3wR4R8:0R6R23gcR0R1y28:shared%2Fimages%2Fflag_r.pngR3wR4R8:0R6R24gcR0R1y29:shared%2Fimages%2Fflag_rh.pngR3wR4R8:0R6R25gcR0R1y28:shared%2Fimages%2Fflag_y.pngR3wR4R8:0R6R26gcR0R1y29:shared%2Fimages%2Fflag_yh.pngR3wR4R8:0R6R27gcR0R1y32:shared%2Fimages%2Fgridtiles2.pngR3wR4R8:0R6R28gcR0R1y32:shared%2Fimages%2Fgridtiles3.pngR3wR4R8:0R6R29gcR0R1y32:shared%2Fimages%2Fgridtiles4.pngR3wR4R8:0R6R30gcR0R1y25:shared%2Fimages%2Fgun.pngR3wR4R8:0R6R31gcR0R1y37:shared%2Fimages%2Fgun_eviscerator.pngR3wR4R8:0R6R32gcR0R1y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR3wR4R8:0R6R33gcR0R1y41:shared%2Fimages%2Fgun_launcher_bullet.pngR3wR4R8:0R6R34gcR0R1y34:shared%2Fimages%2Fgun_splasher.pngR3wR4R8:0R6R35gcR0R1y41:shared%2Fimages%2Fgun_splasher_bullet.pngR3wR4R8:0R6R36gcR0R1y32:shared%2Fimages%2Fplayerblue.pngR3wR4R8:0R6R37gcR0R1y33:shared%2Fimages%2Fplayergreen.pngR3wR4R8:0R6R38gcR0R1y31:shared%2Fimages%2Fplayerred.pngR3wR4R8:0R6R39gcR0R1y34:shared%2Fimages%2Fplayeryellow.pngR3wR4R8:0R6R40gcR0R1y36:shared%2Fimages%2Fpowerup_health.pngR3wR4R8:0R6R41gcR0R1y32:shared%2Fimages%2Fscifitiles.pngR3wR4R8:0R6R42gcR0R1y27:shared%2Fimages%2Ftrail.pngR3wR4R8:0R6R43gcR0R1y26:assets%2Fsounds%2Fbeep.oggR3wR4y5:SOUND:0R6R44gcR0R1y28:assets%2Fsounds%2Fflixel.oggR3wR4R45:0R6R46gcR0R1y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR3wR4R8:0R6R47gcR0R1y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR3wR4R8:0R6R48gcR0R1y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR3wR4R8:0R6R49gcR0R1y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR3wR4R8:0R6R50gcR0R1y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR3wR4R8:0R6R51gcR0R1y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR3wR4R8:0R6R52gcR0R1y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR3wR4R8:0R6R53gcR0R1y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR3wR4R8:0R6R54gcR0R1y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR3wR4R8:0R6R55gcR0R1y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR3wR4R8:0R6R56gcR0R1y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR3wR4R8:0R6R57gcR0R1y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR3wR4R8:0R6R58gcR0R1y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR3wR4R8:0R6R59gcR0R1y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR3wR4R8:0R6R60gcR0R1y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR3wR4R8:0R6R61gcR0R1y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR3wR4R8:0R6R62gcR0R1y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR3wR4R8:0R6R63gcR0R1y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR3wR4R8:0R6R64gcR0R1y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR3wR4R8:0R6R65gcR0R1y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR3wR4R8:0R6R66gcR0R1y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR3wR4R8:0R6R67gcR0R1y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR3wR4R8:0R6R68gcR0R1y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR3wR4R8:0R6R69gcR0R1y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR3wR4R8:0R6R70gcR0R1y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR3wR4R8:0R6R71gcR0R1y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR3wR4R8:0R6R72gcR0R1y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR3wR4R5:0R6R73gcR0R1y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR3wR4R5:0R6R74gcR0R1y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR3wR4R5:0R6R75gh
aoy4:pathy34:assets%2Fdata%2Fdata-goes-here.txty4:typey4:TEXTy2:idR1goR0y29:assets%2Fgfx%2Fui%2Fpalma.pngR2y5:IMAGER4R5goR0y29:assets%2Fgfx%2Fui%2Fpalma.psdR2y6:BINARYR4R7goR0y34:assets%2Fgfx%2Fui%2Ftitle_back.pngR2R6R4R9goR0y36:assets%2Fimages%2Fimages-go-here.txtR2R3R4R10goR0y17:assets%2Flogo.psdR2R8R4R11goR0y36:assets%2Fmusic%2Fmusic-goes-here.txtR2R3R4R12goR0y36:assets%2Fsounds%2Fsounds-go-here.txtR2R3R4R13goR0y30:assets%2Fxml%2Fempty_popup.xmlR2R3R4R14goR0y23:assets%2Fxml%2Fhome.xmlR2R3R4R15goR0y30:assets%2Fxml%2F_ui_globals.xmlR2R3R4R16goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2R6R4R17goR0y28:shared%2Fimages%2Fflag_b.pngR2R6R4R18goR0y29:shared%2Fimages%2Fflag_bh.pngR2R6R4R19goR0y28:shared%2Fimages%2Fflag_g.pngR2R6R4R20goR0y29:shared%2Fimages%2Fflag_gh.pngR2R6R4R21goR0y28:shared%2Fimages%2Fflag_r.pngR2R6R4R22goR0y29:shared%2Fimages%2Fflag_rh.pngR2R6R4R23goR0y28:shared%2Fimages%2Fflag_y.pngR2R6R4R24goR0y29:shared%2Fimages%2Fflag_yh.pngR2R6R4R25goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R6R4R26goR0y32:shared%2Fimages%2Fgridtiles3.pngR2R6R4R27goR0y32:shared%2Fimages%2Fgridtiles4.pngR2R6R4R28goR0y25:shared%2Fimages%2Fgun.pngR2R6R4R29goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R6R4R30goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R6R4R31goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R6R4R32goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R6R4R33goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R6R4R34goR0y32:shared%2Fimages%2Fplayerblue.pngR2R6R4R35goR0y33:shared%2Fimages%2Fplayergreen.pngR2R6R4R36goR0y31:shared%2Fimages%2Fplayerred.pngR2R6R4R37goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R6R4R38goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R6R4R39goR0y32:shared%2Fimages%2Fscifitiles.pngR2R6R4R40goR0y27:shared%2Fimages%2Ftrail.pngR2R6R4R41goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R42goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R43goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R44goR0y23:crashdumper%2F%2Fos.batR2R3R4R45goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R46goR0y28:assets%2Fsounds%2Fflixel.oggR2R47R4R48goR0y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR2R6R4R49goR0y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR2R6R4R50goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR2R6R4R51goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR2R6R4R52goR0y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR2R6R4R53goR0y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR2R6R4R54goR0y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR2R6R4R55goR0y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR2R6R4R56goR0y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR2R6R4R57goR0y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR2R6R4R58goR0y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR2R6R4R59goR0y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR2R6R4R60goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR2R6R4R61goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR2R6R4R62goR0y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR2R6R4R63goR0y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR2R6R4R64goR0y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR2R6R4R65goR0y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR2R6R4R66goR0y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR2R6R4R67goR0y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR2R6R4R68goR0y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR2R6R4R69goR0y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR2R6R4R70goR0y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR2R6R4R71goR0y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR2R6R4R72goR0y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR2R6R4R73goR0y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR2R6R4R74goR0y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR2R3R4R75goR0y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR2R3R4R76goR0y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR2R3R4R77gh
13 changes: 13 additions & 0 deletions Client/source/MenuState.hx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package;

import crashdumper.CrashDumper;
import enet.Message;
import flixel.addons.display.FlxZoomCamera;
import flixel.FlxG;
Expand All @@ -14,8 +15,10 @@ import enet.ENet;
import enet.ENetEvent;
import flixel.util.FlxTimer;
import networkobj.NReg;
import sys.io.File;
import ui.Home;
import ui.Settings;
import crashdumper.SessionData;

/**
* A FlxState which can be used for the game's menu.
Expand All @@ -30,6 +33,16 @@ class MenuState extends FlxState
*/
override public function create():Void
{
//CrashDumper stuff:
if (Assets.config.get("crashdump") == "true")
{
var unique_id:String = SessionData.generateID("skullrush_client_");
var crashDumper = new CrashDumper(unique_id);

var configFile:String = File.getContent("config.txt");
crashDumper.session.files.set("config.txt", configFile);
}

// Set a background color
FlxG.cameras.bgColor = 0xff131c1b;
// Show the mouse (in case it hasn't been disabled)
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ At the moment the source code is a mess. I'll take a couple of weeks to clean al
* [openfl](http://www.openfl.org/)
* [msignal](https://github.com/massiveinteractive/msignal)
* [mloader](https://github.com/massiveinteractive/mloader)
* [crashdumper](https://github.com/larsiusprime/crashdumper)
* [FlashDevelop](http://www.flashdevelop.org/)
* [Ogmo Editor](http://www.ogmoeditor.com/)
* [TileSetter](https://github.com/Ohmnivore/TileSetter)
Expand Down
9 changes: 5 additions & 4 deletions Server/Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@

<!--------------------------------LIBRARIES------------------------------------->

<haxelib name="openfl" version="1.4.0"/>
<haxelib name="lime" version="0.9.7"/>
<haxelib name="flixel" version="3.3.3"/>
<haxelib name="crashdumper"/>
<haxelib name="openfl" version="2.0.0"/>
<haxelib name="lime" version="1.0.0"/>
<haxelib name="flixel" version="3.3.4"/>
<haxelib name="flixel-addons"/>

<!--haxelib name="gameconsole"/-->
Expand All @@ -66,5 +67,5 @@
<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />

<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
<haxedef name="FLX_NO_DEBUG" unless="debug" />
<!--haxedef name="FLX_NO_DEBUG" unless="debug" /-->
</project>
Binary file removed Server/export/windows/cpp/bin/EnetTesting.ndll.old.old.old
View file
Binary file not shown.
Binary file modified Server/export/windows/cpp/bin/SkullRushServer.exe
View file
Binary file not shown.
Binary file removed Server/export/windows/cpp/bin/assets/images/gridtiles2.png
View file
Binary file not shown.
Empty file removed Server/export/windows/cpp/bin/assets/images/images-go-here.txt
View file
Empty file.
4 changes: 3 additions & 1 deletion Server/export/windows/cpp/bin/config.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
version=0.1.4
version=0.1.5

############################
#basic variables

crashdump=true

manifesturl=null
#https://dl.dropboxusercontent.com/u/229424261/skullrush/manifest.json

Expand Down
2 changes: 2 additions & 0 deletions Server/export/windows/cpp/bin/crashdumper/cpu.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
wmic cpu get name /Value
4 changes: 4 additions & 0 deletions Server/export/windows/cpp/bin/crashdumper/gpu.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off
wmic PATH Win32_VideoController get name /Value
echo ,
wmic PATH Win32_VideoController get driverversion /Value
2 changes: 2 additions & 0 deletions Server/export/windows/cpp/bin/crashdumper/memory.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
wmic OS get TotalVisibleMemorySize /Value
2 changes: 2 additions & 0 deletions Server/export/windows/cpp/bin/crashdumper/os.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call ver
Binary file removed Server/export/windows/cpp/bin/hxudp.ndll.old.old
View file
Binary file not shown.
Binary file modified Server/export/windows/cpp/bin/lime.ndll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Server/export/windows/cpp/bin/manifest
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
acy16:openfl.AssetDatay4:pathy34:assets%2Fdata%2Fdata-goes-here.txty4:typewy16:openfl.AssetTypey4:TEXT:0y2:idR2gcR0R1y30:assets%2Fmaps%2FProjectDef.oepR3wR4R5:0R6R7gcR0R1y24:assets%2Fmaps%2FTest.oelR3wR4R5:0R6R8gcR0R1y31:assets%2Fmaps%2FTwinCapture.oelR3wR4R5:0R6R9gcR0R1y36:assets%2Fmusic%2Fmusic-goes-here.txtR3wR4R5:0R6R10gcR0R1y36:assets%2Fsounds%2Fsounds-go-here.txtR3wR4R5:0R6R11gcR0R1y39:shared%2Fimages%2Fexplosionparticle.pngR3wR4y5:IMAGE:0R6R12gcR0R1y28:shared%2Fimages%2Fflag_b.pngR3wR4R13:0R6R14gcR0R1y29:shared%2Fimages%2Fflag_bh.pngR3wR4R13:0R6R15gcR0R1y28:shared%2Fimages%2Fflag_g.pngR3wR4R13:0R6R16gcR0R1y29:shared%2Fimages%2Fflag_gh.pngR3wR4R13:0R6R17gcR0R1y28:shared%2Fimages%2Fflag_r.pngR3wR4R13:0R6R18gcR0R1y29:shared%2Fimages%2Fflag_rh.pngR3wR4R13:0R6R19gcR0R1y28:shared%2Fimages%2Fflag_y.pngR3wR4R13:0R6R20gcR0R1y29:shared%2Fimages%2Fflag_yh.pngR3wR4R13:0R6R21gcR0R1y32:shared%2Fimages%2Fgridtiles2.pngR3wR4R13:0R6R22gcR0R1y32:shared%2Fimages%2Fgridtiles3.pngR3wR4R13:0R6R23gcR0R1y32:shared%2Fimages%2Fgridtiles4.pngR3wR4R13:0R6R24gcR0R1y25:shared%2Fimages%2Fgun.pngR3wR4R13:0R6R25gcR0R1y37:shared%2Fimages%2Fgun_eviscerator.pngR3wR4R13:0R6R26gcR0R1y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR3wR4R13:0R6R27gcR0R1y41:shared%2Fimages%2Fgun_launcher_bullet.pngR3wR4R13:0R6R28gcR0R1y34:shared%2Fimages%2Fgun_splasher.pngR3wR4R13:0R6R29gcR0R1y41:shared%2Fimages%2Fgun_splasher_bullet.pngR3wR4R13:0R6R30gcR0R1y32:shared%2Fimages%2Fplayerblue.pngR3wR4R13:0R6R31gcR0R1y33:shared%2Fimages%2Fplayergreen.pngR3wR4R13:0R6R32gcR0R1y31:shared%2Fimages%2Fplayerred.pngR3wR4R13:0R6R33gcR0R1y34:shared%2Fimages%2Fplayeryellow.pngR3wR4R13:0R6R34gcR0R1y36:shared%2Fimages%2Fpowerup_health.pngR3wR4R13:0R6R35gcR0R1y32:shared%2Fimages%2Fscifitiles.pngR3wR4R13:0R6R36gcR0R1y27:shared%2Fimages%2Ftrail.pngR3wR4R13:0R6R37gcR0R1y26:assets%2Fsounds%2Fbeep.oggR3wR4y5:SOUND:0R6R38gcR0R1y28:assets%2Fsounds%2Fflixel.oggR3wR4R39:0R6R40gh
aoy4:pathy34:assets%2Fdata%2Fdata-goes-here.txty4:typey4:TEXTy2:idR1goR0y30:assets%2Fmaps%2FProjectDef.oepR2R3R4R5goR0y24:assets%2Fmaps%2FTest.oelR2R3R4R6goR0y31:assets%2Fmaps%2FTwinCapture.oelR2R3R4R7goR0y36:assets%2Fmusic%2Fmusic-goes-here.txtR2R3R4R8goR0y36:assets%2Fsounds%2Fsounds-go-here.txtR2R3R4R9goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2y5:IMAGER4R10goR0y28:shared%2Fimages%2Fflag_b.pngR2R11R4R12goR0y29:shared%2Fimages%2Fflag_bh.pngR2R11R4R13goR0y28:shared%2Fimages%2Fflag_g.pngR2R11R4R14goR0y29:shared%2Fimages%2Fflag_gh.pngR2R11R4R15goR0y28:shared%2Fimages%2Fflag_r.pngR2R11R4R16goR0y29:shared%2Fimages%2Fflag_rh.pngR2R11R4R17goR0y28:shared%2Fimages%2Fflag_y.pngR2R11R4R18goR0y29:shared%2Fimages%2Fflag_yh.pngR2R11R4R19goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R11R4R20goR0y32:shared%2Fimages%2Fgridtiles3.pngR2R11R4R21goR0y32:shared%2Fimages%2Fgridtiles4.pngR2R11R4R22goR0y25:shared%2Fimages%2Fgun.pngR2R11R4R23goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R11R4R24goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R11R4R25goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R11R4R26goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R11R4R27goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R11R4R28goR0y32:shared%2Fimages%2Fplayerblue.pngR2R11R4R29goR0y33:shared%2Fimages%2Fplayergreen.pngR2R11R4R30goR0y31:shared%2Fimages%2Fplayerred.pngR2R11R4R31goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R11R4R32goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R11R4R33goR0y32:shared%2Fimages%2Fscifitiles.pngR2R11R4R34goR0y27:shared%2Fimages%2Ftrail.pngR2R11R4R35goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R36goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R37goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R38goR0y23:crashdumper%2F%2Fos.batR2R3R4R39goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R40goR0y28:assets%2Fsounds%2Fflixel.oggR2R41R4R42gh
12 changes: 12 additions & 0 deletions Server/source/MenuState.hx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package;

import crashdumper.CrashDumper;
import crashdumper.SessionData;
import enet.Message;
import flixel.addons.display.FlxZoomCamera;
import flixel.FlxG;
Expand Down Expand Up @@ -41,6 +43,16 @@ class MenuState extends FlxState

if (!init)
{
//CrashDumper stuff:
if (Assets.config.get("crashdump") == "true")
{
var unique_id:String = SessionData.generateID("skullrush_server_");
var crashDumper = new CrashDumper(unique_id);

var configFile:String = File.getContent("config.txt");
crashDumper.session.files.set("config.txt", configFile);
}

//Setup zoom camera
if (FlxG.camera.zoom > 1)
{
Expand Down
8 changes: 3 additions & 5 deletions Server/source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package;
import cpp.vm.Lock;
import cpp.vm.Mutex;
import cpp.vm.Thread;
import crashdumper.CrashDumper;
import crashdumper.SessionData;
import enet.ENet;
import entities.Spawn;
import flash.display.BitmapData;
Expand Down Expand Up @@ -31,6 +33,7 @@ import flixel.util.loaders.TextureRegion;
import gamemodes.BaseGamemode;
import gamemodes.DefaultHooks;
import gamemodes.FFA;
import sys.io.File;
//import gamemodes.CTF;
import gevents.ConfigEvent;
import haxe.Serializer;
Expand Down Expand Up @@ -123,11 +126,6 @@ class PlayState extends FlxState
Thread.create(thread);

Admin.hookCommands();

//GC.init();
//GC.log("This text will be logged.");
//GC.registerFunction(this.testFunction, "functionAlias");
//GC.registerObject(this, "objectAlias");
}

public function sendChatMsg():Void
Expand Down
10 changes: 5 additions & 5 deletions Shared/code/Announcer.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import haxe.Unserializer;
class Announcer extends FlxGroup
{

public function new()
public function new()
{
super();
}

public function parseMsg(Text:String, MarkupString:String):Void
{
var t:FlxTextExt = new FlxTextExt(0, 0, FlxG.width, Text, 12, false);
Expand All @@ -24,7 +24,7 @@ class Announcer extends FlxGroup

addText(t);
}

public function addMsg(Text:String, MarkupArr:Array<FlxMarkup>):Void
{
var t:FlxTextExt = new FlxTextExt(0, 0, FlxG.width, Text, 12, false, MarkupArr);
Expand All @@ -36,7 +36,7 @@ class Announcer extends FlxGroup

addText(t);
}

public function addText(Text:FlxText):Void
{
Text.setBorderStyle(FlxText.BORDER_OUTLINE, 0xff000000);
Expand All @@ -61,4 +61,4 @@ class Announcer extends FlxGroup

add(Text);
}
}
}
25 changes: 22 additions & 3 deletions Shared/code/ChatBox.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,26 @@ import flixel.util.FlxSpriteUtil;
*/
class ChatBox extends FlxSpriteGroup
{
public var opened:Bool;
public var opened(get, set):Bool;
private var _opened:Bool;

private function get_opened():Bool
{
return _opened;
}

private function set_opened(Value:Bool):Bool
{
if (Value)
{
open();
}
else
{
close();
}
return _opened;
}

public var text:FlxInputText;
public var background:FlxSprite;
Expand All @@ -29,7 +48,7 @@ class ChatBox extends FlxSpriteGroup
super(0, 0, 6);
scrollFactor.set();

opened = true;
_opened = true;

text = new FlxInputText(0, 0, FlxG.width, null, 8);
text.callback = _call;
Expand Down Expand Up @@ -113,6 +132,6 @@ class ChatBox extends FlxSpriteGroup
y -= text.height * 2;
}

opened = !opened;
_opened = !_opened;
}
}

0 comments on commit 10e00cf

Please sign in to comment.