Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,162 Commits 4 Branches 180 Tags
a4bd1dcc6ddec9cdb1f85599707721e1edaeffe7
Commit Graph

184 Commits

Author SHA1 Message Date
Anuken
a4bd1dcc6d Mod event support 2020-05-04 17:57:08 -04:00
Anuken
becc23ca42 Cleaner formatting 2020-05-03 21:18:25 -04:00
Anuken
b399ed1ed6 cleanup 2020-05-03 18:01:56 -04:00
Anuken
de77d80dab Save config when picking blocks 2020-05-03 11:35:58 -04:00
Anuken
53e7c03730 Enabled flow rates by default 2020-05-03 10:06:47 -04:00
Anuken
135b87fdb2 Cleanup, optimization 2020-05-01 16:35:18 -04:00
Anuken
f6bf229b0a Cleanup 2020-04-26 21:59:49 -04:00
Anuken
1b2e10d355 Cleanup, re-implementations 2020-04-24 11:01:17 -04:00
Anuken
58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Anuken
a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Anuken
0eaf9bc9c6 Various prototypes 2020-04-15 12:44:53 -04:00
Olexandr Nesterenko
95d603a035 Separate the use of map name and player name (#1863) 
* change use 'name'

* remove schematic.name
 2020-04-14 10:04:05 -04:00
Blockzilla101
501253d13a added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog (#1846) 
* added name of player to baning/kicking/vote-kicking/admining

* slight tweaks

* fixed redundant things
 2020-04-12 10:52:05 -04:00
Patrick 'Quezler' Mounier
9e811be477 Name which map name has a conflict when importing (#1844) 2020-04-12 09:56:36 -04:00
Anuken
f163601262 Better unit control effects 2020-04-11 11:34:51 -04:00
Anuken
b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties
 2020-04-11 10:37:52 -04:00
Anuken
2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -04:00
Anuken
aedd047c6f Slightly improved mod dialog 2020-04-10 11:49:22 -04:00
Anuken
2a74bb742b Added landing sound 2020-04-08 22:06:43 -04:00
Anuken
a241d6f5bb Minor cleanup 2020-04-08 10:54:45 -04:00
Anuken
7b25b09c18 Bugfixes 2020-04-07 14:08:42 -04:00
Anuken
5fbe925429 Revert "Moved launch button" 
This reverts commit 83bc3e4e
 2020-04-07 11:29:23 -04:00
Anuken
83bc3e4e8d Moved launch button 2020-04-05 14:26:15 -04:00
Anuken
191d7fe1ef Cleanup 2020-04-03 19:40:45 -04:00
Anuken
e17052a452 Bugfixes / Builder changes / Planning layer changes 2020-04-03 13:37:35 -04:00
Anuken
d611dd107a Bugfixes 2020-04-02 22:45:13 -04:00
Anuken
d0b2f63553 Tweaks 2020-04-02 14:56:53 -04:00
Anuken
a26cd46a7e Reflective planet water 2020-04-02 12:32:55 -04:00
Anuken
f1fd072400 Game state cleanup 2020-03-31 14:16:38 -04:00
Anuken
115e3a737b Cleanup 2020-03-29 23:06:58 -04:00
Anuken
fc65812263 Added cubemap stars 2020-03-29 19:39:29 -04:00
Anuken
7ba7e14282 Atmosphere tweaks 2020-03-29 18:34:00 -04:00
Anuken
f22e1bdeb3 Added planet atmosphere shader 2020-03-29 17:08:25 -04:00
Anuken
65bf97bc03 Removed need for local.properties file 2020-03-28 17:03:52 -04:00
fuzzbuck
643d054294 Add search bar in playerlist (#1572) 
* add "search" bar in playerlist

* remove log.info

* clear keyboard focus & text on toggle

* refactor sField -> field (fixes build??)

* refactor field -> sField (revert) should build now 👍

* remove drawEach boolean, simplify everything (please ignore previous commits)

* escape color codes

* use Strings.stripcolors & check for & without color codes
 2020-03-26 19:01:24 -04:00
Anuken
152a987c3a Experimental flow display 2020-03-26 17:19:18 -04:00
Anuken
f966489298 Various tweaks 2020-03-25 23:28:20 -04:00
Anuken
e7ffb0214f Fixed some invalid sectors 2020-03-25 16:04:19 -04:00
Anuken
7d5ceafff2 Implemented #1129 / Bugfixes 2020-03-24 12:02:26 -04:00
Anuken
ea3e16ee16 Added water check 2020-03-22 09:44:38 -04:00
Anuken
196a9dd77e Fixed incorrect plane projection 2020-03-21 19:11:13 -04:00
Anuken
d673167477 Added basic ground AI 2020-03-21 10:49:38 -04:00
Anuken
966321baca Merge remote-tracking branch 'origin/master' 2020-03-19 20:02:48 -04:00
Anuken
f2f39573bb Color cleanup 2020-03-19 20:02:43 -04:00
Anuken
6cbc42d9de Fixed unnecessary Color rgba methods 2020-03-19 20:00:04 -04:00
Anuken
c7bc05f560 Unlock tweaks 2020-03-19 12:45:21 -04:00
Anuken
e9994794aa Sector lock state 2020-03-19 11:29:18 -04:00
Anuken
6bf031d0f5 Planet render cleanup 2020-03-18 13:32:23 -04:00