Commit Graph

5004 Commits

Author SHA1 Message Date
Patrick 'Quezler' Mounier
095c65f36c Remove crater from bundle 2020-01-04 21:10:09 +01:00
Patrick 'Quezler' Mounier
7adf8cfdef Merge branch 'master' into crater 2020-01-04 20:05:50 +01:00
Dave
5f1ea4b098 UX improvements for showTextInput (#1290)
* Added keyDown support for showTextInput (Enter, Escape, Back)

* Removed unnecessary "this"

* Added cursor autofocus on showTextInput
2020-01-04 12:39:57 -05:00
DeltaNedas
1dd0295c45 make turnCursor: false mechs not cross eyed (#1301)
* create new branch

* add targetDistance to weapons for mechs

players will use if turnCursor is false
2020-01-04 12:15:43 -05:00
Anuken
ea66d9a92f Merge remote-tracking branch 'origin/master' 2020-01-04 12:10:21 -05:00
Anuken
197769a9fe Fixed #1319 2020-01-04 12:10:03 -05:00
Simon Woodburry-Forget
439605f6e8 use findAll to iterate through mod content (#1313) 2020-01-04 00:32:03 -05:00
Patrick 'Quezler' Mounier
2666b564c2 Revamp comment 2020-01-03 20:19:44 +01:00
Patrick 'Quezler' Mounier
0ae627c56b Revert "Tweak next tile treshold"
This reverts commit a629aeef75.
2020-01-03 19:03:34 +01:00
Patrick 'Quezler' Mounier
81de3d2c7d Fix typo 2020-01-03 18:49:33 +01:00
Patrick 'Quezler' Mounier
57cd03c0c2 Remove crater inactivity 2020-01-03 18:43:06 +01:00
Patrick 'Quezler' Mounier
a629aeef75 Tweak next tile treshold 2020-01-03 18:35:51 +01:00
Patrick 'Quezler' Mounier
b8e32304a3 Purge newline 2020-01-03 17:45:29 +01:00
Patrick 'Quezler' Mounier
e2d0ab5161 Move bundle entries around 2020-01-03 17:42:05 +01:00
Patrick 'Quezler' Mounier
73040de839 Change bundle description 2020-01-03 17:41:05 +01:00
Patrick 'Quezler' Mounier
097334726d Change respawn & idle from frames to integers 2020-01-03 17:36:05 +01:00
Patrick 'Quezler' Mounier
6efcbe69a0 Get rid of compressable 2020-01-03 17:29:08 +01:00
Patrick 'Quezler' Mounier
f6af699428 Revert "🎩"
This reverts commit 10e4268dd5.

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
2020-01-03 17:26:19 +01:00
Patrick 'Quezler' Mounier
5a21387762 Add inb4 2020-01-03 17:23:57 +01:00
Patrick 'Quezler' Mounier
1f6d3dca0e Give craters surfboards to stream 2020-01-03 17:18:48 +01:00
Patrick 'Quezler' Mounier
0b0007502f Revert "Differentiate texture from armored conveyor"
This reverts commit 59451fcc0b.
2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier
59451fcc0b Differentiate texture from armored conveyor
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
2020-01-03 17:09:06 +01:00
Patrick 'Quezler' Mounier
12b034d16b Tweak default conveyor stats 2020-01-03 16:47:37 +01:00
Patrick 'Quezler' Mounier
68dca82ab8 Refractor for readability 2020-01-03 16:42:28 +01:00
Patrick 'Quezler' Mounier
edbe50d8c4 Get rid of track enum 2020-01-03 16:20:23 +01:00
Patrick 'Quezler' Mounier
644d54c3f1 Move drawer back from crater to tile 2020-01-03 16:12:38 +01:00
Patrick 'Quezler' Mounier
f4a7f98b0b Fix blending 2020-01-03 16:00:58 +01:00
Patrick 'Quezler' Mounier
315bb483f2 Replace headless check with inactivity 2020-01-03 12:30:55 +01:00
Patrick 'Quezler' Mounier
d843f29e09 Make crater speed configurable 2020-01-03 12:19:33 +01:00
Patrick 'Quezler' Mounier
0807e1bd25 List boostable item capacity in stats 2020-01-03 12:13:33 +01:00
Patrick 'Quezler' Mounier
4aaaf3292e Add cooldown after crater moved 2020-01-03 11:56:29 +01:00
Patrick 'Quezler' Mounier
8c7d8abddd Inflate crater properties 2020-01-03 11:40:45 +01:00
Patrick 'Quezler' Mounier
aa64dcfe27 Update target before launch
So it has the chance to make room before it receives the crater from the caller.
2020-01-03 11:28:46 +01:00
Patrick 'Quezler' Mounier
f94c7e6105 Move launch checks 2020-01-03 11:23:47 +01:00
Patrick 'Quezler' Mounier
7b0456a227 Launch only when full 2020-01-03 11:11:54 +01:00
Patrick 'Quezler' Mounier
cad13b61bb Merge branch 'master' into crater
# Conflicts:
#	core/src/mindustry/mod/ClassAccess.java
2020-01-03 08:01:22 +01:00
Anuken
7fa61eaf3b Added server MOTD 2020-01-02 22:09:33 -05:00
Patrick 'Quezler' Mounier
4a238cff77 Begone 🔭 2020-01-02 22:09:12 +01:00
Patrick 'Quezler' Mounier
3f754116d8 Tweak crater movement 2020-01-02 22:06:41 +01:00
Patrick 'Quezler' Mounier
13e378c7d3 Birth base conveyor class 2020-01-02 22:06:18 +01:00
Patrick 'Quezler' Mounier
e289f13d27 - newline 2020-01-02 21:40:04 +01:00
Patrick 'Quezler' Mounier
f0bfe24008 Remove crater bundle entry 2020-01-02 21:34:56 +01:00
Patrick 'Quezler' Mounier
0ae6527584 Sacrifice hivemind to convert craters to drawings
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.

Forgive me future ai overlord <3
2020-01-02 21:29:19 +01:00
Anuken
e214a8e7c0 Merge remote-tracking branch 'origin/master' 2020-01-02 14:10:22 -05:00
Anuken
cb76e80836 Bugfixes 2020-01-02 14:08:41 -05:00
KSean222
d161ba442f Set primitive wrapping to false for scripts (#1302)
* Set primitive wrapping to false for scripts

* Added one newline cause why not
2020-01-02 14:07:38 -05:00
Patrick 'Quezler' Mounier
10e4268dd5 🎩
Leaving this here until it gets merged or something :)
2020-01-02 09:02:37 +01:00
Patrick 'Quezler' Mounier
317f40eecd Use tree score instead of looping each crater twice 2020-01-02 08:51:49 +01:00
Patrick 'Quezler' Mounier
ec32f65646 Avoid recursion 2020-01-02 08:11:37 +01:00
Patrick 'Quezler' Mounier
f1a455d7f1 Uproot the way the update order works 2020-01-02 07:57:32 +01:00