Commit Graph

339 Commits

Author SHA1 Message Date
Anuken
c931bbf107 Merged with master 2018-05-06 01:43:12 -04:00
Anuken
37a73eda37 Fixed menu opening and closing when chat is open 2018-05-05 18:36:25 -04:00
Anuken
b496f51afc Added turk bundle, updated wrapping, added fastshoot kick message 2018-05-05 13:45:04 -04:00
Anuken
c1163a078a Updated translation bundles, added autowrap to menu 2018-05-05 13:18:21 -04:00
Anuken
c1066e94f2 Implemented drone sprite, basic AI 2018-05-03 22:54:21 -04:00
Anuken
8a83e0fc1a Fixed server compile errors, added resupply point block 2018-04-30 22:28:47 -04:00
Anuken
d0a44906fe API changes for getting traces and upgrades 2018-04-28 19:52:38 -04:00
Anuken
e5f6b7f66c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-28 16:28:58 -04:00
Anuken
cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -04:00
Anuken
deefab8a5b Implemented ammo ressuplying 2018-04-24 21:38:57 -04:00
Anuken
8581213126 Moved bullet FX to ammo type, beginning of weapon rework 2018-04-23 21:35:40 -04:00
Anuken
1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java
2018-04-21 18:47:43 -04:00
Anuken
48061d3cae Fixed flick scroll issues 2018-04-21 18:03:43 -04:00
Anuken
ccd25c7e76 Implemented basic minimap 2018-04-19 21:57:55 -04:00
Anuken
7df232c65d Added block rubble, more liquid interaction 2018-04-19 19:06:52 -04:00
Anuken
739e636a2c Added 'sleeping entity' optimization 2018-04-17 17:07:04 -04:00
Anuken
b020bf6816 Variable name refactorings / Untested entity sleeping 2018-04-17 09:31:41 -04:00
Anuken
871b6548ab Implemented player explosion intensity calculation / Fixed fire spread 2018-04-15 22:41:27 -04:00
Anuken
3adc599278 Implemented fire 2018-04-15 17:12:09 -04:00
Anuken
6007e511ba Implemented basic block explosion modeling 2018-04-15 15:49:50 -04:00
Anuken
01fc7108d8 Implemented conveyor item access 2018-04-15 13:05:18 -04:00
Commodore64x
c17b34c70d Added Placement Preview 2018-04-15 19:40:22 +10:00
Anuken
458d4378f0 Removed liquid storage 2018-04-14 21:13:10 -04:00
Anuken
4e77f24a06 Implemented inventory capacity 2018-04-14 12:00:42 -04:00
Anuken
fcf62ada8f Changed inventory system to use real core inventory 2018-04-14 11:14:00 -04:00
Anuken
86b7966027 Implemented item dragging and transferring 2018-04-13 23:55:53 -04:00
Anuken
43c9bc51dc Implemented basic block inventories 2018-04-13 20:05:42 -04:00
Anuken
1789fadbf6 Merged with master 2018-04-08 10:46:48 -04:00
Anuken
98ec2dcf44 Implemented passable liquids 2018-04-07 23:24:33 -04:00
Anuken
4b39e5fab6 Fully implemented teleporters 2018-04-07 19:31:42 -04:00
Anuken
7cf619e620 Back button usage cleanup 2018-04-06 17:07:33 -04:00
Anuken
05356776c5 Static effects / Better shell ejections / Implemented new cannon turret 2018-04-04 21:13:49 -04:00
Anuken
f0302ca7dc Changed file sorting comparator to ignore case 2018-03-28 09:39:29 -04:00
Anuken
707e57e72d Added many new block types, changed land unit AI, bugfixes 2018-03-26 20:26:36 -04:00
iczero
30fc96e4da Make chat scrollable, other chat fixes 2018-03-26 00:45:42 -07:00
Anuken
3418979f4d Content class reorganization, beginning work on unit factory 2018-03-25 13:12:32 -04:00
Anuken
5c748fbe54 Upgrade purchase verification, various bugfixes for 3.5 2018-03-24 14:07:07 -04:00
Anuken
8eb2a13efd Added host/join info text 2018-03-24 12:25:56 -04:00
Anuken
4e9d1d348e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-23 22:48:51 -04:00
Anuken
238c589ad6 Unified turret outlines, fixed saves not working 2018-03-21 20:04:59 -04:00
Anuken
85988a2ff9 More map editor improvements, turret outline rendering 2018-03-21 16:45:05 -04:00
Anuken
d5493e6149 Fixed overlapping background on Android 2018-03-20 18:42:12 -04:00
Anuken
216b3969ed Minor admin bugfixes, made players wait 30 seconds after being kicked 2018-03-20 18:27:19 -04:00
Anuken
ba7be0293c Added changelog to 'about' dialog, for Android users 2018-03-19 20:54:34 -04:00
Anuken
5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
Anuken
172ac78466 New map format, completely broke loading or playing 2018-03-17 21:21:24 -04:00
iczero
2eae473429 Add chat_scroll_up and chat_scroll_down to keybinds 2018-03-17 17:08:02 -07:00
iczero
12686460c1 Add chat history 2018-03-17 12:19:52 -07:00
Anuken
ba84bb82b4 Implemented a basic unit 2018-03-17 00:41:56 -04:00
Anuken
4a7c722673 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-16 22:18:58 -04:00