theorangeangle
fcb14d33fb
Merge pull request #1045 from Refactorio/theorangeangle-patch-2
...
other things todo:
-basic cutscene
-less biters (add preset?)
2020-04-18 12:56:56 -05:00
grilledham
c0406c5acb
Merge pull request #985 from Zahir-Khan/In_progress
...
Feature - Combat bots spawn when player kills a turret.
2020-04-18 17:46:18 +01:00
Zahir Khan
f900cb8d39
small balance change
2020-04-18 01:38:31 -04:00
grilledham
a9e81b135a
Merge pull request #1046 from grilledham/restart-fail-bug
...
Fix restart state not reset when fails to start scenario.
2020-04-16 12:50:11 +01:00
James Gillham
578f3465e4
refactor on_entity_died event
2020-04-16 12:40:43 +01:00
grilledham
7f8efca5a5
Fix restart state not reset when fails to start sceanrio.
...
When a scenario fails to start the restarting state was not reset, which prevented another restart from being started. We now clear the restarting flag.
2020-04-15 23:03:51 +01:00
Zahir Khan
ede8802e92
Modifiers for Combat bots
2020-04-06 18:15:01 -04:00
Zahir Khan
530ab4f307
Update entity_died_events.lua
...
Factorio devs fixed the bug.
2020-04-06 16:30:47 -04:00
theorangeangle
e4478f6735
Map description for danger ores
...
other things todo:
-basic cutscene
-less biters (add preset?)
2020-03-31 00:59:45 -05:00
theorangeangle
f3f26b5c44
Merge pull request #1044 from Refactorio/theorangeangle-patch-1
...
Update grid_bot_islands.lua
2020-03-30 21:32:24 -05:00
theorangeangle
dc67a9518b
Update grid_bot_islands.lua
...
remove the standard market to prevent two markets from spawning at map load
2020-03-30 17:22:19 -05:00
grilledham
287c35452c
Merge pull request #1043 from BlueRock2/poll_fix
...
Fix poll
2020-03-24 17:00:54 +00:00
Bluerock
f6b3a83c08
Fix poll
2020-03-24 10:14:46 -04:00
grilledham
f20483540e
Merge pull request #1042 from BlueRock2/fix_tasklist
...
Fix redmew shared gui tasklist
2020-03-20 16:47:00 +00:00
Bluerock
79948a0e70
Fix tasklist
2020-03-20 09:30:00 -04:00
theorangeangle
092f30cded
Merge Space Race into Code Base :D
...
Space Race is still very much a [WIP] and should be treated as such. Many features need to be added, but it is being merged in its current state to allow for easier internal integration. The map is in a playable state, and includes a configuration file.
A list of future ideas and features to implement can be found at #996 and it should be notes that this is still a "high priority" project.
2020-03-01 23:34:23 -06: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
