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

3083 Commits

Author SHA1 Message Date
grilledham
1fa07225dd Merge branch '0.17.35_fix' of https://github.com/SimonFlapse/RedMew into 0.17.35_fix 2019-05-02 17:08:25 +01:00
grilledham
2e595264aa updated luacheck player_inventory-> character_inventory 2019-05-02 17:07:41 +01:00
SimonFlapse
6f514c9f38 Two more 2019-05-02 18:05:03 +02:00
SimonFlapse
6b145dacbe More player -> character #2 2019-05-02 17:29:55 +02:00
SimonFlapse
56b6dfbd01 More player -> character 2019-05-02 17:02:53 +02:00
SimonFlapse
69bdd747fb Fixed technology and inventory rename
Also fixed player -> character in types
2019-05-02 16:53:12 +02:00
grilledham
8ae0a618aa
Merge pull request #901 from grilledham/discord/player_deaths
print player deaths to discord
2019-05-02 14:50:39 +01:00
grilledham
e453e06097 removed unused variable Game 2019-05-02 13:47:42 +01:00
grilledham
da904702ca print player deaths to discord 2019-05-02 13:45:44 +01:00
theorangeangle
36d165afe1
Merge pull request #900 from Refactorio/theorangeangle-patch-1
fix typo in readme
2019-04-28 19:59:05 -05:00
theorangeangle
85a0b6404e
fix typo in readme 2019-04-28 19:37:28 -05:00
TWLTriston
464b25b1b9 Changed win conditions to be globals for desync prevention and correction to the wrong variable being called as a win condition for disabling biters.
TravisCI fix on varible name reuse (entity)
2019-04-25 06:21:03 -04:00
grilledham
26ea48de48 fixed desync issue with random quadrants 2019-04-25 10:38:17 +01:00
grilledham
bdb524c6db formatting 2019-04-25 10:37:49 +01:00
TWLTriston
03de8ca472 Added win condition for evolution increases and finally biter wipes from the map. 2019-04-24 22:21:06 -04:00
TWLTriston
5d06eba612 Randomized ore quadrant starting position, moved to single table for easier cross-reference 2019-04-24 18:48:52 -04:00
TWLTriston
b6d453dbb3 Converted tile references to be abstracted to the quadrant instead of ore specific 2019-04-24 17:11:20 -04:00
TWLTriston
9c4c2dce93 Converting to named ratios, reduced stone ratio by 1/2 in all quads. 2019-04-24 17:00:34 -04:00
TWLTriston
c4b6ea0bf0 Converting tile names to tables instead of string concatenation. 2019-04-24 16:45:27 -04:00
Simon
201fc80e55
[Diggy] Updated experience gui (#840)
* Updated experience gui

* Fixed XP from rocket launches

* Added more rich-text

* Updated experience gui

* Fixed XP from rocket launches

* Added more rich-text

* Added more rich_text

* Added new hail_hydra and weapon_balance

* Spitter spawn behemoth worms

* Fixed linting

* Reverted spawn chance back to 0.05

* Fixed Diggy _CHEAT

Now overrides config.lua cheats when debug is not true
2019-04-22 20:21:04 +02:00
Matthew
5fcb481e09
Merge pull request #897 from click0/develop
Fixed subtle context of text grammar in Russian localization.
2019-04-21 06:42:23 -04:00
Matthew
5db05b3eaf
Merge pull request #898 from grilledham/crashsite/disable_biter_attacks
disabled biter attacks module for crashsite
2019-04-21 06:41:18 -04:00
grilledham
186e5eedd4 disabled biter attacks module for crashsite 2019-04-21 11:38:27 +01:00
vlad11
13a664d9e7 Fixed subtle context of text grammar. Thanks @rlidwka. 2019-04-17 21:45:29 +03:00
Matthew
fd4a08c9dc
Merge pull request #891 from click0/develop
Fixed a little translation into Russian.
2019-04-16 18:31:47 -04:00
Matthew
8442a7004e
Merge pull request #896 from plague006/luacheck
Add create_profiler
2019-04-16 18:16:58 -04:00
plague006
6b5da12f81 Add create_profiler 2019-04-16 18:06:05 -04:00
Matthew
4f578cb584
Merge pull request #854 from plague006/feature/save_quick_bars
Add quick bar saving
2019-04-16 17:42:29 -04:00
plague006
41dd68c435 Polish 2019-04-16 17:33:08 -04:00
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
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