Commit Graph

783 Commits

Author SHA1 Message Date
Anuken
daa7b20e4a World generation launch pad preset 2019-01-09 16:37:14 -05:00
Anuken
33afab7294 Launchpad block 2019-01-09 11:44:33 -05:00
Anuken
048b7bd32f Global inventory / 'Deploying' / Removed command center 2019-01-09 09:07:48 -05:00
Anuken
28fa0b070d Merge branch 'unsector'
# Conflicts:
#	core/src/io/anuke/mindustry/maps/SectorPresets.java
#	core/src/io/anuke/mindustry/maps/Sectors.java
#	core/src/io/anuke/mindustry/maps/TutorialSector.java
#	core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
#	core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
2019-01-08 22:28:13 -05:00
Anuken
fed964e0f7 a rather large merge 2019-01-07 21:10:57 -05:00
Anuken
ee9f65d4a3 Block class merge 2019-01-07 18:39:06 -05:00
Anuken
0a6f7ac817 Functional play button 2019-01-03 20:42:34 -05:00
Anuken
153e6c5f1b Re-structuring 2019-01-03 19:46:25 -05:00
Anuken
b8e6e5df61 Power PR merged / Various bugfixes
Closes #288
2019-01-03 18:22:13 -05:00
Anuken
120e0f6971 Changed several more resources 2019-01-02 18:49:04 -05:00
Anuken
dd1034e37b Merge 2018-12-31 19:03:51 -05:00
Anuken
41f16a54de Logo downscale 2018-12-30 12:54:03 -05:00
Anuken
b91510efb3 Input fixes 2018-12-30 11:41:06 -05:00
Anuken
36b27458b6 Merged 4x graphics 2018-12-28 23:46:09 -05:00
Anuken
75709a7812 Fixed android version / Smooth zoom 2018-12-28 16:05:49 -05:00
Anuken
bc9110b344 Fixed most world rendering 2018-12-28 13:01:35 -05:00
Anuken
3fc278c7b7 Fixed most main menu bugs 2018-12-27 17:14:07 -05:00
Anuken
db546412f1 Arc compatibility update 2018-12-27 15:47:17 -05:00
Anuken
3b42b604e1 Successful desktop compilation 2018-12-26 17:38:40 -05:00
Anuken
8879593381 hhhhhhh 2018-12-26 13:22:31 -05:00
Anuken
44e4ffbe62 Fixed most things besides drawing 2018-12-22 22:17:28 -05:00
Anuken
3abfaf1bca ctrl-shift-f 2018-12-21 21:33:05 -05:00
Anuken
94908bc599 🔥🔥🔥🔥🔥🔥maximum breakage 2018-12-20 12:38:27 -05:00
Anuken
cabcfc7136 Initial creation of Arc port 2018-12-20 11:49:32 -05:00
Anuken
6029b6d67f Updated smooth UI 2018-12-14 22:07:43 -05:00
Anuken
9d744580a1 Merge 2018-12-14 21:48:34 -05:00
Anuken
fefdad5335 Minimap switched to container 2018-12-14 10:27:23 -05:00
Anuken
982f9ce8fb Padding fix 2018-12-14 00:12:08 -05:00
Anuken
5c6d4b9ac2 Fixed extremely strange join dialog server padding 2018-12-14 00:09:44 -05:00
Anuken
49954f5c07 Merge remote-tracking branch 'origin/master' 2018-12-13 18:02:05 -05:00
Anuken
0b837925a2 Build script reformatting / 'Fixed' all unchecked warnings 2018-12-13 18:01:51 -05:00
Clarence "Sparr" Risher
54dd67a435 Center sectors map on most recently saved (played and not abandoned) sector (#375) 2018-12-13 17:35:24 -05:00
Anuken
aeb28f67e4 Overlapping icon button casings will bother me no more 2018-12-13 16:46:45 -05:00
Anuken
df44f82198 Drownable tar and lava 2018-12-12 10:10:15 -05:00
Anuken
97d54868e9 Grid mode tweak 2018-12-11 17:48:55 -05:00
Anuken
65e65ba308 Formatting cleanup / Bugfix 2018-12-11 17:29:13 -05:00
indielm
8b3b72243f Gridmode and eyedropper select (#372)
* Gridmode

Adds keybindings to category and block selection

* bugfixes and comments

* more keybind

* Update PlacementFragment.java

* Update PlacementFragment.java

* eyedropper crashfix

* formatted with default.xml
2018-12-11 17:24:05 -05:00
Anuken
13e5df62c9 Removed fog classes 2018-12-10 14:12:50 -05:00
Anuken
c1a7b452e0 Misc cleanup 2018-12-09 23:28:36 -05:00
Anuken
81c24b3de1 Fixed file chooser style / Fixed sector save invisibility 2018-12-06 22:27:39 -05:00
Anuken
2f726cf7f2 (2) 2018-12-06 19:57:26 -05:00
Anuken
6bf7d8b111 ok desktop 2018-12-04 18:30:55 -05:00
Anuken
6d59fe3080 Bugfixes 2018-12-03 10:33:50 -05:00
Anuken
e33c863162 Bugfixes 2018-12-02 16:56:44 -05:00
Anuken
3397d6c907 Misc bug/crash fixes 2018-12-02 12:03:18 -05:00
Anuken
58b87aa999 Additional crash fixes 2018-11-30 13:49:43 -05:00
Anuken
99fb1a4c5f Implemented null-items for sorters and item sources 2018-11-30 10:28:27 -05:00
Anuken
be48ed5589 Fixed another boring layout issue 2018-11-29 16:37:22 -05:00
Anuken
897c296fbe Fixed server crash 2018-11-29 16:30:41 -05:00
Anuken
0eec5383ed UI fixes / Better ghost connection fix 2018-11-29 12:07:43 -05:00