Commit Graph
100 Commits
Author SHA1 Message Date
Anuken 60bf36613f Merge remote-tracking branch 'origin/master' 2018-08-22 12:42:30 -04:00
Anuken a75994cbbf Updates to iOS build 2018-08-22 12:42:19 -04:00
Anuken bb7e2c7cee Commit #2000 2018-08-21 19:01:35 -04:00
Anuken 69eb6469f9 Merge branch 'continuous-servers' of https://github.com/Anuken/Mindustry 2018-08-21 18:56:32 -04:00
Anuken d2eb3be7f8 Merge remote-tracking branch 'origin/master' 2018-08-21 18:54:15 -04:00
Anuken 5aa76639d1 Changed noise octaves with non-detailed worldgen 2018-08-21 18:54:11 -04:00
Anuken b745d88299 Player State reset / Improved messages / Round end time 2018-08-21 17:23:17 -04:00
Anuken 3aedc07ad0 Initial continuous server implementation 2018-08-21 16:37:57 -04:00
Anuken 0ddee379ca Added mode-specific respawn time 2018-08-21 10:56:06 -04:00
Anuken 6dcbe4fabb Added phase walls 2018-08-21 10:36:42 -04:00
Anuken 5dbb9fdf3f Final tweaks, ready to merge 2018-08-21 09:45:54 -04:00
Anuken 914fa3079d Per-mode no-build radius 2018-08-20 23:47:56 -04:00
Anuken 2e958d8d8f New team system / Prototype dedicated PvP gamemode 2018-08-20 23:45:27 -04:00
Anuken 7a5e61fd2e Fixed off-color stone floor blocks 2018-08-20 22:17:34 -04:00
Anuken 6a031d8f53 Nerfed wall health 25% 2018-08-20 22:13:29 -04:00
Anuken dc6f01c0d3 Merge branch 'resource-rework' of https://github.com/Anuken/Mindustry 2018-08-20 22:09:57 -04:00
Anuken 1cc8cbe8a8 Bundles updated / Updated mechanical drill sprite 2018-08-20 22:09:15 -04:00
Anuken 01ae8bec85 Turret sprite fixes 2018-08-20 21:30:37 -04:00
Anuken 258ab87f6b Palette swap / Blocks changed and renamed 2018-08-20 21:04:03 -04:00
Anuken 8ba2db6c58 Dense alloy / Compile errors fixed 2018-08-20 17:43:56 -04:00
Anuken a7599e85dc Merge remote-tracking branch 'origin/master' 2018-08-20 10:21:56 -04:00
Anuken 28389d698e Fixed editor fill freeze 2018-08-20 10:21:51 -04:00
Anuken 69f7296baa Merge remote-tracking branch 'origin/master' 2018-08-19 22:49:39 -04:00
Anuken 855f56bb45 Crash fix 2018-08-19 22:49:35 -04:00
Anuken a79d072aaf More copper 2018-08-19 22:47:46 -04:00
Anuken 278e7027f2 Bundles updated 2018-08-19 13:35:35 -04:00
Anuken 9d654c1f18 Copper added, carbide removed 2018-08-19 13:34:36 -04:00
Anuken 360494f971 Fixed connect/disconnect message color tags 2018-08-19 10:31:25 -04:00
Anuken 81931eb536 Removed unnecessary tungsten references 2018-08-19 10:30:12 -04:00
Anuken b872252771 Removed unnecessary tungsten references 2018-08-18 23:02:10 -04:00
Anuken a60ce3c54c Merge branch 'master' of https://github.com/Anuken/Mindustry into resource-rework 2018-08-18 13:10:22 -04:00
Anuken 0f173bcc5a Increased blink frequency 2018-08-18 13:10:01 -04:00
Anuken 64dbe8312e Fixed merge issues 2018-08-18 13:07:54 -04:00
Anuken 7f443c71ae Merge remote-tracking branch 'origin/master' 2018-08-18 13:06:59 -04:00
Anuken 27276c025c Merge branch 'remove-ammo' of https://github.com/Anuken/Mindustry 2018-08-18 13:06:54 -04:00
Anuken e9d03c179c init() test 2018-08-18 12:19:20 -04:00
Anuken e0eb227ce5 Recipe init() method added 2018-08-17 22:49:45 -04:00
Anuken 20021c5b31 Fixed 1-character names being valid / Fixed collideLine with tiles 2018-08-17 20:21:49 -04:00
Anuken f8d6797fc2 Fixed android module being necessary to compile 2018-08-17 18:05:28 -04:00
Anuken 25051980ce Fixed category bundle properties missing 2018-08-17 14:51:18 -04:00
Anuken fb8becca99 Minor ban fix 2018-08-17 14:09:31 -04:00
Anuken 25bd8a7eaa Fixed sector name not being displayed in saves 2018-08-17 13:02:53 -04:00
Anuken bbd2424a3f Merge remote-tracking branch 'origin/master' 2018-08-17 12:55:18 -04:00
Anuken 83eeeed319 Discord rich presence improvements 2018-08-17 12:55:06 -04:00
AnukenandGitHub c92e8161a1 Merge pull request #190 from Prosta4okua/patch-21
[Complete] bundle_ru.properties
2018-08-17 11:33:29 -04:00
Anuken 258555c990 Merge remote-tracking branch 'origin/master' 2018-08-17 11:32:19 -04:00
Anuken 0f7799422e Crashes fixed 2018-08-17 11:32:12 -04:00
AnukenandGitHub 177b565d7c Merge pull request #173 from Gab351/patch-1
Translate l227 to l239
2018-08-17 10:38:24 -04:00
Anuken 6d7941fba4 iOS portrait mode support 2018-08-16 18:38:43 -04:00
Anuken 020c6388c2 Block renaming 2018-08-16 18:38:04 -04:00
Anuken 53d35e8c77 Bundles updated / Fixed some localization bugs 2018-08-16 17:43:43 -04:00
AnukenandGitHub 01f205d352 Merge pull request #189 from Leone25/patch-1
last update bundle_ita.properties
2018-08-16 17:38:44 -04:00
Anuken a786167b04 Reduced health flash 2018-08-16 17:38:16 -04:00
Anuken 1699ab48e8 Added alternate health bar on all units 2018-08-16 17:07:20 -04:00
Anuken 20d3740e75 Branch created 2018-08-16 11:46:34 -04:00
Anuken 80d57f8c0c Comma fix 2018-08-16 11:25:27 -04:00
Anuken 1de367e89c Full chat revert / Crash fixes 2018-08-16 10:09:22 -04:00
Anuken 8850a89e30 Fixed game-over sector algorithm 2018-08-15 21:25:07 -04:00
Anuken 4f72011cf7 Fixed markup crash / setsector command fixed / Drone crash fixed 2018-08-15 21:00:40 -04:00
Anuken c569232e74 Fixed multiblocks not accepting items 2018-08-15 19:38:13 -04:00
Anuken 14c526d0c4 Power distribution fix 2018-08-15 18:41:21 -04:00
Anuken 5c4ac6b702 Fixed major issue with Vector2.ZERO mutation 2018-08-15 18:37:20 -04:00
Anuken d58cc18136 Fixed block targeting bug 2018-08-15 18:18:57 -04:00
Anuken 36c01fde94 Updated uCore / Minor server tweak 2018-08-15 17:46:33 -04:00
Anuken d4d9d59fe4 Server sector commands / World data compression / Snapshot sent w/ world 2018-08-15 17:25:19 -04:00
Anuken 8dbd0a6130 Fixed drones repairing incorrect blocks 2018-08-15 16:28:00 -04:00
Anuken 3746344cba Crash fixes 2018-08-15 16:26:08 -04:00
Anuken d07fd1bbfe Improved build sync 2018-08-15 15:16:56 -04:00
Anuken 02f95c0ed4 Merge remote-tracking branch 'origin/master' 2018-08-15 14:16:42 -04:00
Anuken c98fcbd795 Turrets target blocks / Added core no-build radius 2018-08-15 14:13:50 -04:00
AnukenandGitHub d071877963 Merge pull request #186 from Leone25/patch-1
Big update for italian bundle
2018-08-15 13:12:18 -04:00
Anuken 0267cb4006 Conduit sprites improved / Fixed incorrect proximity update 2018-08-15 13:11:55 -04:00
Anuken c0cad70212 Merge remote-tracking branch 'origin/master' 2018-08-15 10:49:05 -04:00
Anuken 7bd6dbb4b4 Partial korean font PR revert / Crash fixes 2018-08-15 10:48:19 -04:00
AnukenandGitHub 6d932e3d04 Merge pull request #185 from Prosta4okua/patch-19
Update bundle_ru.properties
2018-08-15 09:20:41 -04:00
Anuken 52110d6008 ok 2018-08-14 19:30:05 -04:00
Anuken 103b08fd1d Added build progress sync 2018-08-14 18:56:42 -04:00
Anuken cb09d10e7f Merge remote-tracking branch 'origin/master' 2018-08-14 18:51:13 -04:00
Anuken a041c1e60d Synced whole place queue / Fixed player flash desync 2018-08-14 18:51:06 -04:00
AnukenandGitHub 586b4cf4bd Merge pull request #183 from cloud9350/master
Add korean chat fonts + fix typos
2018-08-14 18:32:52 -04:00
Anuken f8ddc8325c Fixed puddle/IO crash / crafter storage / player NaN position / red tint 2018-08-14 12:24:04 -04:00
Anuken 59ec09e82c Crash fixes / Resource-steal fixed / No-build while shooting fixed 2018-08-14 12:16:21 -04:00
Anuken 2ae5c96690 Merge remote-tracking branch 'origin/master' 2018-08-14 10:42:09 -04:00
Anuken fda9e6bb9c Various crashes fixed 2018-08-14 10:41:54 -04:00
Anuken 29bcb8e07c Removed bars 2018-08-14 10:29:45 -04:00
AnukenandGitHub ac1d8215ff Merge pull request #182 from Prosta4okua/patch-18
[COMPLETE]Update bundle_ru.properties
2018-08-13 22:21:06 -04:00
Anuken 8986b89d67 Removed unit ammo 2018-08-10 10:45:37 -04:00
AnukenandGitHub ef936214f0 Merge pull request #180 from Prosta4okua/patch-17
[Complete]Update bundle_uk_UA.properties
2018-08-10 10:20:43 -04:00
AnukenandGitHub 18fce6b3e3 Merge pull request #179 from cloud9350/master
Change items name texts and update font
2018-08-10 09:12:52 -04:00
Anuken 61ad9bc47d Merge remote-tracking branch 'origin/master' 2018-08-09 22:20:52 -04:00
Anuken 2b23b7876a Minor bugfix 2018-08-09 22:20:46 -04:00
AnukenandGitHub 547d334f43 Merge pull request #178 from Leone25/patch-1
update italian boundle_ita
2018-08-09 19:29:34 -04:00
AnukenandGitHub 905defe8ce Merge pull request #177 from Prosta4okua/patch-15
Update bundle_ru.properties
2018-08-09 18:35:44 -04:00
Anuken 79abb86262 Merge remote-tracking branch 'origin/master' 2018-08-09 17:45:09 -04:00
Anuken fe6f98ec5a Minor bugfixes / Added block names to bundle/ Autogen ore names 2018-08-09 17:44:52 -04:00
AnukenandGitHub e39a856e54 Update TRANSLATING.md 2018-08-09 09:47:15 -04:00
AnukenandGitHub 64e5f8155d Merge pull request #176 from cloud9350/patch-1
Update language ko file
2018-08-09 09:20:10 -04:00
Anuken 15778b2ca5 Server hotfix 2018-08-08 22:37:52 -04:00
Anuken b7842014c1 Fixed minor autotile bug 2018-08-08 22:29:56 -04:00
Anuken a804053904 Typo fix / Biomatter compressor buffed 2018-08-08 21:10:57 -04:00