Skip to content

Commit

Permalink
Made new graphics
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ohmnivore
Ohmnivore committed Jun 9, 2014
1 parent 131d40a commit 23831c0
Show file tree
Hide file tree
Showing 34 changed files with 435 additions and 14 deletions.
Binary file modified Client/export/windows/cpp/bin/SkullRush.exe
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 @@
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.xmlR2R3R4R16goR0y27:shared%2Fimages%2Fcrate.pngR2R6R4R17goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2R6R4R18goR0y28:shared%2Fimages%2Fflag_b.pngR2R6R4R19goR0y29:shared%2Fimages%2Fflag_bh.pngR2R6R4R20goR0y28:shared%2Fimages%2Fflag_g.pngR2R6R4R21goR0y29:shared%2Fimages%2Fflag_gh.pngR2R6R4R22goR0y28:shared%2Fimages%2Fflag_n.pngR2R6R4R23goR0y28:shared%2Fimages%2Fflag_r.pngR2R6R4R24goR0y29:shared%2Fimages%2Fflag_rh.pngR2R6R4R25goR0y28:shared%2Fimages%2Fflag_y.pngR2R6R4R26goR0y29:shared%2Fimages%2Fflag_yh.pngR2R6R4R27goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R6R4R28goR0y32:shared%2Fimages%2Fgridtiles3.pngR2R6R4R29goR0y32:shared%2Fimages%2Fgridtiles4.pngR2R6R4R30goR0y25:shared%2Fimages%2Fgun.pngR2R6R4R31goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R6R4R32goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R6R4R33goR0y42:shared%2Fimages%2Fgun_eviscerator_icon.pngR2R6R4R34goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R6R4R35goR0y39:shared%2Fimages%2Fgun_launcher_icon.pngR2R6R4R36goR0y37:shared%2Fimages%2Fgun_peacekeeper.pngR2R6R4R37goR0y44:shared%2Fimages%2Fgun_peacekeeper_bullet.pngR2R6R4R38goR0y42:shared%2Fimages%2Fgun_peacekeeper_icon.pngR2R6R4R39goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R6R4R40goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R6R4R41goR0y39:shared%2Fimages%2Fgun_splasher_icon.pngR2R6R4R42goR0y32:shared%2Fimages%2Fplayerblue.pngR2R6R4R43goR0y33:shared%2Fimages%2Fplayergreen.pngR2R6R4R44goR0y31:shared%2Fimages%2Fplayerred.pngR2R6R4R45goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R6R4R46goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R6R4R47goR0y32:shared%2Fimages%2Fscifitiles.pngR2R6R4R48goR0y27:shared%2Fimages%2Ftrail.pngR2R6R4R49goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R50goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R51goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R52goR0y23:crashdumper%2F%2Fos.batR2R3R4R53goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R54goR0y28:assets%2Fsounds%2Fflixel.oggR2R55R4R56goR0y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR2R6R4R57goR0y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR2R6R4R58goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR2R6R4R59goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR2R6R4R60goR0y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR2R6R4R61goR0y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR2R6R4R62goR0y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR2R6R4R63goR0y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR2R6R4R64goR0y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR2R6R4R65goR0y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR2R6R4R66goR0y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR2R6R4R67goR0y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR2R6R4R68goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR2R6R4R69goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR2R6R4R70goR0y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR2R6R4R71goR0y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR2R6R4R72goR0y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR2R6R4R73goR0y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR2R6R4R74goR0y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR2R6R4R75goR0y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR2R6R4R76goR0y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR2R6R4R77goR0y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR2R6R4R78goR0y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR2R6R4R79goR0y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR2R6R4R80goR0y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR2R6R4R81goR0y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR2R6R4R82goR0y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR2R3R4R83goR0y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR2R3R4R84goR0y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR2R3R4R85gh
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.xmlR2R3R4R16goR0y32:shared%2Fimages%2Fbackground.pngR2R6R4R17goR0y27:shared%2Fimages%2Fcrate.pngR2R6R4R18goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2R6R4R19goR0y28:shared%2Fimages%2Fflag_b.pngR2R6R4R20goR0y29:shared%2Fimages%2Fflag_bh.pngR2R6R4R21goR0y28:shared%2Fimages%2Fflag_g.pngR2R6R4R22goR0y29:shared%2Fimages%2Fflag_gh.pngR2R6R4R23goR0y28:shared%2Fimages%2Fflag_n.pngR2R6R4R24goR0y28:shared%2Fimages%2Fflag_r.pngR2R6R4R25goR0y29:shared%2Fimages%2Fflag_rh.pngR2R6R4R26goR0y28:shared%2Fimages%2Fflag_y.pngR2R6R4R27goR0y29:shared%2Fimages%2Fflag_yh.pngR2R6R4R28goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R6R4R29goR0y25:shared%2Fimages%2Fgun.pngR2R6R4R30goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R6R4R31goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R6R4R32goR0y42:shared%2Fimages%2Fgun_eviscerator_icon.pngR2R6R4R33goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R6R4R34goR0y39:shared%2Fimages%2Fgun_launcher_icon.pngR2R6R4R35goR0y37:shared%2Fimages%2Fgun_peacekeeper.pngR2R6R4R36goR0y44:shared%2Fimages%2Fgun_peacekeeper_bullet.pngR2R6R4R37goR0y42:shared%2Fimages%2Fgun_peacekeeper_icon.pngR2R6R4R38goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R6R4R39goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R6R4R40goR0y39:shared%2Fimages%2Fgun_splasher_icon.pngR2R6R4R41goR0y32:shared%2Fimages%2Fplayerblue.pngR2R6R4R42goR0y33:shared%2Fimages%2Fplayergreen.pngR2R6R4R43goR0y31:shared%2Fimages%2Fplayerred.pngR2R6R4R44goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R6R4R45goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R6R4R46goR0y32:shared%2Fimages%2Fscifitiles.pngR2R6R4R47goR0y37:shared%2Fimages%2Fscifitiles_copy.pngR2R6R4R48goR0y27:shared%2Fimages%2Ftrail.pngR2R6R4R49goR0y35:shared%2Ftiledefs%2Fscifitiles.jsonR2R3R4R50goR0y35:shared%2Ftiledefs%2FSkullSolid.tsetR2R3R4R51goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R52goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R53goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R54goR0y23:crashdumper%2F%2Fos.batR2R3R4R55goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R56goR0y28:assets%2Fsounds%2Fflixel.oggR2R57R4R58goR0y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR2R6R4R59goR0y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR2R6R4R60goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR2R6R4R61goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR2R6R4R62goR0y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR2R6R4R63goR0y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR2R6R4R64goR0y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR2R6R4R65goR0y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR2R6R4R66goR0y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR2R6R4R67goR0y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR2R6R4R68goR0y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR2R6R4R69goR0y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR2R6R4R70goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR2R6R4R71goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR2R6R4R72goR0y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR2R6R4R73goR0y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR2R6R4R74goR0y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR2R6R4R75goR0y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR2R6R4R76goR0y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR2R6R4R77goR0y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR2R6R4R78goR0y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR2R6R4R79goR0y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR2R6R4R80goR0y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR2R6R4R81goR0y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR2R6R4R82goR0y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR2R6R4R83goR0y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR2R6R4R84goR0y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR2R3R4R85goR0y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR2R3R4R86goR0y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR2R3R4R87gh
Binary file added Client/export/windows/cpp/bin/shared/images/background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Client/export/windows/cpp/bin/shared/images/scifitiles.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Client/export/windows/cpp/bin/shared/images/scifitiles_copy.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Client/export/windows/cpp/bin/shared/tiledefs/SkullSolid.tset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"name":"Solid","type":"Checkbox"}]
1 change: 1 addition & 0 deletions Client/export/windows/cpp/bin/shared/tiledefs/scifitiles.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[["scifitiles",16,16,1],["Solid"],[0],[[[true],80]],[770,771,772,773,774,775,776,777,778,779,140,141,142,783,784,145,146,659,780,781,782,785,660,661,175,176,177,178,691,180,181,694,695,696,697,690,699,692,693,578,579,580,581,70,71,456,457,458,459,460,461,462,455,464,465,210,211,212,213,214,215,216,217,218,219,468,469,589,590,463,582,466,467,105,106,698,624,625,626,591],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]
10 changes: 7 additions & 3 deletions Client/source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class PlayState extends FlxState
public var current_map:String;

public var collidemap:FlxTilemap;
public var background:FlxGroup;
public var maps:FlxGroup;
public var under_players:FlxGroup;
public var bullets:FlxGroup;
Expand Down Expand Up @@ -82,6 +83,8 @@ class PlayState extends FlxState
Reg.state = this;
playermap = new Map<Int, Player>();

background = new FlxGroup();
add(background);
maps = new FlxGroup();
add(maps);
under_players = new FlxGroup();
Expand Down Expand Up @@ -219,6 +222,7 @@ class PlayState extends FlxState

current_map = MapName;

OgmoLoader.initTilemaps();
OgmoLoader.loadXML(MapString, this);
//SkullClient.initClient();

Expand Down Expand Up @@ -304,10 +308,10 @@ class PlayState extends FlxState

Reg.client.updatePingText();

FlxG.collide(tocollide, collidemap);
FlxG.collide(bullets, collidemap, bulletCollide);
FlxG.collide(tocollide, maps); //collidemap
FlxG.collide(bullets, maps, bulletCollide); //collidemap
FlxG.overlap(bullets, players, bulletCollidePl);
FlxG.collide(emitters, collidemap);
FlxG.collide(emitters, maps); //collidemap

if (player != null)
updatePlayer();
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ At the moment the source code is a mess. I'll take a couple of weeks to clean al

## Gameplay:
* New maps
* custom tiles
* custom tiles (spikes and such things)


## Bugs:
Expand All @@ -57,7 +57,8 @@ At the moment the source code is a mess. I'll take a couple of weeks to clean al


## Assets:
* Replace place-holder art by actual art
* Make crosshairs
* Make background more dynamic
* Make custom flixel-ui theme
* Find music and sounds

Expand Down
24 changes: 24 additions & 0 deletions Server/assets/maps/ProjectDef.oep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@
<Color A="255" R="0" G="0" B="0" />
<ExportMode>Bitstring</ExportMode>
</LayerDefinition>
<LayerDefinition xsi:type="TileLayerDefinition">
<Name>TilesSciFiBack</Name>
<Grid>
<Width>16</Width>
<Height>16</Height>
</Grid>
<ScrollFactor>
<X>1</X>
<Y>1</Y>
</ScrollFactor>
<ExportMode>CSV</ExportMode>
</LayerDefinition>
<LayerDefinition xsi:type="TileLayerDefinition">
<Name>TilesSciFi</Name>
<Grid>
Expand All @@ -53,6 +65,18 @@
</ScrollFactor>
<ExportMode>CSV</ExportMode>
</LayerDefinition>
<LayerDefinition xsi:type="TileLayerDefinition">
<Name>TilesSciFiFore</Name>
<Grid>
<Width>16</Width>
<Height>16</Height>
</Grid>
<ScrollFactor>
<X>1</X>
<Y>1</Y>
</ScrollFactor>
<ExportMode>CSV</ExportMode>
</LayerDefinition>
<LayerDefinition xsi:type="EntityLayerDefinition">
<Name>Entities</Name>
<Grid>
Expand Down
Loading

0 comments on commit 23831c0

Please sign in to comment.