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

59 Commits

Author SHA1 Message Date
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
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
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
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
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
0ff3c1ee78 Cleanup 2020-03-08 21:53:19 -04:00
Anuken
7655b65363 Bugfixes / Fixed #1680 2020-03-06 17:06:21 -05:00
Anuken
77f406e9b8 Fixed core errors 2020-03-06 15:22:13 -05:00
Anuken
4358658889 Down to less than 100 errors 2020-03-06 14:55:06 -05:00
Anuken
5a0d079a78 oh no 2020-03-05 18:05:59 -05:00
Anuken
3ed5282e14 Better sector null checks 2020-03-01 12:15:38 -05:00
Anuken
a2a9cffdee Moved some methods around 2020-03-01 00:09:03 -05:00
Anuken
04f8282821 Better lighting 2020-02-28 13:44:03 -05:00
Patrick 'Quezler' Mounier
8bbd8489e0 Remember scroll position when a new message gets added (#1638) 2020-02-25 12:06:18 -05:00
Anuken
e3621f44da Barely functional IO 2020-02-13 19:26:36 -05:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Anuken
6882a9a355 Added persistent message server function 2020-02-10 20:22:03 -05:00
Anuken
c8455ddbc8 Added message for non-building units 2020-02-07 21:56:55 -05:00
Anuken
dfecfa3964 . 2020-02-05 20:11:49 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Anuken
da97aee8e4 it never ends 2020-02-05 13:03:22 -05:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
 2020-02-04 12:25:18 -05:00
Anuken
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken
006004fd70 Decal cleanup 2020-02-04 09:39:12 -05:00
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
Anuken
141cf518a2 Refactoring 2020-02-03 14:07:06 -05:00
Anuken
f937cb30f0 More components, less entities 2020-02-02 23:38:16 -05:00
Anuken
78fb427120 Minor fixes 2020-01-24 13:02:03 -05:00
Anuken
b16ad97d93 Updated font 2020-01-23 19:17:11 -05:00
Anuken
85e0103ff8 UI fixes 2020-01-22 11:13:27 -05:00
Anuken
2642c3c8b8 Layout improvements 2020-01-20 20:21:04 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
6e6f8f3cdb Icon cleanup 2020-01-17 22:50:27 -05:00
Anuken
569b1f788f Fixed segfault during mod loading 2020-01-17 21:28:12 -05:00
Anuken
ca519a94af Font improvements 2020-01-17 18:29:18 -05:00
Anuken
d9e5dc8ba2 Added missing icons 2020-01-17 15:24:34 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
eaa86023f9 Visual tweaks 2020-01-14 17:07:39 -05:00
Anuken
373b842c3d Bugfix 2020-01-14 13:36:15 -05:00
Anuken
68be77fa1d Added configurable block access validation 2020-01-14 10:32:52 -05:00
Anuken
c637ec15ff Deployment dialog replaced 2020-01-12 20:01:32 -05:00
Anuken
dbb06f8abd Extra clamping 2020-01-12 12:16:51 -05:00
Anuken
c8980163e9 3D progress 2020-01-07 10:32:00 -05:00
Anuken
905d7abadb Bugfixes 2019-12-29 23:49:09 -05:00
Anuken
ee4f06a9c2 Bugfixes 2019-12-29 21:45:59 -05:00
Anuken
39db62e3a5 Minimap tweaks 2019-12-29 18:56:29 -05:00