Code

Develop#16

Code

Merged

noxytrux merged 78 commits intomasterdotintent/pixfight:masterfrom developdotintent/pixfight:developCopy head branch name to clipboardJul 7, 2018

+21,253-1,340

Commits

Commits on May 10, 2018

• Added keyboard map movement

  noxytrux

  committed
  f0a9d96

  Copy full SHA for f0a9d96

• Resolve conflicts

  noxytrux

  committed
  6318f1f

  Copy full SHA for 6318f1f

• Added move in Windows

  noxytrux

  committed
  95b0fce

  Copy full SHA for 95b0fce

Commits on May 24, 2018

• Removed armeabi from possible ABIs to build.

  Show description for 21b20f5
  

  Parseus

  committed
  21b20f5

  Copy full SHA for 21b20f5

• Removed unused dependencies.

  

  Parseus

  committed
  015530b

  Copy full SHA for 015530b

• Compile against the newest stable SDK. Gradle, plugins and libraries were also updated accordingly.

  

  Parseus

  committed
  334307e

  Copy full SHA for 334307e

• Removed action bar from the project and cleaned up styles.xml.

  

  Parseus

  committed
  d66b315

  Copy full SHA for d66b315

• Converted the try-catch-finally to try-with-resources to reduce the amount of code. Also fixed potential null pointer exceptions.

  

  Parseus

  committed
  5d872e5

  Copy full SHA for 5d872e5

Commits on May 25, 2018

• Pixfight now uses an adaptive launcher icon for Android 8.0+ (or, for older versions, on 3rd party launchers that support adaptive icons). Also compressed both old and new launcher PNGs for smaller…

  Show description for 4dff841
  

  Parseus

  committed
  4dff841

  Copy full SHA for 4dff841

• Removed background from the new game layout.

  Show description for aa4a1a4
  

  Parseus

  committed
  aa4a1a4

  Copy full SHA for aa4a1a4

• Removed overdraw also from other layouts.

  

  Parseus

  committed
  221211c

  Copy full SHA for 221211c

• Changed timer to CLOCK_MONOTONIC for Android.

  

  Parseus

  committed
  679f28a

  Copy full SHA for 679f28a

Commits on May 26, 2018

• Initial commit

  

  Noxy

  committed
  503f71b

  Copy full SHA for 503f71b

• Added RaspberryPi

  

  noxytrux

  authored and

  Noxy

  committed
  7c04944

  Copy full SHA for 7c04944

• Merge pull request #11 from inFullMobile/feature/RaspberyPi

  Show description for 52e9c0e
  noxytrux

  authored
  52e9c0e

  Copy full SHA for 52e9c0e

Commits on May 29, 2018

• Replaced most Activities with Fragments as per current recommendations by Google.

  

  Parseus

  committed
  86ec36c

  Copy full SHA for 86ec36c

• Corrected declarations of JNI bindings to fix extra warnings/errors on the Java side.

  

  Parseus

  committed
  065ffb7

  Copy full SHA for 065ffb7

• Enabled Java 8 support and converted anonymous classes to lambdas/method references.

  

  Parseus

  committed
  f97594b

  Copy full SHA for f97594b

• Added creating a .nomedia file to the folder with game assets.

  

  Parseus

  committed
  a803359

  Copy full SHA for a803359

• Compressed losslessly all MP3/PNG assets, gaining a 25% reduction in file size.

  

  Parseus

  committed
  9084f0a

  Copy full SHA for 9084f0a

• Added ProGuard rules for release builds.

  

  Parseus

  committed
  81d1cd1

  Copy full SHA for 81d1cd1

• Implemented muting/unmuting music on app pausing/resuming.

  

  Parseus

  committed
  8198d2d

  Copy full SHA for 8198d2d

Commits on May 30, 2018

• Fixed OpenGL renderer crashing on exiting the rendering fragment or going to background.

  

  Parseus

  committed
  7669063

  Copy full SHA for 7669063

• Main font is now loaded from assets only once and shared later if needed.

  

  Parseus

  committed
  9307290

  Copy full SHA for 9307290

Commits on Jun 1, 2018

• Added full server

  

  Noxy

  committed
  8c4aa09

  Copy full SHA for 8c4aa09

Commits on Jun 2, 2018

• Lint warnings/errors fixes and a small resource cleanup.

  

  Parseus

  committed
  60caec0

  Copy full SHA for 60caec0

• Replaced support-v4 with support-fragment.

  Show description for df125a9
  

  Parseus

  committed
  df125a9

  Copy full SHA for df125a9

• Fixed switches in the settings layout not being centered.

  

  Parseus

  committed
  45de11e

  Copy full SHA for 45de11e

• Increased version number to 1.1.

  

  Parseus

  committed
  ebefd2e

  Copy full SHA for ebefd2e

• Merge pull request #12 from Parseus/develop

  Show description for 267d024
  noxytrux

  authored
  267d024

  Copy full SHA for 267d024

• Initial Client code

  

  Noxy

  committed
  83e0df9

  Copy full SHA for 83e0df9

• Merge branch 'develop' into feature/multiplayer

  

  Noxy

  committed
  48c182e

  Copy full SHA for 48c182e

• Android settings fixes

  

  Noxy

  committed
  37db8f3

  Copy full SHA for 37db8f3

• Added missing file

  

  Noxy

  committed
  e220b4e

  Copy full SHA for e220b4e

• Current game state is now properly preserved after going to background!

  Show description for fe92ccf
  

  Parseus

  committed
  fe92ccf

  Copy full SHA for fe92ccf

• Fixed a crash accidentally introduced in a previous commit.

  

  Parseus

  committed
  9ecc5dc

  Copy full SHA for 9ecc5dc

• Replaced deprecated getColor()/getDrawable() methods with their equivalents from ContextCompat.

  Show description for a16c11e
  

  Parseus

  committed
  a16c11e

  Copy full SHA for a16c11e

• PixFight doesn't need to rely on loading the FFF Atlantis font from assets anymore - now its use is properly defined in layouts.

  

  Parseus

  committed
  2cab9ff

  Copy full SHA for 2cab9ff

• Converted global Button fields to the local ones in the RenderFragment. This should prevent from a potential (although rather unlikely to happen) renderInstance memory leak.

  

  Parseus

  committed
  a6124fb

  Copy full SHA for a6124fb

Commits on Jun 3, 2018

• Changed screen orientation of the activity to sensorLandscape.

  Show description for 58211c8
  

  Parseus

  committed
  58211c8

  Copy full SHA for 58211c8

• Assets in core files should also be compressed, otherwise CMake will replace compressed files with uncompressed ones.

  Show description for 77b430d
  

  Parseus

  committed
  77b430d

  Copy full SHA for 77b430d

• More PNG compression :D

  

  Parseus

  committed
  b1e3d53

  Copy full SHA for b1e3d53

• Small cleanup in resources and a .gitignore update.

  

  Parseus

  committed
  eb1c892

  Copy full SHA for eb1c892

• Release builds should not remove thumbnails for levels.

  

  Parseus

  committed
  f631e61

  Copy full SHA for f631e61

Commits on Jun 4, 2018

• Replaced a deprecated ProgressDialog with a custom dialog that serves pretty much the same purpose.

  

  Parseus

  committed
  d950bc3

  Copy full SHA for d950bc3

• Merge remote-tracking branch 'upstream/develop' into develop

  

  Parseus

  committed
  f732f30

  Copy full SHA for f732f30

• Increased version number to 1.2.

  

  Parseus

  committed
  fe0f129

  Copy full SHA for fe0f129

• client code

  

  Noxy

  committed
  65a7ff3

  Copy full SHA for 65a7ff3

• Merge pull request #13 from Parseus/develop

  Show description for 3e7ec58
  noxytrux

  authored
  3e7ec58

  Copy full SHA for 3e7ec58

• resolve conflicts

  

  Noxy

  committed
  56fa227

  Copy full SHA for 56fa227

Commits on Jun 12, 2018

• Fix loading game saves.

  

  Parseus

  committed
  fbf7fcc

  Copy full SHA for fbf7fcc

• Server / Client test POC

  

  Noxy

  committed
  b73f354

  Copy full SHA for b73f354

Commits on Jun 13, 2018

• Merge pull request #14 from Parseus/develop

  Show description for 7fdedd0
  noxytrux

  authored
  7fdedd0

  Copy full SHA for 7fdedd0

• Added leave command

  

  Noxy

  committed
  fe03ee9

  Copy full SHA for fe03ee9

• Server / client makefiles

  

  Noxy

  committed
  1c9321e

  Copy full SHA for 1c9321e

• New files

  

  Noxy

  committed
  a088bd3

  Copy full SHA for a088bd3

Commits on Jun 21, 2018

• Initial iOS Multiplayer

  

  Noxy

  committed
  63de40c

  Copy full SHA for 63de40c

Commits on Jun 23, 2018

• Complete iOS multiplayer

  

  Noxy

  committed
  4db62b0

  Copy full SHA for 4db62b0

• Fixed logo

  

  Noxy

  committed
  13d5843

  Copy full SHA for 13d5843

• iPhone 5 fixes

  

  Noxy

  committed
  5601435

  Copy full SHA for 5601435

Commits on Jun 24, 2018

• Linux compilation fixes

  noxytrux

  committed
  4c9096c

  Copy full SHA for 4c9096c

• Update gitignore

  

  Noxy

  committed
  d715396

  Copy full SHA for d715396

• Complete iOS multiplayer, fixes to game logic

  

  Noxy

  committed
  82d9c80

  Copy full SHA for 82d9c80

Commits on Jun 27, 2018

• macOS multiplayer

  

  Noxy

  committed
  9edb38a

  Copy full SHA for 9edb38a

Commits on Jul 2, 2018

• Linux multiplayer

  noxytrux

  committed
  bbc7151

  Copy full SHA for bbc7151

• RPI multiplayer

  noxytrux

  committed
  c09ca52

  Copy full SHA for c09ca52

• HTML compilation fix

  

  Noxy

  committed
  f90bc5e

  Copy full SHA for f90bc5e

Commits on Jul 3, 2018

• Windows multiplayer

  noxytrux

  committed
  e549fbf

  Copy full SHA for e549fbf

• Fixed android compilation

  

  Noxy

  committed
  b16cdc9

  Copy full SHA for b16cdc9

• Updated readme

  

  Noxy

  committed
  5c4d174

  Copy full SHA for 5c4d174

Commits on Jul 4, 2018

• mutliplayer layout

  

  Noxy

  committed
  430ab84

  Copy full SHA for 430ab84

Commits on Jul 5, 2018

• Android NDK update

  

  Noxy

  committed
  3317420

  Copy full SHA for 3317420

Commits on Jul 6, 2018

• Android multiplayer

  

  Noxy

  committed
  7c91ddc

  Copy full SHA for 7c91ddc

Commits on Jul 7, 2018

• RoomInfo change

  

  Noxy

  committed
  29c6cdd

  Copy full SHA for 29c6cdd

• compilation fix

  

  Noxy

  committed
  c3c1126

  Copy full SHA for c3c1126

• Text label fix

  

  Noxy

  committed
  700e9e6

  Copy full SHA for 700e9e6

• Linux compilation fix

  noxytrux

  committed
  0af0e51

  Copy full SHA for 0af0e51

• Merge pull request #15 from inFullMobile/feature/multiplayer

  Show description for 4aed812
  noxytrux

  authored
  4aed812

  Copy full SHA for 4aed812