Bluerock
79948a0e70
Fix tasklist
2020-03-20 09:30:00 -04:00
grilledham
d45009d1aa
Merge pull request #1038 from BlueRock2/Diggy_oil_spacing
...
Diggy - Prevent oil from spawning too close to other oil patches
2020-02-19 22:54:49 +00:00
grilledham
8b3a0bbfd6
Merge pull request #1033 from BlueRock2/BlueRock_branch2
...
Diggy patch for ore showing up on top of water
2020-02-19 22:54:28 +00:00
Simon
d4cab5ef9f
Removed trailing whitespace (Travis CI)
2020-02-18 22:53:59 +01:00
BlueRock (on discord)
b89ba937fe
Update scattered_resources.lua
2020-02-18 16:23:21 -05:00
BlueRock (on discord)
1896b282f4
Updated with Simon's suggestions.
2020-02-18 15:41:54 -05:00
BlueRock (on discord)
24c20bdf17
Update scattered_resources.lua
...
Updated to use count_entities_filtered with limit instead of find_entities_filtered
2020-02-16 16:54:39 -05:00
Bluerock
54fa0be54b
Prevent oil from spawning too close to other oil patches.
2020-02-16 12:27:57 -05:00
grilledham
84ccb2a0be
Merge pull request #1032 from BlueRock2/develop
...
Diggy-map patch
2020-02-15 16:21:40 +00:00
BlueRock (on discord)
0abf22ad91
Update hail_hydra.lua
...
Merging this hail hydra particle fix (PR 1035) with PR 1032 (diggy patch for 0.18) since all of the updates are related to the particle changes in Factorio 0.18
2020-02-14 13:48:48 -05:00
grilledham
1e708bf27f
Merge pull request #1034 from grilledham/crashsite_world
...
crashsite world map
2020-02-08 14:15:11 +00:00
grilledham
8ef36c6099
crashsite world map
2020-02-08 13:47:51 +00:00
Bluerock
ca8b0b09c2
Patch for ore spawning on top of water inadvertently introduced in PR #983 to resolve issue #552 .
2020-02-06 06:21:22 -05:00
Bluerock
1dd7d474c0
Merge remote-tracking branch 'upstream/develop' into BlueRock_branch2
2020-02-05 21:58:11 -05:00
BlueRock (on discord)
1692f094e8
Merge pull request #4 from Claude477/patch-7
...
update4
2020-02-04 18:58:25 -05:00
Claude
4899b4bf7d
update4
...
update4
2020-02-05 01:57:12 +02:00
BlueRock (on discord)
aef0788f89
Merge pull request #3 from Claude477/patch-6
...
update3
2020-02-04 18:48:34 -05:00
BlueRock (on discord)
902540aa17
Merge pull request #2 from Claude477/patch-5
...
update2
2020-02-04 18:48:03 -05:00
Claude
dd801ec7c9
update3
...
update3
2020-02-05 01:39:56 +02:00
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
