Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,156 Commits 4 Branches 180 Tags
69ee5257f25eca21cbdfa040f4dfbe14eae32507
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 69ee5257f2 Display current ammo type in turret info 2019-08-01 11:03:20 -04:00
Anuken b812fcddf8 Merge branch 'sound' of https://github.com/Anuken/Mindustry 2019-08-01 10:38:16 -04:00
Anuken 8393639735 Moved music control 2019-08-01 10:37:04 -04:00
Anuken dafbba0907 Fixed more things 2019-07-31 22:49:41 -04:00
Anuken 28ab2b3917 Fixed crashes not saving or displaying 2019-08-01 02:28:01 -06:00
Anuken 2be3cc2f1e a mess 2019-07-31 18:59:28 -04:00
Anuken d8085d88a8 Re-added classic sound effects for testing 2019-07-31 16:25:25 -04:00
Anuken d6b023709d Initial menu music test 2019-07-30 22:50:15 -04:00
Anuken 2459fb23ae cleanup 2019-07-30 22:06:21 -04:00
Anuken 4bd3f415a9 Smooth menu fade 2019-07-30 20:04:25 -04:00
Anuken 4414ee6d38 Fade-in effect / Fixed mobile scaling 2019-07-30 19:48:06 -04:00
Anuken fdd84066f5 format 2019-07-30 16:00:32 -04:00
Anuken 4ebf39449e . 2019-07-30 15:52:20 -04:00
Anuken d4f26e0340 Fixed sound crackle 2019-07-30 14:15:10 -04:00
Anuken a00a208ff8 Annotation processor for sound asset generation 2019-07-30 12:05:59 -04:00
Anuken bc77fd619d Spatial sound / Minor refactoring 2019-07-30 11:38:02 -04:00
Anuken 5eadd6608d Updated bundles 2019-07-30 10:23:29 -04:00
Anuken 1340b8d4d8 Better consumption display 2019-07-30 10:20:49 -04:00
Anuken 9db86f212f Typos 2019-07-30 10:12:58 -04:00
Anuken 697894274f Fixed editor restoring incorrect orientation 2019-07-30 01:02:08 -04:00
Anuken 7292479d9c Added turret ammo deficiency display 2019-07-30 00:44:41 -04:00
Anuken 301c11c208 possible oregen fix 2019-07-29 22:12:39 -04:00
Anuken 71b218ad62 just in case 2019-07-29 22:11:59 -04:00
Anuken ec2f21b944 Fixed crash on loading some older maps 2019-07-29 22:07:25 -04:00
Anuken c65b3f3aca Sound. 2019-07-29 21:59:59 -04:00
Anuken 43280ee077 Fixed numerical rules resetting on Android 2019-07-29 17:19:17 -04:00
Anuken c7e4fb8021 Audio progress 2019-07-29 17:01:55 -04:00
Anuken 132d058098 SDL input fixes 2019-07-29 15:17:10 -04:00
Anuken 8e85b71669 Fixed mobile layout 2019-07-29 12:49:09 -04:00
Anuken f439afae9e Descriptions for nearly everything 2019-07-29 12:33:11 -04:00
Anuken fdd749be18 Pre-description change 2019-07-29 10:15:44 -04:00
Anuken 666e3e51a3 Bugfixes 2019-07-28 10:53:26 -04:00
Anuken b930d5a1f9 might as well merge bloom 2019-07-27 16:16:22 -04:00
Anuken 5c10a2662d Moved clear color 2019-07-27 16:12:51 -04:00
Anuken 214f451cc1 Tweak 2019-07-27 16:10:17 -04:00
Anuken 67b4fa6f68 Map tweaks 2019-07-27 12:21:32 -04:00
Anuken aa3e7a8ef5 Finalized map number 2019-07-27 10:52:46 -04:00
Anuken 7bf6099528 Added 2 new maps 2019-07-27 09:27:03 -04:00
Anuken e90a4eb71d SDL tools 2019-07-26 21:24:07 -04:00
Anuken 7b83406ee4 Blend filter parameters / New map 2019-07-26 20:46:06 -04:00
Anuken c4157d2ec8 New map / Better filters / Sand boulders 2019-07-26 18:59:33 -04:00
Anuken 2bdfaef2d9 Fixed ores generating over spawnpoints 2019-07-26 00:11:31 -04:00
Anuken 2b0fbd9904 """better""" map generation dialog 2019-07-26 00:04:36 -04:00
Anuken 0ffa0351b5 Removed ores from existing built-in maps / Default oregen 2019-07-25 23:24:12 -04:00
Anuken 951cbf3d16 Fixed some generation issues 2019-07-25 22:18:45 -04:00
Anuken 69454048ad ??? 2019-07-25 21:27:34 -04:00
Anuken c4ceb89240 Implemented random map load filters 2019-07-25 21:27:16 -04:00
Anuken 4a638cba79 Merge remote-tracking branch 'origin/master' 2019-07-25 19:18:14 -04:00
Anuken c209528271 Cleaned up generation filter code 2019-07-25 19:18:04 -04:00
AnukenandGitHub 0d1f590937 Update CrashSender.java 2019-07-25 17:44:33 -04:00
Anuken b59b839029 OpenGL 2.1 -> 2.0 2019-07-25 13:55:57 -04:00
Anuken 513243ba0f Fixed version not parsing on crash 2019-07-25 13:21:55 -04:00
Anuken 795e774119 Canyon map 2019-07-25 13:08:07 -04:00
Anuken d02d419729 Fixed SDL crash 2019-07-25 12:46:31 -04:00
Anuken 518bffe644 SDL backend / Valid mode sprites / Better layout 2019-07-25 11:45:49 -04:00
Anuken 88d1b31aff SDL module 1 2019-07-25 10:14:01 -04:00
Anuken 4db2dbff44 Merge remote-tracking branch 'origin/master' 2019-07-25 10:09:25 -04:00
Anuken 32ad577f6d Added IKVM-specific dist command 2019-07-25 10:09:21 -04:00
AnukenandGitHub 3310f49f68 steamed generators 2019-07-25 00:22:33 -04:00
Anuken bf7803d554 Implemented gamemode validation 2019-07-24 23:05:16 -04:00
Anuken c9bd253960 Fixed drones being idiots / Added another PvP map 2019-07-24 21:25:33 -04:00
Anuken 859591cea5 Added pvp/attack map 2019-07-24 16:23:56 -04:00
Anuken b99b13a6e4 Added mirror tool for attack/PvP maps 2019-07-24 12:07:12 -04:00
Anuken c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
Anuken 52374ce06d Zone changes 2019-07-23 11:45:46 -04:00
Anuken 5a594f7d9a Bugfixes / unfinished new zones 2019-07-22 18:47:23 -04:00
Anuken aff87a26ce Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-07-22 17:01:55 -04:00
Anuken 18aae0cfa5 Zones 2019-07-22 16:09:50 -04:00
Anuken 6f0bc2ecf8 Minor build fixes 2019-07-22 12:42:42 -04:00
Anuken 8d2a637bd8 Fixed build errors 2019-07-22 00:56:00 -04:00
Anuken 54180c4768 Menu fix 2019-07-22 00:45:09 -04:00
Anuken 4e22384ed1 Merge branches 'master' and 'uiscale' of https://github.com/Anuken/Mindustry 2019-07-17 21:19:16 -04:00
Anuken 029f801159 Added UI scale slider 2019-07-17 17:20:21 -04:00
Anuken 7b09548261 Merge remote-tracking branch 'origin/master' 2019-07-14 15:25:38 -04:00
Anuken 63e1311656 Bugfixes / Incomplete zone description field 2019-07-14 15:25:30 -04:00
AnukenandGitHub 61f903dcf1 Update InputHandler.java 2019-07-14 12:54:24 -04:00
Anuken 2a10562e9e Merge remote-tracking branch 'origin/master' 2019-07-13 14:04:06 -04:00
Anuken d64796f32a Clamping of tree views 2019-07-13 14:04:01 -04:00
Anuken ad39a51fe8 nothing 2019-07-12 23:52:31 -04:00
Anuken 14d0927fb6 Basic deploy background 2019-07-12 01:03:01 -04:00
Anuken 1697465d0d Core balancing 2019-07-11 23:30:11 -04:00
Anuken e52965d039 Bugfixes 2019-07-10 09:55:31 -04:00
AnukenandGitHub a8d957bf7d Update OverdriveProjector.java 2019-07-10 09:05:47 -04:00
Anuken b6b5343e04 Cleanup 2019-07-09 15:43:11 -04:00
Anuken d4c318438d Removed buggy limited respawns 2019-07-09 12:12:43 -04:00
Anuken d8d04f2ac3 Moved block icons to UI atlas 2019-07-08 15:49:47 -04:00
Anuken 1c38e73290 a warning 2019-07-08 11:07:45 -04:00
Anuken 7fc6b9b940 Removed quit button on iOS as per guidelines 2019-07-08 10:54:02 -04:00
AnukenandGitHub fb4c65dae0 Update AboutDialog.java 2019-07-08 08:58:31 -04:00
Anuken fc9543baa7 Updated sprites/UI colors 2019-07-07 14:11:57 -04:00
AnukenandGitHub b0eaca091a Merge pull request #541 from CinExPL/patch-8 
Update bundle_pl.properties
 2019-07-06 17:13:12 -06:00
AnukenandGitHub aab13a5582 Merge branch 'master' into patch-8 2019-07-06 17:13:06 -06:00
AnukenandGitHub f852ba02d8 Merge pull request #546 from Natchuz/polish-translation 
Updated bundle_pl.properties
 2019-07-06 17:12:35 -06:00
AnukenandGitHub 4aa074b9fc Merge pull request #547 from etaoinshrdlcumwfgypbvkjxqz/zh-TW 
Update Chinese (Taiwan) translation
 2019-07-06 17:12:19 -06:00
AnukenandGitHub 2f7503c752 Merge pull request #548 from Prosta4okua/patch-3 
Update bundle_uk_UA.properties
 2019-07-06 17:12:03 -06:00
AnukenandGitHub d754593c2b Merge pull request #549 from Prosta4okua/patch-4 
Update bundle_ru.properties
 2019-07-06 17:11:43 -06:00
Anuken 07ea938885 Mobile fix / Readme updated 2019-07-06 19:08:16 -04:00
Anuken ac87930672 Balancing 2019-07-06 19:02:28 -04:00
Anuken 3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
Anuken ec7bb78ee4 Basic UI improvements 2019-07-06 14:08:43 -04:00