Simon
03f461da36
Merge branch 'develop' into map_description_fixes
2019-10-17 23:53:19 +02:00
theorangeangle
7091e35c32
Merge pull request #976 from theorangeangle/mapmodify-3
...
fixed broken image sprite and replaced with a parity for diggy
disabled landfill on connected dots, except light water tiles
decreased the 83x pollution increase on danger ores
added disclaimer on the default map, printed in chat
Map description and info for fish islands
Map description and info for fractal balls
Map description and info for loading screen (previously "factory")
Map preview for loading screen (previously "factory")
Map description and info for fruit loops
Map description and info for gears
2019-10-17 14:07:51 -05:00
Simon
fce544c2d1
Merge branch 'develop' into mapmodify-3
2019-10-17 20:27:42 +02:00
grilledham
23f1f976a4
Merge pull request #1000 from grilledham/crashsite_wall_bug
...
fix crashsite no wall bug
2019-10-14 19:11:48 +01:00
grilledham
0f88751faf
fix crashsite no wall bug
2019-10-14 19:04:46 +01:00
Simon
bf8cd265d2
[Builder] Simple entity removal ( #994 )
...
* Simple entity removal in Builders
Performance could be improved
* Removed rocks parameter
The increased radius caused simple-entity to work
* Added another way to remove units that should be more efficient
* Changed find_entities to use area instead of radius
* removed remove_units function
* changed function name from names to name
* added table.shallow_copy
* reworked 'remove_*' builders
* used remove_* builders for existing maps
* update .luacheckrc
* Added links to documentation for each public function
* Added links for new functions
2019-10-14 00:09:47 +02:00
Simon
ca29a047de
[Snake] Added on_snake_player_died event ( #995 )
...
* Added on_snake_player_died event and a snake_demo map
* Added score to the event
* Fixed entities being destructible
Changed comment
* Fixed cases where controller type wasn't god
* Changed players controller to spectator when their snake dies
* Changed start_game call away from remote.call
* Needed new call to show the snake button
* Changed start_game to use Snake.control
* removed snake event from demo map
* Update map_gen/maps/snake_demo.lua
2019-10-11 00:28:40 +02:00
SimonFlapse
153eaf03ac
Fix for #984
2019-10-10 11:39:41 +02:00
SimonFlapse
5122634a3a
Bunch of simple map descriptions
2019-10-10 11:29:28 +02:00
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 0f87f7040a15a499bdbd7089109c2583abf01a18.
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
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
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 fc1d1af9d81431caf64969bdceea1f1fdd1ba33b, reversing
changes made to 7d56edd5823f003a4cd5ccc998ecd8de89ef6bc5.
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
