SimonFlapse
|
96eb160534
|
Added warning in default.lua to help guide newcomers
|
2019-10-10 11:10:30 +02:00 |
|
SimonFlapse
|
5975942db8
|
(Hoping to fix the removed cutscene changes)
Revert "Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene""
This reverts commit 0f87f7040a.
|
2019-10-10 11:01:16 +02:00 |
|
SimonFlapse
|
16810d4a67
|
Fixed pollution and updated map_settings reference
|
2019-10-10 10:40:32 +02:00 |
|
SimonFlapse
|
4d33c46b76
|
Merge remote-tracking branch 'upstream/develop' into mapmodify-3
|
2019-10-10 10:25:16 +02:00 |
|
SimonFlapse
|
99fe5a8d88
|
Restricted landfill to 'water' (connected_dots)
|
2019-10-10 10:24:41 +02:00 |
|
Jayefuu
|
f905cbf4d9
|
Update map_gen/maps/grid_islands_rotated.lua
Co-Authored-By: Simon <44922798+SimonFlapse@users.noreply.github.com>
|
2019-10-06 17:24:36 +01:00 |
|
grilledham
|
c6fd8ec4ea
|
Merge pull request #980 from Jayefuu/branch
Added rail_grid map preset and preview
|
2019-10-05 11:45:11 +01:00 |
|
Simon
|
1fe86c999e
|
Crowdin-Sync (2019-10-04) (#989)
|
2019-10-05 11:10:26 +02:00 |
|
SimonFlapse
|
b7511e1dc1
|
Reduced landfill pricing based upon feedback
|
2019-10-04 21:16:08 +02:00 |
|
Simon
|
3997f6ffb3
|
Toxic Jungle Danger Ores Fixes (#986)
* Fixed danger ores and removed flamethrower ammo recipe
* disabled draw_resource_selection
Disabled map_gen ore, oil and cliffs.
Added map info
|
2019-10-04 21:01:11 +02:00 |
|
SimonFlapse
|
fa4442d644
|
"Fixed" LuaPlayer being invalid messages
|
2019-10-04 20:59:32 +02:00 |
|
grilledham
|
661cd205a4
|
fixed comment
|
2019-09-28 14:33:27 +01:00 |
|
grilledham
|
ea7c027495
|
travis linting
|
2019-09-28 14:31:19 +01:00 |
|
grilledham
|
781cd11178
|
refactor rail_grid
|
2019-09-28 14:23:57 +01:00 |
|
grilledham
|
004bb0500f
|
Merge pull request #983 from curiosity-a/develop
Fix stress corruption caused by water #552
|
2019-09-17 18:36:20 +01:00 |
|
curiosity
|
03dba62d30
|
Refactoring
|
2019-09-15 12:00:23 +03:00 |
|
curiosity
|
9dd4f8a3bb
|
Refactoring
|
2019-09-15 11:47:18 +03:00 |
|
curiosity
|
f3ebccce0b
|
Fix stress corruption caused by water #552
|
2019-09-14 19:40:43 +03:00 |
|
Jayefuu
|
6d9791beb4
|
Updated map descriptions and landfill tech from maps named in issue #906
|
2019-09-11 20:57:39 +01:00 |
|
grilledham
|
e96cbfa680
|
Added Builders.change_map_gen_tiles(shape, new_tile_map).
|
2019-09-11 20:51:04 +01:00 |
|
Jayefuu
|
1ad53c842d
|
Added rail_grid lua and png files. Suitable for vanilla but also used on modded.
|
2019-09-11 19:31:38 +01:00 |
|
grilledham
|
ef89b1fb8c
|
Merge pull request #978 from grilledham/diggy-fix_require
Fix require for Popup.player
|
2019-09-08 13:34:31 +01:00 |
|
grilledham
|
def7d53da2
|
fix require for Popup.player
|
2019-09-08 13:18:50 +01:00 |
|
theorangeangle
|
0f87f7040a
|
Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene"
This reverts commit fc1d1af9d8, reversing
changes made to 7d56edd582.
|
2019-09-01 22:01:32 -05:00 |
|
theorangeangle
|
b8077ba60d
|
fixed autofill config typo
|
2019-09-01 20:25:21 -05:00 |
|
theorangeangle
|
b7be1388cd
|
Merge pull request #947 from SimonFlapse/diggy_cutscene
Cutscene Controller
|
2019-09-01 20:23:37 -05:00 |
|
grilledham
|
dbf1af7e2f
|
Merge pull request #974 from grilledham/crashsite/updates
reduce number of trees correctly
|
2019-09-01 20:23:36 -05:00 |
|
grilledham
|
16a0f3cb09
|
reduce number of trees correctly
|
2019-09-01 20:23:35 -05:00 |
|
grilledham
|
618c0da180
|
Merge pull request #973 from grilledham/crashsite/updates
Crashsite/updates
|
2019-09-01 20:23:34 -05:00 |
|
grilledham
|
48a4cd6d93
|
less trees
|
2019-09-01 20:23:33 -05:00 |
|
grilledham
|
9096239021
|
remove missing items
|
2019-09-01 20:23:32 -05:00 |
|
grilledham
|
15076ab857
|
Merge pull request #972 from grilledham/crashsite/oil_change
0.17.60 oil changes
|
2019-09-01 20:23:31 -05:00 |
|
grilledham
|
60cc102c7a
|
0.17.60 oil changes
|
2019-09-01 20:23:30 -05:00 |
|
grilledham
|
ca081b7c53
|
Merge pull request #971 from grilledham/crashsite/desert
Crashsite/desert
|
2019-09-01 20:23:29 -05:00 |
|
grilledham
|
0bf02b92fd
|
desert preset
|
2019-09-01 20:23:28 -05:00 |
|
grilledham
|
fc7ed1e735
|
refactor to allow multiple crashsite presets
|
2019-09-01 20:23:27 -05:00 |
|
grilledham
|
0a5227c255
|
Merge pull request #970 from grilledham/crashsite/updates
spawn market to neutral force
|
2019-09-01 20:23:26 -05:00 |
|
grilledham
|
cf835fcf32
|
spawn market to neutral force
|
2019-09-01 20:23:25 -05:00 |
|
grilledham
|
97faf305f6
|
Merge pull request #968 from grilledham/crashsite/updates
Crashsite updates [Waiting for 0.17.59]
|
2019-09-01 20:23:24 -05:00 |
|
grilledham
|
b9354c614d
|
reverted small oil refinery changes
|
2019-09-01 20:23:23 -05:00 |
|
grilledham
|
eac5daa56f
|
increased advanced circuit output
|
2019-09-01 20:23:22 -05:00 |
|
grilledham
|
20e836c47e
|
outpost balance
|
2019-09-01 20:23:21 -05:00 |
|
theorangeangle
|
c2b454a775
|
Merge pull request #953 from theorangeangle/mapmodify-3
Mapmodify 3
|
2019-09-01 20:23:20 -05:00 |
|
theorangeangle
|
fc1d1af9d8
|
Merge pull request #947 from SimonFlapse/diggy_cutscene
Cutscene Controller
|
2019-08-31 20:52:28 -05:00 |
|
theorangeangle
|
616541bee9
|
fixed whitespace and added map preview for "loading screen"
|
2019-08-28 22:13:54 -05:00 |
|
theorangeangle
|
c5d09f50fa
|
fixed broken image sprite and replaced with a parity
|
2019-08-28 21:40:27 -05:00 |
|
grilledham
|
7d56edd582
|
Merge pull request #974 from grilledham/crashsite/updates
reduce number of trees correctly
|
2019-08-03 14:34:47 +01:00 |
|
grilledham
|
3e28c29a70
|
reduce number of trees correctly
|
2019-08-03 14:26:34 +01:00 |
|
grilledham
|
55fca6d183
|
Merge pull request #973 from grilledham/crashsite/updates
Crashsite/updates
|
2019-08-03 13:23:37 +01:00 |
|
grilledham
|
afa2019faa
|
less trees
|
2019-08-03 12:16:19 +01:00 |
|