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

3152 Commits

Author SHA1 Message Date
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
048fa5aef6
Merge pull request #857 from grilledham/server/get_data_timeout
Added function to cancel a Server.try_get_data requests
2019-04-16 14:44:32 -04:00
Matthew
820a95111d
Merge pull request #889 from grilledham/map/terraforming_daner_ores
Revisions to the danger ores scenario
2019-04-16 14:38:28 -04:00
grilledham
64deca9778 refactor + docs 2019-04-16 14:36:59 -04:00
grilledham
40353c19f8 cancelable try_get_data 2019-04-16 14:36:59 -04:00
Matthew
9225b154df
Merge pull request #758 from plague006/biter_attacks
Add biter_attacks
2019-04-16 14:17:45 -04:00
Matthew
d6343143f8
Merge pull request #877 from plague006/fix/paint
Validity check in paint
2019-04-16 14:06:05 -04:00
Matthew Heguy
2f44acdd15 Change to number difficulty scaling 2019-04-16 14:00:30 -04:00
Matthew Heguy
7bcf77dc1d Move localization to correct file after rebase. 2019-04-16 13:43:27 -04:00
plague006
73e7acab57 Add biter_attacks 2019-04-16 13:43:27 -04:00
Matthew
995dbfa4d6
Merge pull request #895 from plague006/error_logging
Fix event_view sorting, change name of error logging files.
2019-04-16 13:42:22 -04:00
plague006
4d1e6cb444 Fix event_view sorting, change name of error logging files. 2019-04-16 13:32:13 -04:00
grilledham
f3d5ec9500
Merge pull request #893 from Cooldude2606/develop
Fixed Game.get_player_from_any not working for indexs
2019-04-15 23:47:56 +01:00
Cooldude2606
601f940b3f Game.get_player_from_any not working for indexs 2019-04-09 20:27:07 +01: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
cc4455efcc fix(player_list): removed unused variables 2019-04-08 00:21:44 +03:00
Ku3mi41
41834a14e0 feat(player_list): added internationalization 2019-04-08 00:21:39 +03:00
Matthew
b2b94e0975
Merge pull request #888 from Ku3mi41/develop
feat(player_list): added internationalization
2019-04-07 16:41:31 -04: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
grilledham
1aa17045c5
Merge pull request #4 from TWLTriston/develop
Changes on danger ores.
2019-03-31 15:59:52 +01:00
grilledham
5e990cca2c
Merge branch 'map/terraforming_daner_ores' into develop 2019-03-31 15:59:23 +01:00
grilledham
48178f912d updates 2019-03-31 13:51:26 +01:00
Ku3mi41
f952f76cbd fix(player_list): removed unused variables 2019-03-30 23:00:49 +07:00
Ku3mi41
b02929edf0 feat(player_list): added internationalization 2019-03-30 22:17:29 +07:00
TWLTriston
d378fd1387 - Modified the terrain tile generation to match the ore quadrants, smoothed the quadrant edges with some faux gradiant randomness 2019-03-30 08:58:17 -04:00
TWLTriston
44259be9d3 - Added scenario info and what's new into the map gen file to allow tracking and accountability to those who join the server. 2019-03-30 06:54:10 -04:00
TWLTriston
27e4c17268 - Increased the starting pond size to help control madness at spawn and visually reinforce the quandrant realities of the map 2019-03-30 06:32:55 -04:00
TWLTriston
880d154577 - Slight increase to uranium threshold to increase frequency based on playtesting. 2019-03-30 06:29:09 -04:00
TWLTriston
bcaedb4267 - Reduced min pollution level based on play testing. 2019-03-30 06:21:10 -04:00
TWLTriston
fbb8f17253 - Bug fix: Allow cars and tanks to be placed onto ore piles. 2019-03-30 06:20:49 -04:00
Matthew
4b4816ae9a
Merge pull request #886 from Ku3mi41/develop
added partial russian translate
2019-03-29 16:58:44 -04:00
Ku3mi41
a77e6ded7b feat(locale): added partial russian translate 2019-03-29 21:30:32 +07:00
TWLTriston
ded03fdcbc Removed unused variables 2019-03-27 20:57:02 -04:00
TWLTriston
81f38a89b8 Adding game field defiition 2019-03-27 18:39:29 -04:00
TWLTriston
befa9253af Fix to unused global variables (commented out for now), small whitespace cleanup on game definition 2019-03-27 18:38:11 -04:00
TWLTriston
c41e296c95 * Modified the ore generation to be quadrant based with more balance towards .17
* upped minimum pollution to keep map smaller
* reduced base tech multiplier to 20
* removed pollution factor and increased time factor for enemy evolution
2019-03-27 18:17:41 -04:00
grilledham
9184b2940f
Merge pull request #884 from grilledham/crashsite/updates
moved refineries to not touch storage tanks
2019-03-26 21:43:32 +00:00
grilledham
0aab1c61b7 Merge branch 'crashsite/updates' of https://github.com/grilledham/RedMew into crashsite/updates 2019-03-26 21:34:04 +00:00
grilledham
9af73833fa roate refineries 2019-03-26 21:27:51 +00:00
grilledham
efd05016a1 moved refineries to not touch storage tanks 2019-03-26 21:14:53 +00:00
Matthew Heguy
79492b3e4a Validity check in paint 2019-03-17 12:42:07 -04:00
Matthew
a437324592
Merge pull request #876 from plague006/fix/entity_placement_restriction
Fix logic in entity_placement_restriction
2019-03-16 15:27:24 -04:00
Matthew Heguy
13c93425a7 Fix logic in entity_placement_restriction. Closes #875 2019-03-16 14:35:09 -04:00
grilledham
15648bd66e
Merge pull request #874 from grilledham/crashsite/updates
crashsite updates
2019-03-16 13:31:56 +00:00
grilledham
92d2ee4ae7 updates 2019-03-16 13:08:44 +00:00