Commit Graph
16855 Commits
Author SHA1 Message Date
Anuken e5f6b7f66c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-28 16:28:58 -04:00
Anuken 941ebd39bf Added new royalty-free music 2018-04-28 13:44:46 -04:00
Anuken 52b73b5a9d Made iOS UI slightly bigger 2018-04-28 12:58:21 -04:00
Anuken f5b7e6bb60 Made IOS UI size slightly smaller 2018-04-28 12:54:54 -04:00
Anuken 44965a42e4 Added new splash screens and icons for iOS 2018-04-28 12:42:06 -04:00
Anuken d8aea69c0c Merge remote-tracking branch 'origin/master' 2018-04-28 12:27:49 -04:00
Anuken aa110ec9a6 Various iOS fixes 2018-04-28 12:27:43 -04:00
Anuken dbfe5196e7 Fixed iOS text fields not getting source text 2018-04-28 11:38:09 -04:00
Anuken 13e911eaa1 Merge remote-tracking branch 'origin/master' 2018-04-28 11:22:42 -04:00
Anuken cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -04:00
Anuken cf40aec9d7 Merge remote-tracking branch 'origin/master' 2018-04-28 11:16:09 -04:00
Anuken cdda421920 Fixed multithreading not working on iOS 2018-04-28 11:15:53 -04:00
Anuken 0db22f2cff Fixed place mode visual bug 2018-04-28 11:12:24 -04:00
Anuken 7a22ca2841 Fixed being unable to get log in low android versions 2018-04-28 10:41:33 -04:00
Anuken 4fc8e321af Added iOS text field dialog listener 2018-04-28 10:14:57 -04:00
Anuken 59fe8f444f Merge remote-tracking branch 'origin/master' 2018-04-27 23:43:32 -04:00
Anuken 8cc3a865e2 iOS fixes 2018-04-27 23:42:59 -04:00
Anuken 8a13482c38 Changed OGGs to MP3s, fixed desktop version being unable to start 2018-04-27 22:44:21 -04:00
Anuken d8d8552176 Added iOS module 2018-04-27 16:01:37 -04:00
Anuken 96475557ae Travis build fix 2018-04-27 15:33:12 -04:00
Anuken bb4c498e5a Fixed some mac build issues 2018-04-27 13:49:04 -04:00
Anuken 3ba57c3473 Minor cleanup with bars 2018-04-27 13:43:08 -04:00
Anuken 094aa5a326 Fixed lightning not rendering 2018-04-25 21:19:15 -04:00
Anuken 4b71b30418 Fixed compile error with new effects system, update uCore 2018-04-25 20:55:20 -04:00
Anuken d960703a5c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-25 20:53:49 -04:00
Anuken 6244551d69 Fixed android build errors 2018-04-25 20:53:32 -04:00
Anuken 3ed6be1d6d Fixed build errors 2018-04-25 20:53:03 -04:00
Anuken 91c3cb93f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	build.gradle
#	core/assets/bundles/bundle_es_LA.properties
#	core/assets/version.properties
2018-04-25 20:45:39 -04:00
Anuken 8c369d9874 Removed version.properties 2018-04-25 20:44:22 -04:00
Anuken b5008f4ad3 Added unit ammo support, multi-ammo inventories 2018-04-25 20:40:51 -04:00
Anuken deefab8a5b Implemented ammo ressuplying 2018-04-24 21:38:57 -04:00
Anuken ff6dc98bbe Added spanish bundle 2018-04-23 21:47:39 -04:00
Anuken 8581213126 Moved bullet FX to ammo type, beginning of weapon rework 2018-04-23 21:35:40 -04:00
Anuken 19d058a644 More base unit types added 2018-04-23 19:14:52 -04:00
Anuken aa83510fbe Moved unit-related classes, added base flying types 2018-04-22 17:40:23 -04:00
Anuken 5aa995b5ef Version.properties update 2018-04-21 18:49:06 -04:00
Anuken 1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java
2018-04-21 18:47:43 -04:00
Anuken 9f4f107b6d Changed version build 2018-04-21 18:39:49 -04:00
Anuken 90716ebaad Added italian bundle 2018-04-21 18:32:56 -04:00
Anuken 496b4e77e8 Updated version 2018-04-21 18:28:38 -04:00
Anuken 6e9d833c77 Added infinite reach on sandbox v38 2018-04-21 18:08:34 -04:00
Anuken 48061d3cae Fixed flick scroll issues 2018-04-21 18:03:43 -04:00
Anuken 292ce33e0f Fixed placement preview PR 2018-04-21 15:54:21 -04:00
AnukenandGitHub 365fc6af20 Merge pull request #117 from hellomouse/feature-blockpreview
Added Placement Preview
2018-04-21 15:41:03 -04:00
Anuken 97360b33f4 Added new chain/titan sprites 2018-04-21 15:18:12 -04:00
Anuken 5012313dc4 Implemented inefficient pathfinding 2018-04-21 14:26:05 -04:00
Anuken 95f10aeb06 Attempts to further optimize pathfinding 2018-04-21 11:55:32 -04:00
Anuken 8a965e56cd Fixed not being able to pan with invalid recipe selected 2018-04-21 11:02:54 -04:00
Anuken fb14a83b9a More work on pathfinding 2018-04-21 01:09:06 -04:00
Commodore64x 8cef351ed9 Fixed preview for multiblocks. 2018-04-21 12:44:23 +10:00