1
0
mirror of https://github.com/Refactorio/RedMew.git synced 2024-12-14 10:13:13 +02:00
Commit Graph

356 Commits

Author SHA1 Message Date
vlad11
0e7f6986b7 Fixed some errors that occurred after merging other commits. 2019-04-16 23:56:25 +03:00
vlad11
66b9da4e92 Revert "Fixed a some spelling errors and improved translation into Russian syntax."
This reverts commit ec3a8e00
2019-04-16 23:46:05 +03:00
vlad11
ec3a8e00cf Fixed a some spelling errors and improved translation into Russian syntax. 2019-04-16 23:35:22 +03:00
vlad11
204787f8f8 Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
#	locale/ru/redmew_gui.cfg
2019-04-16 23:34:26 +03:00
plague006
03149901fa Add quick bar saving 2019-04-16 15:42:24 -04:00
Matthew Heguy
7bcf77dc1d Move localization to correct file after rebase. 2019-04-16 13:43:27 -04:00
vlad11
466cd73014 Fixed a little error (syntax) translation into Russian. 2019-04-08 00:27:03 +03:00
Ku3mi41
54daa39ad6 fixed typos 2019-04-08 00:23:10 +03:00
Ku3mi41
41834a14e0 feat(player_list): added internationalization 2019-04-08 00:21:39 +03:00
vlad11
f198179188 Fixed a some spelling errors and improved translation into Russian syntax. 2019-04-07 22:59:22 +03:00
vlad11
329fe9f2d7 Fixed a little translation into Russian. 2019-04-07 22:35:25 +03:00
Ku3mi41
60a74e5314
fixed typos 2019-04-06 17:50:06 +07:00
Ku3mi41
b02929edf0 feat(player_list): added internationalization 2019-03-30 22:17:29 +07:00
Ku3mi41
a77e6ded7b feat(locale): added partial russian translate 2019-03-29 21:30:32 +07:00
Matthew
b52aac027d
Merge pull request #861 from plague006/channel_name
Update channel name
2019-03-06 16:15:50 -05:00
Matthew Heguy
102d468c13 Update channel name 2019-03-06 14:33:57 -05:00
Simon
7b0156b1c9
Merge branch 'develop' into Quadrants 2019-03-05 15:11:27 +01:00
SimonFlapse
4fb657cbc3 Added localization 2019-03-05 00:51:56 +01:00
Simon
a366cfdf82
Fix typo
Co-Authored-By: plague006 <plague006@users.noreply.github.com>
2019-03-04 15:46:26 -05:00
plague006
dc0b597f5e Add player_onboarding 2019-03-04 06:38:54 -05:00
plague006
b589544e4e move toast to correct file 2019-03-04 04:30:54 -05:00
plague006
db6b321170 Remove redmew-setting commands to match #852 2019-03-04 01:57:51 -05:00
plague006
fe9eda2e45 Small updates+fixes 2019-03-03 17:54:51 -05:00
plague006
891a863e68 Remove venus and its modules, silly_player names, walkabout, rusky_pvp and tempban 2019-03-03 17:22:01 -05:00
plague006
3268ec550e Change print strings to localised strings 2019-03-03 17:22:00 -05:00
Valansch
b7912a5fa8 Add check_locale.sh and update travis.yml to detect missing keys, deleted english values in locale/de/ 2019-03-03 17:22:00 -05:00
plague006
55aa7fd916 Command descriptions
Remove search_command
Overhaul meltdown commands
Localize some gui
2019-03-03 17:21:59 -05:00
plague006
fc48d264cf Commands to locale
Change target_name refs to poll the player
2019-03-03 17:21:47 -05:00
Valansch
c4ea7c0fa3 Create de locale 2019-03-03 17:20:05 -05:00
plague006
58e231af5c Isolate rusky_pvp strings 2019-03-01 23:48:40 -05:00
plague006
8b814316e4 Take offline and invalid players for probation add/remove as well as regular-remove 2019-02-24 08:25:14 -05:00
Matthew
566735e905
Merge branch 'develop' into regular_command 2019-02-23 12:19:15 -05:00
plague006
ec7d638228 on-join -> welcome 2019-02-22 17:37:51 -05:00
Matthew Heguy
d4a6d2b237 Add on_death 2019-02-22 17:37:51 -05:00
Matthew Heguy
19fb003f7e Expand donator messages 2019-02-22 17:37:50 -05:00
plague006
f143f9583a Break regular+probation commands apart, switch to localised strings, refine color use 2019-02-22 15:07:55 -05:00
Matthew Heguy
ffed15c30e Do not punish if there are multiple passengers 2019-02-20 13:07:47 -05:00
Matthew Heguy
8907e828f5 Remove quote in locale 2019-02-20 12:40:25 -05:00
Matthew Heguy
5c362be410 print_admins to use locale 2019-02-20 12:27:03 -05:00
SimonFlapse
307ba3684c Prevent train grief 2019-02-19 18:19:09 -05:00
plague006
dfad6180ba Refine error message 2019-02-18 20:51:39 -05:00
plague006
e4eff300f2 Add toast command 2019-02-16 20:14:04 -05:00
Matthew
9587c37926
Merge branch 'develop' into fix/command_locale 2019-02-16 17:01:09 -05:00
plague006
600d6b8865 Clean up conditions, change countdown time
Prevent additional saves after apocalypse is active. Give feedback when running command after it is active.
2019-02-16 16:46:18 -05:00
Matthew Heguy
41c88ec682 Move to localised strings, command only runs twice now. no special string 2019-02-14 19:21:43 -05:00
Matthew Heguy
d6d4df26f0 Change command feedback and help text to use locale 2019-02-14 14:35:11 -05:00
Matthew Heguy
98ea714560 Restore functionality of whois 2019-02-13 14:12:40 -05:00
Matthew Heguy
52a0622995 Use locale for new rank system 2019-02-12 20:23:20 -05:00
Maik Wild
dd1f298a31 locale/gen_[...] ==> map_gen/[...] #152 2018-01-19 15:18:01 +01:00
Maik Wild
66e5d2ae0e locale/utils/ ==> utils/ #152 2018-01-19 15:08:48 +01:00
Maik Wild
26d9bbb878 locale/resources/ ==> resources/ 2018-01-19 15:03:41 +01:00
Maik Wild
386f4f312f _locale/ ==> locale/ #152 2018-01-19 15:02:08 +01:00
Maik Wild
f63050c1a4 Removed unused files #152 2018-01-19 15:00:07 +01:00
Valansch
109554c91a
Merge pull request #151 from grilledham/map_lines_and_balls
Map lines and balls
2018-01-18 15:31:04 +01:00
grilledham
1006984824 removed old code 2018-01-17 11:59:55 +00:00
grilledham
e5af112ec4 removed commented out lines 2018-01-16 20:35:30 +00:00
grilledham
393de1f999 added lines and balls map 2018-01-16 16:57:54 +00:00
grilledham
0b5a2ed09d corrected typo 2018-01-15 17:28:10 +00:00
grilledham
66483f5a52 added map_gen_not_threaded 2018-01-15 17:25:46 +00:00
grilledham
10d9023457 change map gen to use actions that are reused 2018-01-15 17:25:29 +00:00
grilledham
4585779a6b Allow actions in thread_queue to be kept alive if they return true 2018-01-15 17:24:48 +00:00
grilledham
ad1877ece7 Added helpful comments to template 2018-01-15 17:23:36 +00:00
Valansch
562bd6bd5e removed deprecated user groups code again? 2018-01-07 22:28:00 +01:00
Maik Wild
468878b289 stone-rock ==> rock-big 2017-12-28 22:53:39 +01:00
Maik Wild
d98022947b added a dismembered hooker 2017-12-28 22:47:41 +01:00
Maik Wild
85a310847e removed red planet 2017-12-28 22:45:49 +01:00
Maik Wild
ba1f81c3e6 Renamed rocks and grass to 0.16 compatibe names 2017-12-28 22:45:27 +01:00
Maik Wild
1dd02d2e76 changed additional variable names from sand-1 to sand 2017-12-28 21:54:19 +01:00
Maik Wild
9cffe0e5e8 further tile name changes 2017-12-28 21:32:22 +01:00
Maik Wild
adda0b94a5 fixed missing ) 2017-12-28 21:02:36 +01:00
Maik Wild
3163d8c4e8 Added log output in case of error in Thread.lua 2017-12-28 20:55:45 +01:00
Maik Wild
8207c277bb fixed accidental name changes 2017-12-28 20:53:48 +01:00
Maik Wild
13bd4969f0 ported tile names from 0.15 to 0.16 2017-12-28 19:11:25 +01:00
Maik Wild
e52341219a island resort: implemented run_chart_update. Ported commit 68397ed7f96 2017-12-28 18:17:29 +01:00
grilledham
92e12b37dd Updated tile_map for 0.16 tile names 2017-12-24 16:07:58 +00:00
grilledham
b92ac4e95b Added template 2017-12-24 16:07:07 +00:00
TWLTriston
69815e84bb GUI updates for #129 2017-12-15 11:52:26 -05:00
Valansch
f59a17f632 moved presets back into /locale/ because they are tiny 2017-12-05 20:15:03 +01:00
TWLTriston
76b3693619 Next map's tweaks 2017-11-28 10:00:08 -05:00
Valansch
d0d0c23711
Merge pull request #124 from Valansch/develop_nextmap
Current map config, moved all LUA out to separate _locale folder to keep save file size down
2017-11-26 17:35:57 +01:00
TWLTriston
fda06bb6dc Fish market bug fix and RSO tweaks from current map 2017-11-22 17:55:51 -05:00
TWLTriston
aa3e5fcef5 Moved all map gen data into the _locale folder to keep save files managable 2017-11-20 11:29:01 -05:00
TWLTriston
f3647face5 Leave the forests alone! 2017-11-20 11:17:30 -05:00
TWLTriston
d48afec47f Final version 2017-11-20 08:51:13 -05:00
TWLTriston
b54cf39e03 Merge branch 'develop_decos' of https://github.com/Valansch/RedMew into develop_decos 2017-11-16 09:00:28 -05:00
TWLTriston
fce96ea3f8 Map config 2017-11-16 04:27:54 -05:00
Maik Wild
7d122ed5a7 Moved poisson rng to utils, fixed a potential nil reference and fixed poison typo 2017-11-16 04:27:54 -05:00
TWLTriston
edf992da12 Order of operations on Misc vs ores in map layout to allow glitter to take effect. Also implemented the poisson RNG 2017-11-16 04:27:46 -05:00
TWLTriston
533c8572e7 Additional tweaks and reordered the biomes to be next to each other 2017-11-16 04:27:27 -05:00
TWLTriston
4c3a7779ce Current status, messing with decoratives 2017-11-16 04:27:06 -05:00
TWLTriston
1802153657 Grass tiles now get dagobah swamp based values 2017-11-16 04:26:09 -05:00
TWLTriston
ea5259cadf Multi row and column representation for all tile types. 2017-11-16 04:25:10 -05:00
TWLTriston
9580f449f8 As deployed / playtested with changes. 2017-11-16 04:22:28 -05:00
Maik Wild
ac8bac3ef1 Moved poisson rng to utils, fixed a potential nil reference and fixed poison typo 2017-11-16 04:22:17 -05:00
TWLTriston
11c7382607 Order of operations on Misc vs ores in map layout to allow glitter to take effect. Also implemented the poisson RNG 2017-11-16 04:22:17 -05:00
TWLTriston
469976af33 Additional tweaks and reordered the biomes to be next to each other 2017-11-16 04:22:05 -05:00
TWLTriston
5ecca117c2 Current status, messing with decoratives 2017-11-16 04:22:05 -05:00
TWLTriston
8c024f3ed9 Grass tiles now get dagobah swamp based values 2017-11-16 04:21:29 -05:00
TWLTriston
2d16463cb0 Multi row and column representation for all tile types. 2017-11-16 04:21:29 -05:00
TWLTriston
c88f119a2e Start of the deco overlay on picture maps -- working on a biome test area 2017-11-16 04:21:29 -05:00
TWLTriston
bdf1bfdc6e As deployed / playtested with changes. 2017-11-16 04:16:01 -05:00
Maik Wild
6d65656cf0 Moved poisson rng to utils, fixed a potential nil reference and fixed poison typo 2017-11-16 04:15:47 -05:00
TWLTriston
f1b3e0ffb8 Order of operations on Misc vs ores in map layout to allow glitter to take effect. Also implemented the poisson RNG 2017-11-16 04:15:47 -05:00
TWLTriston
51d646f026 Additional tweaks and reordered the biomes to be next to each other 2017-11-16 04:15:32 -05:00
TWLTriston
73878a00c9 Current status, messing with decoratives 2017-11-16 04:15:31 -05:00
TWLTriston
1a770ecca2 Grass tiles now get dagobah swamp based values 2017-11-16 04:14:54 -05:00
TWLTriston
910b55f650 Multi row and column representation for all tile types. 2017-11-16 04:14:54 -05:00
TWLTriston
5a5d77f7ca Start of the deco overlay on picture maps -- working on a biome test area 2017-11-16 04:14:54 -05:00
Valansch
dae8b0bdb1 moved UK map to grilledham_map_gen 2017-11-12 15:55:55 +01:00
Valansch
ee34a08ae5 Imported Airs uk map 2017-11-10 13:04:47 +01:00
Triston
41f27fe5a5
Merge pull request #114 from Valansch/dev_custom_prints
Dev custom prints
2017-11-10 06:14:15 -05:00
Valansch
d143880f1d implemented print_admins and print_except 2017-11-09 20:28:56 +01:00
TWLTriston
3daf67a591 Added left, converted Glitter to misc to allow RSO + Glitter. Tweak to the RSO base to balance ores better, may need a rebalance 2017-11-08 06:25:28 -05:00
TWLTriston
3815ab3eb4 Merge branch 'develop' of https://github.com/Valansch/RedMew into develop 2017-10-30 06:37:43 -04:00
Valansch
90abbb5650 Merge branch 'develop_fish_income' into develop
# Conflicts:
#	map_layout.lua
2017-10-29 12:18:03 +01:00
Valansch
182a166474 Merge branch 'dev_dimentions' into develop 2017-10-29 12:17:30 +01:00
Valansch
e7ffffac9f Chanced get_nice_surface_name call 2017-10-28 11:42:38 +02:00
Valansch
c3ad532058 Implemented 9th dimention: Nihil 2017-10-28 11:31:59 +02:00
TWLTriston
ccf34c51d1 Final tweaks to RSO based on playtesting 2017-10-28 05:07:41 -04:00
Valansch
8c98491577 Changed looking for players form distance to find_entities_filtered 2017-10-27 23:06:11 +02:00
Valansch
fe02be51da added death world wreck items dimention #103
added nuke to wreck items
2017-10-26 17:32:31 +02:00
Valansch
70a055a495 implemented debug outout and enable/disable for nuke_control.on_player_mined 2017-10-26 16:28:08 +02:00
Valansch
59a6a9cc5b Made portals independent of entity #103 2017-10-26 10:40:14 +02:00
Valansch
cbdae2e08f implemented portals and magic chests and added link commands 2017-10-25 22:24:10 +02:00
Valansch
66da00f1fb Thread logarithmic actions per tick increase proposal 2017-10-25 13:00:45 +02:00
Triston
92a505ecc4 Merge branch 'develop' into develop_swamp_threaded 2017-10-25 06:41:13 -04:00
TWLTriston
827e7d0455 Grass drawing fix 2017-10-25 06:25:56 -04:00
Valansch
2745b80ce8 Dimentions: Implemented Portal and different surfaces 2017-10-25 01:51:49 +02:00
TWLTriston
8f2ceaa383 Updates to allow threaded to run faster and fixed dagobah to be threaded 2017-10-23 07:24:05 -04:00
TWLTriston
ce54d23d5c Threaded updates 2017-10-23 06:45:46 -04:00
TWLTriston
87b933a9bc Adding missing maps and updating the first market 2017-10-23 06:27:36 -04:00
TWLTriston
2dfaa43d0c Initial start of cleanup for swamp threaded 2017-10-22 22:07:32 -04:00
TWLTriston
98820ddeb2 Red planet is now threaded 2017-10-21 07:14:50 -04:00
TWLTriston
8e38ebc8ed Updated regulars, added mona lisa gen 2017-10-18 05:29:49 -04:00
Valansch
bcdbfe4eed added death messages to mines.lua 2017-10-15 16:07:11 +02:00
Valansch
735c6b718a updated worms to call using string 2017-10-15 01:54:20 +02:00
Valansch
0d840b6e14 implemented mines 2017-10-15 01:53:39 +02:00
Valansch
348096bb87 Merge branch 'develop_island_threaded' into develop
# Conflicts:
#	locale/gen_combined/island_resort.lua
2017-10-14 23:47:36 +02:00
TWLTriston
4ea1c60465 Updated regular's list 2017-10-14 05:19:18 -04:00
TWLTriston
628b9d94b3 Changed setTiles to happen in one hit to avoid chunk edge problems 2017-10-11 11:37:03 -04:00
TWLTriston
41dbaeaa5f Changes to Island to Threaded 2017-10-11 11:01:27 -04:00
Valansch
65fd551e27 Merge pull request #86 from Valansch/develop_borg_threaded
Conversion of borg planet to threaded generation
2017-10-11 16:58:34 +02:00
Valansch
ef091f42f2 Merge pull request #85 from Valansch/dev_island_resort
Cleanup to island resort code, elseifs and whitespace mostly.
2017-10-11 16:58:09 +02:00
TWLTriston
d7ba450760 Additional updates to the way callbacks are handled, using "STRING" names instead of serializing the function seems to resolve the desync issues. 2017-10-10 12:21:04 -04:00
Triston
1949a9eb86 Merge pull request #84 from Valansch/dev_worms
Dev worms
2017-10-10 06:41:45 -04:00
TWLTriston
d6149e0fab Conversion of borg planet to threaded generation 2017-10-10 06:35:30 -04:00
TWLTriston
cbf618327c Cleanup to island resort code, elseifs and whitespace mostly.
Overall -- did not affect game stutter, however code is playtested.
2017-10-06 04:03:02 -04:00
Triston
2a42074a89 Merge pull request #83 from Valansch/dev_async_worker
Implemented Thread.queue_action
2017-10-06 04:00:10 -04:00
Valansch
059a80bbe6 Implemented worms 2017-10-06 02:14:38 +02:00
Valansch
adbb1b36be Implemented Thread.queue_action 2017-10-06 02:13:56 +02:00