Commit Graph

433 Commits

Author SHA1 Message Date
Patrick 'Quezler' Mounier
6fb4c79f82 Fix sleeping while reloading 2020-03-05 14:29:27 +01:00
Patrick 'Quezler' Mounier
9c75133fc8 Blend tripod dumper with conveyors 2020-03-05 14:21:41 +01:00
Patrick 'Quezler' Mounier
fd61add2e4 Cleanup update loop 2020-03-05 14:10:28 +01:00
Patrick 'Quezler' Mounier
acd695a469 Messy cleanup 2020-03-05 13:40:44 +01:00
Patrick 'Quezler' Mounier
5036506547 Rotate smoother 2020-03-05 13:28:23 +01:00
Patrick 'Quezler' Mounier
b0becbad38 Fix unloading prematurely 2020-03-05 13:22:50 +01:00
Patrick 'Quezler' Mounier
ecb09c0f04 Dump like bridges do 2020-03-05 12:11:55 +01:00
Patrick 'Quezler' Mounier
2025c7c669 Fix mech dropoff ¬ working 2020-03-05 10:35:48 +01:00
Patrick 'Quezler' Mounier
00249f62b6 Cleanup if chains 2020-03-05 10:28:10 +01:00
Patrick 'Quezler' Mounier
9df875354a Revert "Repurpose branch to be played"
This reverts commit ff578c8540.

# Conflicts:
#	tools/crater-deploy.sh
2020-03-05 10:10:00 +01:00
Patrick 'Quezler' Mounier
9bc340ba17 Fix end ¬ rendering 2020-03-05 10:08:22 +01:00
Patrick 'Quezler' Mounier
79c965bf8d Move sleep detector to renderer 2020-03-05 10:08:15 +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
Patrick 'Quezler' Mounier
3b2b7be72a Remove nested app.post (#1667) 2020-03-04 11:58:16 -05:00
Anuken
c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
Anuken
503607e36a Fixed #1661 2020-03-04 08:39:48 -05:00
Anuken
2a191a45be Cleanup 2020-03-03 12:11:47 -05:00
Anuken
ceac809c1d Cleanup 2020-03-02 10:44:56 -05:00
Anuken
c3a790bfd2 2 2020-03-01 16:29:04 -05:00
Anuken
7d84300c31 Updated arc 2020-03-01 16:22:38 -05:00
Anuken
ab7e840eee Cleanup 2020-03-01 16:20:42 -05:00
Anuken
38ab1473f2 Backport of fixed lighting + overflow crash fix 2020-02-28 13:46:16 -05:00
Anuken
bc7671b08d Merge remote-tracking branch 'origin/master' 2020-02-27 10:08:19 -05:00
Patrick 'Quezler' Mounier
8bbd8489e0 Remember scroll position when a new message gets added (#1638) 2020-02-25 12:06:18 -05:00
Patrick 'Quezler' Mounier
ce1884512d Null the block as well? (#1630) 2020-02-24 11:44:39 -05:00
Anuken
c8a762df42 Minor assignment tweak 2020-02-22 19:53:14 -05:00
Anuken
501e909039 Merge remote-tracking branch 'origin/master' 2020-02-22 19:32:10 -05:00
Anuken
2cd69230e0 Changed feathub link 2020-02-22 19:32:01 -05:00
Patrick 'Quezler' Mounier
b7a8fa4191 Fix typo in banned comment (#1617) 2020-02-21 13:49:15 -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
bobthebadguy
de560ac6f8 Fixed small typo (#1613)
Now there are 70 pull requests.
2020-02-21 09:58:11 -05:00
Patrick 'Quezler' Mounier
ff652f2515 +1 technical correctness (#1615) 2020-02-21 09:57:48 -05:00
Anuken
e8ca5fe211 More iOS stuff 2020-02-19 11:03:12 -05:00
Anuken
73995c7764 Merge remote-tracking branch 'origin/master' 2020-02-19 10:21:42 -05:00
iczero
b3e9e12279 Reset local player name on disconnect 2020-02-18 21:52:42 -05:00
Anuken
4a55dde5ee Bugfixes 2020-02-18 19:54:35 -05:00
Anuken
378a5d5239 Removed bloom on iOS 2020-02-18 12:40:53 -05:00
Anuken
0f43690aaf More unlocks? 2020-02-18 11:43:06 -05:00
Anuken
2038409283 Removed schematic replacement dialog 2020-02-18 11:35:28 -05:00
Anuken
b96d5c417f Fixed #1601 2020-02-17 09:27:51 -05:00
Anuken
1fe0a7d81e Fixed mock audio package 2020-02-15 12:41:57 -05:00
Anuken
d37886b2cd Fixed #1585 2020-02-14 09:51:09 -05:00
Anuken
58b31bd799 Added support for animations w/ pixelation + map screenshots 2020-02-13 10:04:45 -05:00
Anuken
c067be2add Added client creation event 2020-02-13 09:11:35 -05:00
Anuken
031b6e0bf8 Fixed #1565 2020-02-12 13:26:29 -05:00
Anuken
258945a45a Team validation 2020-02-12 12:47:02 -05:00
Anuken
e798619679 Bugfixes 2020-02-12 11:25:00 -05:00
Anuken
5c48ae2158 Fixed #1558 / Fixed #1556 2020-02-12 10:16:43 -05:00
Anuken
bb380f7feb Fixed #1555 2020-02-11 23:15:51 -05:00
Anuken
3102931cb4 Removed script wrapper 2020-02-11 17:50:16 -05:00