James Gillham
b2cd925d3a
Update gui styles for 0.18.27
2020-05-26 17:35:14 +01:00
theorangeangle
8f9092cd64
Merge pull request #1001 from SimonFlapse/auto-server-description
...
Server description generator, rich text
2020-05-18 15:04:40 -05:00
theorangeangle
e9e5cf91d3
Revert "added a description for SP use"
...
This reverts commit b4a370d660
2020-05-10 17:16:12 -05:00
theorangeangle
b4a370d660
added a description for SP use
2020-05-10 17:15:09 -05:00
theorangeangle
f474b562af
Merge pull request #991 from SimonFlapse/concrete_jungle
...
Concrete Jungle - the map is complete, only remaining things to do are are
- migrate description to wiki
- add cutscene
- bring into regular map rotation (this is an interesting map that we should run more often)
2020-05-10 16:23:52 -05:00
theorangeangle
90dae3ded6
add map preview
2020-05-10 16:22:59 -05:00
theorangeangle
191667aec6
Merge pull request #979 from Jayefuu/patch-9
...
Changes to Maltease Crossings as per #906 - Map might need some balance changes but in terms of "does it work as intended" the answer is yes
2020-05-10 16:11:35 -05:00
grilledham
6e649ab0e7
Merge pull request #1051 from grilledham/fix/remove-comp-chest-from-cheat-items
...
Remove compilatron-chest from cheat items.
2020-04-29 21:51:48 +01:00
James Gillham
c65090321a
Remove compilatron-chest from cheat items.
...
Looks like they have been removed from the game so we have to remove them from the cheat items to allow cheat mode to still work.
2020-04-29 21:50:48 +01:00
grilledham
76c88a721e
Merge pull request #1050 from Zahir-Khan/patch-1
...
Minor fix in Crashsite entity_died_events.lua
2020-04-29 21:43:53 +01:00
Zahir Khan
645eb375a9
Minor fix
...
event parameter added to do_spawn_entity
2020-04-28 23:06:41 -04:00
grilledham
7c70d36b41
Merge pull request #1049 from Zahir-Khan/In_progress
...
Artillery kills cause bots to spawn and shoot across the map.
2020-04-28 08:27:28 +01:00
grilledham
de0ba2fa6c
Merge pull request #1047 from Ogg-Technologies/develop
...
Added maze_with_rooms map
2020-04-27 19:09:00 +01:00
Jayefuu
9b27034345
Update dino_island.lua
2020-04-26 16:22:50 +01:00
Zahir Khan
e7d5044b59
different spawn rate for arty vs arty
2020-04-25 19:46:04 -04:00
Zahir Khan
8238351252
Artillery will cause bots to spawn
2020-04-25 18:17:12 -04:00
Oskar
f963e50910
Fixed reloading
2020-04-19 19:53:58 +02:00
Oskar
1c82183ab5
Added ores at dead ends
2020-04-19 16:59:53 +02:00
Oskar
2566d7fca0
Small refactoring
...
Added missing local to functions
Moved requires to the top
Removed unused Event require
Renamed remove_dead_ends functions
2020-04-19 11:47:55 +02:00
Oskar
960971d6cb
Added maze_with_rooms map
...
Added a new map which makes everything void except a random maze
Randomly sized rooms are placed around the maze
2020-04-18 20:26:51 +02:00
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
