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

3407 Commits

Author SHA1 Message Date
Claude
10820832c8
update2
update2
2020-02-05 01:37:21 +02:00
BlueRock2
5cb7aadccf
Merge pull request #1 from Refactorio/develop
This update your fork
2020-02-04 15:05:24 -05:00
Simon
2ebf803ca1
Crowdin sync (#1019)
Also added new strings to crowdin from the english source
2020-02-03 09:44:34 +01:00
grilledham
beb4e64c34
Merge pull request #1023 from grilledham/nuke_control_on_capsule_used_changes
Updates to on_capsule_used.
2020-02-02 17:51:57 +00:00
grilledham
68f6809685 Updates to on_capsule_used.
- ignore modded fish
- don't ban/kick if enemy entites
- list entities in reason when  kick/ban
2020-02-02 13:43:17 +00:00
grilledham
368f58e178
Merge pull request #1020 from grilledham/research_printer
research_printer
2020-01-04 11:30:24 +00:00
grilledham
35d1495b35 updates 2020-01-01 15:04:33 +00:00
grilledham
e0dadb7de5 research_printer 2020-01-01 11:58:08 +00:00
theorangeangle
2b8a2440ae
Merge pull request #1009 from Claude477/patch-5
Create square_sprial_old
2019-12-31 04:33:57 -06:00
grilledham
5df240cedd
Merge pull request #1017 from Zahir-Khan/crashsite-cutscene
Fix for crashsite cutscene edge cases
2019-12-20 18:21:36 +00:00
Zahir Khan
35990dd22c Fix for crashsite cutscene edge cases 2019-12-19 21:00:50 -05:00
grilledham
be2cc08f31
Merge pull request #1011 from Tarsassum/reversion
new file:   map_gen/maps/terra.lua
2019-12-09 20:21:31 +00:00
grilledham
d367cfa068
Merge pull request #1015 from Zahir-Khan/crashsite-cutscene
Minor crashsite cutscene improvements
2019-12-08 14:21:52 +00:00
Zahir Khan
f4739e9edd
Update scenario.lua 2019-12-07 19:55:30 -05:00
Zahir
dfad5aa8e7 added mapgen to cutscene 2019-12-07 19:47:59 -05:00
theorangeangle
8be717d4bc
Merge pull request #1006 from Zahir-Khan/crashsite-cutscene
Crashsite cutscene
2019-12-04 21:51:31 -06:00
Zahir Khan
734693a19f
Update cutscene.lua 2019-12-04 16:48:26 -05:00
Zahir Khan
67478950bc
Update redmew_maps.cfg 2019-12-04 16:47:00 -05:00
Zahir Khan
5fabae9157
Update redmew_maps.cfg 2019-12-04 16:08:47 -05:00
Zahir Khan
6a43accf85
Update cutscene.lua 2019-12-04 16:07:51 -05:00
Zahir Khan
8bd484c767
Update redmew_maps.cfg 2019-12-04 15:51:07 -05:00
theorangeangle
17c433a4bb
Merge pull request #1014 from Zahir-Khan/turkey
Turkey.lua Improvements
2019-12-04 14:29:56 -06:00
Zahir Khan
db66b17314
Update cutscene.lua 2019-12-03 21:38:51 -05:00
Zahir Khan
51b89e8989
Enhancements to enable multi-surface cutscenes
The setting of the skip_btn_flag to true will...
1. Enable one press to skip cutscene while in multiple.
2. Code paths updated to ensure the Player doesn't get locked out of the game while in a multi-surface cutscene.
3. Do different things depending on which cutscene was canceled in a multi-surface cutscene.
2019-12-03 21:36:58 -05:00
Zahir Khan
b0354cdb39
Update cutscene.lua 2019-12-03 21:01:01 -05:00
Zahir
7a641312ef Merge and Update 2019-12-03 20:50:13 -05:00
Zahir Khan
e17c3d28f7 Prevent character collision 2019-12-03 20:47:30 -05:00
Zahir Khan
9ea33b6303 one skip btn press needed
Added supporting changes to cutscene_controller.lua
2019-12-03 20:47:30 -05:00
grilledham
a98aea7b49 missing entity + desync fixes 2019-12-03 20:47:30 -05:00
Zahir Khan
4244afd8c5 Condensed code 2019-12-03 20:47:30 -05:00
Zahir Khan
3afde6617b Added player valid check 2019-12-03 20:47:29 -05:00
Zahir Khan
99a7657681 Timing tweaks for the new strings. 2019-12-03 20:47:29 -05:00
Zahir Khan
46ccb4c277 Added cutscene init 2019-12-03 20:47:29 -05:00
theorangeangle
903947cd6d small changes to improve grammar and flow 2019-12-03 20:47:29 -05:00
Zahir Khan
5f456347b2 Update cutscene.lua
minor addition
2019-12-03 20:47:29 -05:00
Zahir Khan
8a0873f68f Update scenario.lua 2019-12-03 20:47:29 -05:00
Zahir Khan
20bc8cb5cb Update cutscene.lua 2019-12-03 20:47:29 -05:00
Zahir Khan
f1e8911968 Create cutscene.lua 2019-12-03 20:47:29 -05:00
Zahir Khan
0d455ac94e crashsite cutscene strings 2019-12-03 20:47:29 -05:00
Zahir Khan
d66b62c19a Added cutscene outpost 2019-12-03 20:47:29 -05:00
theorangeangle
c1359be75c
Merge pull request #988 from SimonFlapse/diggy_cutscene
[Diggy] Cutscene Fixes
2019-12-03 13:20:30 -06:00
Zahir Khan
09922c0f54
Update turkey.lua 2019-11-29 09:20:42 -05:00
Zahir Khan
7682f1967e
Use of on_nth_tick 2019-11-29 08:53:32 -05:00
Zahir Khan
d0f2fc5748
Update turkey.lua 2019-11-28 13:37:27 -05:00
theorangeangle
0e52cb3519
Merge pull request #1012 from Zahir-Khan/turkey
Added random messages to print every 10 minutes to the turkey map 
just in time!
2019-11-27 23:59:07 -06:00
theorangeangle
2225f5363f added vauge documentation that will come back to haunt me later
local time 11:49 pm and travis better approve this by midnight!
2019-11-27 23:49:24 -06:00
theorangeangle
9e72495790 after playing whack a mole for 20 mins i think it's working now. local time 11:43pm 2019-11-27 23:43:45 -06:00
theorangeangle
bd8e289e58 i wanted to add the turkey ores from the 2018 map onto the 2019 terrain but can't clear out all the errors. going to have inebriate myself and see if that makes things better or worse. -11:10pm local 2019-11-27 23:10:50 -06:00
Zahir Khan
9a6e978a27
Update turkey.lua 2019-11-27 21:01:49 -05:00
Zahir Khan
837eedcc2c
Update turkey.lua 2019-11-27 20:39:26 -05:00