Skip to content

Commit

Permalink
Fixed huge bug, and fixed movement
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ohmnivore
Ohmnivore committed Nov 23, 2014
1 parent b042f92 commit 72b2207
Show file tree
Hide file tree
Showing 37 changed files with 533 additions and 164 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/crashdumper/cpu.bat
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
wmic cpu get name /Value
wmic cpu get name /Value <nul
4 changes: 2 additions & 2 deletions Client/export/windows/cpp/bin/crashdumper/gpu.bat
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
wmic PATH Win32_VideoController get name /Value
wmic PATH Win32_VideoController get name /Value <nul
echo ,
wmic PATH Win32_VideoController get driverversion /Value
wmic PATH Win32_VideoController get driverversion /Value <nul
2 changes: 1 addition & 1 deletion Client/export/windows/cpp/bin/crashdumper/memory.bat
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
wmic OS get TotalVisibleMemorySize /Value
wmic OS get TotalVisibleMemorySize /Value <nul
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:BINARYR4R7goR0y30:assets%2Fgfx%2Fui%2Fpalma3.pngR2R6R4R9goR0y36:assets%2Fimages%2Fimages-go-here.txtR2R3R4R10goR0y31:assets%2Fimages_ui%2Fbutton.pngR2R6R4R11goR0y36:assets%2Fimages_ui%2Fbutton_thin.pngR2R6R4R12goR0y31:assets%2Fimages_ui%2Fchrome.pngR2R6R4R13goR0y28:assets%2Fimages_ui%2Ftab.pngR2R6R4R14goR0y33:assets%2Fimages_ui%2Ftab_back.pngR2R6R4R15goR0y17:assets%2Flogo.psdR2R8R4R16goR0y36:assets%2Fmusic%2Fmusic-goes-here.txtR2R3R4R17goR0y36:assets%2Fsounds%2Fsounds-go-here.txtR2R3R4R18goR0y30:assets%2Fxml%2Fempty_popup.xmlR2R3R4R19goR0y23:assets%2Fxml%2Fhome.xmlR2R3R4R20goR0y32:assets%2Fxml%2Fmessage_popup.xmlR2R3R4R21goR0y30:assets%2Fxml%2F_ui_globals.xmlR2R3R4R22goR0y27:shared%2Fimages%2Farrow.pngR2R6R4R23goR0y28:shared%2Fimages%2Farrow2.pngR2R6R4R24goR0y32:shared%2Fimages%2Fbackground.pngR2R6R4R25goR0y34:shared%2Fimages%2Fbackground_s.pngR2R6R4R26goR0y27:shared%2Fimages%2Fblank.pngR2R6R4R27goR0y27:shared%2Fimages%2Fcrate.pngR2R6R4R28goR0y32:shared%2Fimages%2Fcrosshairs.pngR2R6R4R29goR0y33:shared%2Fimages%2Fcrosshairs2.pngR2R6R4R30goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2R6R4R31goR0y44:shared%2Fimages%2Fexplosionparticle_blue.pngR2R6R4R32goR0y45:shared%2Fimages%2Fexplosionparticle_green.pngR2R6R4R33goR0y46:shared%2Fimages%2Fexplosionparticle_purple.pngR2R6R4R34goR0y43:shared%2Fimages%2Fexplosionparticle_red.pngR2R6R4R35goR0y46:shared%2Fimages%2Fexplosionparticle_yellow.pngR2R6R4R36goR0y28:shared%2Fimages%2Fflag_b.pngR2R6R4R37goR0y29:shared%2Fimages%2Fflag_bh.pngR2R6R4R38goR0y28:shared%2Fimages%2Fflag_g.pngR2R6R4R39goR0y29:shared%2Fimages%2Fflag_gh.pngR2R6R4R40goR0y28:shared%2Fimages%2Fflag_n.pngR2R6R4R41goR0y28:shared%2Fimages%2Fflag_r.pngR2R6R4R42goR0y29:shared%2Fimages%2Fflag_rh.pngR2R6R4R43goR0y28:shared%2Fimages%2Fflag_y.pngR2R6R4R44goR0y29:shared%2Fimages%2Fflag_yh.pngR2R6R4R45goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R6R4R46goR0y32:shared%2Fimages%2Fgridtiles3.pngR2R6R4R47goR0y32:shared%2Fimages%2Fgridtiles4.pngR2R6R4R48goR0y25:shared%2Fimages%2Fgun.pngR2R6R4R49goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R6R4R50goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R6R4R51goR0y42:shared%2Fimages%2Fgun_eviscerator_icon.pngR2R6R4R52goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R6R4R53goR0y39:shared%2Fimages%2Fgun_launcher_icon.pngR2R6R4R54goR0y37:shared%2Fimages%2Fgun_peacekeeper.pngR2R6R4R55goR0y44:shared%2Fimages%2Fgun_peacekeeper_bullet.pngR2R6R4R56goR0y42:shared%2Fimages%2Fgun_peacekeeper_icon.pngR2R6R4R57goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R6R4R58goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R6R4R59goR0y39:shared%2Fimages%2Fgun_splasher_icon.pngR2R6R4R60goR0y36:shared%2Fimages%2Findoor_tileset.pngR2R6R4R61goR0y30:shared%2Fimages%2Fjump_pad.pngR2R6R4R62goR0y32:shared%2Fimages%2Flaser_base.pngR2R6R4R63goR0y31:shared%2Fimages%2Fmeteorite.pngR2R6R4R64goR0y40:shared%2Fimages%2Fmeteorite_fragment.pngR2R6R4R65goR0y34:shared%2Fimages%2Fminimaptile2.pngR2R6R4R66goR0y37:shared%2Fimages%2Foutdoor_tileset.pngR2R6R4R67goR0y30:shared%2Fimages%2Fplatform.pngR2R6R4R68goR0y32:shared%2Fimages%2Fplayerblue.pngR2R6R4R69goR0y33:shared%2Fimages%2Fplayergreen.pngR2R6R4R70goR0y31:shared%2Fimages%2Fplayerred.pngR2R6R4R71goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R6R4R72goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R6R4R73goR0y32:shared%2Fimages%2Fscifitiles.pngR2R6R4R74goR0y37:shared%2Fimages%2Fscifitiles_copy.pngR2R6R4R75goR0y37:shared%2Fimages%2Fteleporter_base.pngR2R6R4R76goR0y27:shared%2Fimages%2Ftrail.pngR2R6R4R77goR0y34:shared%2Fimages%2Ftrigger_blue.pngR2R6R4R78goR0y35:shared%2Fimages%2Ftrigger_green.pngR2R6R4R79goR0y33:shared%2Fimages%2Ftrigger_red.pngR2R6R4R80goR0y39:shared%2Ftiledefs%2Findoor_tileset.jsonR2R3R4R81goR0y35:shared%2Ftiledefs%2FSkullSolid.tsetR2R3R4R82goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R83goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R84goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R85goR0y23:crashdumper%2F%2Fos.batR2R3R4R86goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R87goR0y28:assets%2Fsounds%2Fflixel.oggR2R88R4R89goR0y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR2R6R4R90goR0y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR2R6R4R91goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR2R6R4R92goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR2R6R4R93goR0y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR2R6R4R94goR0y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR2R6R4R95goR0y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR2R6R4R96goR0y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR2R6R4R97goR0y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR2R6R4R98goR0y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR2R6R4R99goR0y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR2R6R4R100goR0y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR2R6R4R101goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR2R6R4R102goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR2R6R4R103goR0y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR2R6R4R104goR0y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR2R6R4R105goR0y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR2R6R4R106goR0y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR2R6R4R107goR0y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR2R6R4R108goR0y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR2R6R4R109goR0y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR2R6R4R110goR0y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR2R6R4R111goR0y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR2R6R4R112goR0y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR2R6R4R113goR0y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR2R6R4R114goR0y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR2R6R4R115goR0y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR2R3R4R116goR0y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR2R3R4R117goR0y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR2R3R4R118gh
aoy4:pathy34:assets%2Fdata%2Fdata-goes-here.txty4:typey4:TEXTy2:idR1goR0y29:assets%2Fgfx%2Fui%2Fpalma.pngR2y5:IMAGER4R5goR0y29:assets%2Fgfx%2Fui%2Fpalma.psdR2y6:BINARYR4R7goR0y30:assets%2Fgfx%2Fui%2Fpalma3.pngR2R6R4R9goR0y36:assets%2Fimages%2Fimages-go-here.txtR2R3R4R10goR0y31:assets%2Fimages_ui%2Fbutton.pngR2R6R4R11goR0y36:assets%2Fimages_ui%2Fbutton_thin.pngR2R6R4R12goR0y31:assets%2Fimages_ui%2Fchrome.pngR2R6R4R13goR0y28:assets%2Fimages_ui%2Ftab.pngR2R6R4R14goR0y33:assets%2Fimages_ui%2Ftab_back.pngR2R6R4R15goR0y17:assets%2Flogo.psdR2R8R4R16goR0y36:assets%2Fmusic%2Fmusic-goes-here.txtR2R3R4R17goR0y36:assets%2Fsounds%2Fsounds-go-here.txtR2R3R4R18goR0y30:assets%2Fxml%2Fempty_popup.xmlR2R3R4R19goR0y23:assets%2Fxml%2Fhome.xmlR2R3R4R20goR0y32:assets%2Fxml%2Fmessage_popup.xmlR2R3R4R21goR0y30:assets%2Fxml%2F_ui_globals.xmlR2R3R4R22goR0y27:shared%2Fimages%2Farrow.pngR2R6R4R23goR0y28:shared%2Fimages%2Farrow2.pngR2R6R4R24goR0y32:shared%2Fimages%2Fbackground.pngR2R6R4R25goR0y34:shared%2Fimages%2Fbackground_s.pngR2R6R4R26goR0y27:shared%2Fimages%2Fblank.pngR2R6R4R27goR0y27:shared%2Fimages%2Fcrate.pngR2R6R4R28goR0y32:shared%2Fimages%2Fcrosshairs.pngR2R6R4R29goR0y33:shared%2Fimages%2Fcrosshairs2.pngR2R6R4R30goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2R6R4R31goR0y44:shared%2Fimages%2Fexplosionparticle_blue.pngR2R6R4R32goR0y45:shared%2Fimages%2Fexplosionparticle_green.pngR2R6R4R33goR0y46:shared%2Fimages%2Fexplosionparticle_purple.pngR2R6R4R34goR0y43:shared%2Fimages%2Fexplosionparticle_red.pngR2R6R4R35goR0y46:shared%2Fimages%2Fexplosionparticle_yellow.pngR2R6R4R36goR0y28:shared%2Fimages%2Fflag_b.pngR2R6R4R37goR0y29:shared%2Fimages%2Fflag_bh.pngR2R6R4R38goR0y28:shared%2Fimages%2Fflag_g.pngR2R6R4R39goR0y29:shared%2Fimages%2Fflag_gh.pngR2R6R4R40goR0y28:shared%2Fimages%2Fflag_n.pngR2R6R4R41goR0y28:shared%2Fimages%2Fflag_r.pngR2R6R4R42goR0y29:shared%2Fimages%2Fflag_rh.pngR2R6R4R43goR0y28:shared%2Fimages%2Fflag_y.pngR2R6R4R44goR0y29:shared%2Fimages%2Fflag_yh.pngR2R6R4R45goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R6R4R46goR0y32:shared%2Fimages%2Fgridtiles3.pngR2R6R4R47goR0y32:shared%2Fimages%2Fgridtiles4.pngR2R6R4R48goR0y25:shared%2Fimages%2Fgun.pngR2R6R4R49goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R6R4R50goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R6R4R51goR0y42:shared%2Fimages%2Fgun_eviscerator_icon.pngR2R6R4R52goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R6R4R53goR0y42:shared%2Fimages%2Fgun_launcher_bullet2.pngR2R6R4R54goR0y39:shared%2Fimages%2Fgun_launcher_icon.pngR2R6R4R55goR0y37:shared%2Fimages%2Fgun_peacekeeper.pngR2R6R4R56goR0y44:shared%2Fimages%2Fgun_peacekeeper_bullet.pngR2R6R4R57goR0y42:shared%2Fimages%2Fgun_peacekeeper_icon.pngR2R6R4R58goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R6R4R59goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R6R4R60goR0y39:shared%2Fimages%2Fgun_splasher_icon.pngR2R6R4R61goR0y36:shared%2Fimages%2Findoor_tileset.pngR2R6R4R62goR0y30:shared%2Fimages%2Fjump_pad.pngR2R6R4R63goR0y32:shared%2Fimages%2Flaser_base.pngR2R6R4R64goR0y31:shared%2Fimages%2Fmeteorite.pngR2R6R4R65goR0y40:shared%2Fimages%2Fmeteorite_fragment.pngR2R6R4R66goR0y34:shared%2Fimages%2Fminimaptile2.pngR2R6R4R67goR0y37:shared%2Fimages%2Foutdoor_tileset.pngR2R6R4R68goR0y30:shared%2Fimages%2Fplatform.pngR2R6R4R69goR0y32:shared%2Fimages%2Fplayerblue.pngR2R6R4R70goR0y33:shared%2Fimages%2Fplayergreen.pngR2R6R4R71goR0y31:shared%2Fimages%2Fplayerred.pngR2R6R4R72goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R6R4R73goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R6R4R74goR0y32:shared%2Fimages%2Fscifitiles.pngR2R6R4R75goR0y37:shared%2Fimages%2Fscifitiles_copy.pngR2R6R4R76goR0y37:shared%2Fimages%2Fteleporter_base.pngR2R6R4R77goR0y27:shared%2Fimages%2Ftrail.pngR2R6R4R78goR0y34:shared%2Fimages%2Ftrigger_blue.pngR2R6R4R79goR0y35:shared%2Fimages%2Ftrigger_green.pngR2R6R4R80goR0y33:shared%2Fimages%2Ftrigger_red.pngR2R6R4R81goR0y39:shared%2Ftiledefs%2Findoor_tileset.jsonR2R3R4R82goR0y35:shared%2Ftiledefs%2FSkullSolid.tsetR2R3R4R83goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R84goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R85goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R86goR0y23:crashdumper%2F%2Fos.batR2R3R4R87goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R88goR0y28:assets%2Fsounds%2Fflixel.oggR2R89R4R90goR0y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR2R6R4R91goR0y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR2R6R4R92goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR2R6R4R93goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR2R6R4R94goR0y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR2R6R4R95goR0y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR2R6R4R96goR0y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR2R6R4R97goR0y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR2R6R4R98goR0y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR2R6R4R99goR0y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR2R6R4R100goR0y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR2R6R4R101goR0y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR2R6R4R102goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR2R6R4R103goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR2R6R4R104goR0y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR2R6R4R105goR0y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR2R6R4R106goR0y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR2R6R4R107goR0y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR2R6R4R108goR0y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR2R6R4R109goR0y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR2R6R4R110goR0y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR2R6R4R111goR0y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR2R6R4R112goR0y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR2R6R4R113goR0y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR2R6R4R114goR0y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR2R6R4R115goR0y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR2R6R4R116goR0y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR2R3R4R117goR0y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR2R3R4R118goR0y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR2R3R4R119gh
Binary file added Client/export/windows/cpp/bin/shared/images/gun_launcher_bullet2.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.
2 changes: 2 additions & 0 deletions Client/source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ class PlayState extends FlxState
}

new FlxTimer(5, delayedThread);

FlxG.camera.fade(0xff000000, 8, true);
}

public function beginSpectate(Teams:Array<Team>, TimeLeft:Float):Void
Expand Down
111 changes: 110 additions & 1 deletion Client/source/Player.hx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package ;
import flixel.FlxG;
import flixel.tweens.FlxTween;
import flixel.util.FlxSpriteUtil;
import ext.FlxWeaponExt;
import flixel.util.FlxTimer;
import haxe.Serializer;

/**
* ...
Expand All @@ -14,6 +17,8 @@ class Player extends PlayerBase
super(Id, Name, X, Y);
trace("newplayer");
setGun(1);

acceleration.y = PlayerBase.gravity;
}

override public function fire():Void
Expand Down Expand Up @@ -44,13 +49,19 @@ class Player extends PlayerBase
current_weap = GunID;

Reg.state.wepHUD.selectIcon(current_weap);

gun.x = x + width/2 - gun.width / 2;
gun.y = y + height/2 - gun.height / 2 + 2;
}
}
}

override public function draw():Void
{
super.draw();

//FlxG.camera.scroll.x -= Reg.state.player.gun_offset.x * 2;
//FlxG.camera.scroll.y -= Reg.state.player.gun_offset.y * 2;
}

override public function update():Void
Expand All @@ -62,13 +73,111 @@ class Player extends PlayerBase
alive = false;

if (visible)
{
hide();

if (ID == Reg.state.player.ID)
{
FlxG.camera.flash();
}
}
}

else
{
if (!visible)
if (!alive)
{
show();

alive = true;

FlxSpriteUtil.fadeIn(this, 3, true);
FlxSpriteUtil.fadeIn(gun, 3, true);
}
}
}

override public function c_unserialize(Arr:Array<Dynamic>):Void
{
_arr = Arr;

if (_arr.length == 14) //used to be 7
{
//velocity.x = ((_arr[1] - x) * 0.3 + _arr[7] * 0.5 + velocity.x * 0.2);
//velocity.y = ((_arr[2] - y) * 0.3 + _arr[8] * 0.4 + velocity.y * 0.3);

velocity.x = lerp(velocity.x, _arr[7], 0.4);
velocity.y = lerp(velocity.y, _arr[8], 0.4);

x = lerp(x, _arr[1], 0.8);
y = lerp(y, _arr[2], 0.8);

//x = _arr[1];
//y = _arr[2];

a = _arr[3];
isRight = _arr[4];
shoot = _arr[5];

if (_arr[6] < health)
{
FlxSpriteUtil.flicker(this);
FlxSpriteUtil.flicker(gun);

if (ID == Reg.state.player.ID)
{
FlxG.camera.shake();
}
}

health = _arr[6];
dash_left = _arr[9];
dash_right = _arr[10];
//if (current_weap != _arr[11])
//{
setGun(_arr[11], true);
//}

var ind:Int = _arr[13];

//if (guns_arr)
//{
var shot_gun:FlxWeaponExt = guns_arr[ind];
if (shot_gun != null)
{
var diff:Int = Std.int(_arr[12] / 2);
diff -= Std.int(shot_gun.fireRate / 2);
if (diff > 0)
{
if (!(shot_gun.fireRate > 0 && FlxG.game.ticks < shot_gun.nextFire))
{
fire();
}
else
{
shoot = false;
}
}
}
//}
}
}

override public function c_serialize():String
{
_arr.splice(0, _arr.length);

_arr.push(move_right);
_arr.push(move_left);
_arr.push(move_jump);
_arr.push(a);
_arr.push(isRight);
_arr.push(shoot);
_arr.push(dash_left);
_arr.push(dash_right);
_arr.push(dash_down);
_arr.push(current_weap);

return Serializer.run(_arr);
}
}
3 changes: 2 additions & 1 deletion Client/source/ui/Public.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ class Public extends FlxUIState
t.resize(FlxG.width - 60, 30);
t.setCenterLabelOffset(0, 15);
l.add(cast t);
l.refreshList();
//l.refreshList();
Reflect.callMethod(l, "refreshList", []);
}
}

Expand Down
12 changes: 0 additions & 12 deletions FEELTODO.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,11 @@ To improve:
* Sounds
* Add lots of bass to sound
* More obvious/exagerated animations
* Lower enemy hp
* Higher rate of fire
* More enemies
* Bigger bullets
* Muzzle flash
* Faster bullets
* Less accuracy (probably not)
* Hit animation
* Enemy knockback
* Permanence (gibs that stay forever)
* Screen shake (when firing)
* Player knockback upon firing
* Sleep on hit?
* Gun follow delay
* Gun kicks backward upon firing
* Gun shells permanence
* More destructive and spectacular weapons
* Random explosions
* Faster enemies
* Bigger explosions
Binary file added LOGO.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.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ At the moment the client source code is a mess. I'll clean it up one day.
* Bots -> maybe, just maybe
* Gadgets
* Secondary weapon fire
* Fix double jump
* Interactive triggers & events:
* Button trigger

Expand All @@ -57,6 +58,7 @@ At the moment the client source code is a mess. I'll clean it up one day.

## Bugs:
* Fix annoying LAN server discovery bug
* Fix duplicate weapon firing


## Assets:
Expand Down
0 SCREENSHOT.png → SCREENSHOT1_v1.png
View file
File renamed without changes
Binary file added SCREENSHOT1_v2.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 SCREENSHOT2_v1.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 SCREENSHOT3_v1.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: 0 additions & 1 deletion Server/assets/maps/TwinCapture.oel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,5 @@
<JumpPad id="17" x="1616" y="736" angle="0" />
<JumpPad id="18" x="1504" y="624" angle="180" />
<JumpPad id="19" x="640" y="624" angle="180" />
<TriggerArea id="20" x="416" y="400" width="144" height="64" parent="SysMeteor" cooldown="60" doToggle="False" teams="1111" />
</Entities>
</level>
Loading

0 comments on commit 72b2207

Please sign in to comment.