Anuken
dfcf11fb07
Removed mech-related bundle entries
2020-04-26 11:24:52 -04:00
Anuken
838e12cc0a
stop
2020-04-25 12:30:18 -04:00
Anuken
09e08a474b
Plastanium conveyor + bugfixes
2020-04-24 20:17:24 -04:00
Anuken
21946cafd1
Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater
2020-04-24 15:46:32 -04:00
Anuken
6041e238a6
Bugfixes
2020-04-24 12:01:08 -04:00
Patrick 'Quezler' Mounier
32e32ecae2
Merge branch '6.0' into crater
...
# Conflicts:
# core/assets/icons/icons.properties
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
2020-04-16 22:38:51 +02:00
Patrick 'Quezler' Mounier
79a095faa8
Merge branch '6.0' into crater
2020-04-16 20:30:13 +02: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
Patrick 'Quezler' Mounier
5c28985ee6
Merge branch '6.0' into crater
...
# Conflicts:
# core/assets/icons/icons.properties
# 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/content/Blocks.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/BlockStorage.java
2020-04-16 12:39:52 +02:00
Patrick 'Quezler' Mounier
424e58ff7d
Merge branch 'master' into crater
2020-04-16 11:20:16 +02: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
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
Vanguard
4c9b034153
Updated Phantom description ( #1809 )
...
Added info "Rebuilds destroyed blocks"
2020-04-03 08:21:39 -04:00
Patrick 'Quezler' Mounier
74e94e5344
Merge branch 'master' into crater
2020-04-02 12:05:04 +02:00
Anuken
084c90ba9f
Improved atmosphere shader performance
2020-03-30 11:35:22 -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
NickZhYT
281f2f7a64
Update bundle.properties ( #1747 )
...
Some description edits
2020-03-26 18:40:34 -04:00
Anuken
152a987c3a
Experimental flow display
2020-03-26 17:19:18 -04:00
Anuken
d346442e86
Changed "global" -> "community" servers
2020-03-26 12:39:54 -04:00
Anuken
7d5ceafff2
Implemented #1129 / Bugfixes
2020-03-24 12:02:26 -04:00
Anuken
436c76fd2f
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/src/mindustry/world/blocks/BuildBlock.java
2020-03-17 20:03:12 -04:00
Patrick 'Quezler' Mounier
4f195b72d1
Merge branch 'master' into crater
2020-03-15 22:00:51 +01:00
ma44
ec34e27102
map setting refund ( #1709 )
2020-03-15 14:02:47 -04:00
Anuken
7e781d9ff8
Bugfixes
2020-03-14 12:29:12 -04:00
Anuken
d7f9090c0b
Fixed #1672
2020-03-09 09:41:39 -04:00
Patrick 'Quezler' Mounier
bcb87f8f76
Update description accordingly
2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts
2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description
2020-03-05 10:50:08 +01:00
Patrick 'Quezler' Mounier
e5e4884448
Merge branch 'master' into crater
...
# 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/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
Anuken
f1aadd97a8
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/src/mindustry/core/Logic.java
# gradle.properties
2020-03-03 12:12:25 -05:00
Anuken
f88fe898ff
Updated bundle
2020-03-01 21:23:50 -05:00
Anuken
1e53ea50b0
Added support for export/import of all basic terrain as image
2020-02-26 19:37:22 -05:00
Anuken
cfbe631e66
Merge
2020-02-23 20:14:38 -05:00
DeltaNedas
fe22d334dc
Separate ambient light and solar panel efficiency ( #1593 )
...
* new branch
* Separate ambient light and solar panel efficiency
* Made ambient light -> solar efficiency default
2020-02-21 11:38:56 -05:00
Anuken
32dcae8fd3
Update bundle.properties
2020-02-19 13:49:40 -05:00
Anuken
1d1c73fd6f
Merge
2020-02-19 13:10:25 -05:00
Anuken
4a55dde5ee
Bugfixes
2020-02-18 19:54:35 -05:00
Anuken
2038409283
Removed schematic replacement dialog
2020-02-18 11:35:28 -05:00
Anuken
47f075133f
Merge
2020-02-13 11:22:29 -05:00
Anuken
0678f54e25
Fixed bloom darkening sprites / Changed pixelate desc
2020-02-13 10:17:43 -05:00
Anuken
a2706a80b1
Merged with master
2020-02-09 12:27:44 -05:00
Anuken
c8455ddbc8
Added message for non-building units
2020-02-07 21:56:55 -05:00
Patrick 'Quezler' Mounier
99d1a2829f
Merge branch 'master' into crater
2020-02-06 19:33:57 +01:00
Anuken
a5fd881f8d
Full implementation of #1494
2020-02-05 19:01:53 -05:00
Patrick 'Quezler' Mounier
05ccdfd51b
Merge branch 'master' into crater
...
# 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/world/modules/ItemModule.java
2020-02-05 10:26:34 +01: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
