{"push_id":1154414595,"size":30,"distinct_size":1,"ref":"refs/heads/dev-pb","head":"f79c765f9dfb3a2c93bed137f0b8e614f65fbff6","before":"18a6544e09c9aabd3fc51a8fdd36c50da992a04a","commits":[{"sha":"1812617e761d81f87bc4a452510a0da9733febee","author":{"name":"MW777","email":"d815b872d98997eece368f6978ff3cb85c58a483@gmail.com"},"message":"config edited (temp)","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/1812617e761d81f87bc4a452510a0da9733febee"},{"sha":"9edfa0c8d1cbbd9bf1b1f7191c21edd5f151e524","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Changes for Android\n\nThis commit makes changes which are required to get the game working on\nandroid:\n- Take out the JAXB xml parsing stuff. The default values in the\nconfiguration file are used.\n- Remove java.awt dependencies from PolygonShape class. (Some hacky\nalternative algorithms are added for the time being - these should be\nfixed properly).\n- Replace Java 8 code from AILogicPartition with Andorid-supported code.\n- Inject a 'CameraAccessor' into the input processor, so it can convert\nscreen coordinates to camera coords and access the current camera\nposition.  This allows us to work out where a 'tap' occurs on the\nscreen. The CameraAccessor interface is currently implemented by the\nGameScreen.","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/9edfa0c8d1cbbd9bf1b1f7191c21edd5f151e524"},{"sha":"767ecd7810c407529186d326b27030142311abbd","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Change tablet movement controls\n\nMovement is now controlled by swiping the screen rather than tapping.\nAlso added the predator power ups into the default configuration. These\ncan be activated by double-tapping the screen to use the first one in\nthe queue.\n- UserInputProcessor is now GestureListener as well as an\nInputProcessor.","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/767ecd7810c407529186d326b27030142311abbd"},{"sha":"1a68100a1269b649079ddb7197039dd7aba11de5","author":{"name":"MW777","email":"d815b872d98997eece368f6978ff3cb85c58a483@gmail.com"},"message":"temp","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/1a68100a1269b649079ddb7197039dd7aba11de5"},{"sha":"4b52a9f06094bb870b8ce7f09ebc893ef4efb14d","author":{"name":"MW777","email":"d815b872d98997eece368f6978ff3cb85c58a483@gmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dev-mw","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/4b52a9f06094bb870b8ce7f09ebc893ef4efb14d"},{"sha":"9b9b85a5f4d7061cf64d34857b17cb5b3298dbf0","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Change 'Coins.png' to 'coins.png' in RendererConfiguration\n\nThe asset names are case-sensitive in Android. In the code, the coins\nasset is named 'coins.png', but the asset is actually named 'Coins.png'.\nThe code is changed to match the asset.","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/9b9b85a5f4d7061cf64d34857b17cb5b3298dbf0"},{"sha":"05987ad5b75b2c0b1a8380a108254ff87e37de0e","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Re-work data management\n\nThis adds the first phase of work for the new data management system.\nNote that, at this point, it's not complete and data is still read from\nthe xml config. But this puts in the first bit of work for swapping to a\ndifferent approach (the implementation will use a combination of .json\nfiles and libGDX Preferences).","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/05987ad5b75b2c0b1a8380a108254ff87e37de0e"},{"sha":"54f4eeddfdadc7369339cb63fb918804b2986916","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dev-sd\n\n# Conflicts:\n#\tCode/game/PredatorPreyGame.java","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/54f4eeddfdadc7369339cb63fb918804b2986916"},{"sha":"e491ca1faa960ea0cea0ce5b5b19d05984e7c3ef","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Merge branch 'dev-sd' of https://github.com/sidi44/project-orion into dev-sd","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/e491ca1faa960ea0cea0ce5b5b19d05984e7c3ef"},{"sha":"9aaef5ce5009f9d7aa0a43ed4c74cf0ab7fc2cb1","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dev-config_files","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/9aaef5ce5009f9d7aa0a43ed4c74cf0ab7fc2cb1"},{"sha":"22a01dbd3063ff8a7623aac2b91be95c5131c17d","author":{"name":"MW777","email":"d815b872d98997eece368f6978ff3cb85c58a483@gmail.com"},"message":"PolygonShape with LibGDX Polygon","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/22a01dbd3063ff8a7623aac2b91be95c5131c17d"},{"sha":"2894baf16f84c8572360434d7e12ce825076d630","author":{"name":"MW777","email":"d815b872d98997eece368f6978ff3cb85c58a483@gmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/dev-mw'","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/2894baf16f84c8572360434d7e12ce825076d630"},{"sha":"8320974a83c223a7c8c76b759294ae99de9e02e6","author":{"name":"MW777","email":"d815b872d98997eece368f6978ff3cb85c58a483@gmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dev-mw","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/8320974a83c223a7c8c76b759294ae99de9e02e6"},{"sha":"24542b62e869960ab18fc15842c05e7b4fa6ad24","author":{"name":"MW777","email":"d815b872d98997eece368f6978ff3cb85c58a483@gmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/dev-mw'","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/24542b62e869960ab18fc15842c05e7b4fa6ad24"},{"sha":"4dddf804a11ab5cf791616c197d24c965fe81ffa","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Hook up new data management system - Part 1\n\n- The GameDataManager reads in the various .json config files on start\nup.\n- This work does some initial work to connect the Levels screen and the\nSandbox to the data manager. (There's still work to do here.)\n- The XML config file is now no longer used. These files will be removed\nas part of a later commit.\n- Fix location of ui assets. They should be in assets/data/ui/ not\nassets/ui/.","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/4dddf804a11ab5cf791616c197d24c965fe81ffa"},{"sha":"e75401f22d17113de230dc7d3db7ccb9d2a87668","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/dev-config_files'\n\n# Conflicts:\n#\tCode/game/PredatorPreyGame.java","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/e75401f22d17113de230dc7d3db7ccb9d2a87668"},{"sha":"178ece729e6e939119212a307e1c606911f23c43","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/dev-config_files'\n\n# Conflicts:\n#\tCode/game/PredatorPreyGame.java","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/178ece729e6e939119212a307e1c606911f23c43"},{"sha":"efeabf3ba2cf031a0815b477d66e6aff6c01931a","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/android-dev'\n\n# Conflicts:\n#\tCode/game/PredatorPreyGame.java\n#\tCode/geometry/PolygonShape.java\n#\tCode/physics/PhysicsConfiguration.java\n#\tCode/render/GameScreen.java\n#\tCode/render/MainMenuScreen.java\n#\tCode/render/SettingsScreen.java","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/efeabf3ba2cf031a0815b477d66e6aff6c01931a"},{"sha":"5cb3c6f05b346fa5c96fdcac5be8a42101078575","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dev-sd","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/5cb3c6f05b346fa5c96fdcac5be8a42101078575"},{"sha":"4a6031272d3e7f322786e74c9f64d3590149a9d6","author":{"name":"sidi44","email":"9d0bbf98012ff9bfe7ebe73d1ebcca87aefb222c@hotmail.com"},"message":"Hook up new data management system - Part 2\n\n- This connects the sound data with the UI. Changing sound on/off and\nvolume levels on the UI now works.\n- Basic music is added to the game. There are two placeholder music\ntypes at the moment - one for the menu screens and one for the when the\ngame is played. The sound manager listens for changes of the UI screens\nto check whether to change the music.\n- Added maze generation parameters to the levels.\n- For sandbox mode, the maze generation parameters are now randomised\nbetween some reasonable values.\n- Fixed a couple of problems with the game not working on Android. There\nwere capitalisation errors for a couple of image files in the\nrenderer_config.json file. Also, I'd used some Java 8 language features\nwhich aren't supported on Android. This was some interfaces from\njava.util.function. Since these are very simple interfaces, I've\nreplicated them in a new 'functional' package. If these features are\nsupported in Android in future, it should be easy to swap them in.","distinct":false,"url":"https://api.github.com/repos/sidi44/project-orion/commits/4a6031272d3e7f322786e74c9f64d3590149a9d6"}]}
{"actor":{"display_login":"Pokerpunch"}}