SimonFlapse
a9be1b46fa
Minor fixes
2019-10-27 00:51:29 +02:00
SimonFlapse
bedcb2e1a9
v0.4 king of the hill
2019-10-27 00:45:28 +02:00
SimonFlapse
09d4d76359
Added custom mirrored ore generation + Refactoring
2019-10-26 22:09:32 +02:00
SimonFlapse
52f0fe2e5c
Merge remote-tracking branch 'upstream/develop' into space_race
2019-10-26 16:26:19 +02:00
SimonFlapse
350ab55fcc
Changes from second playthrough
2019-10-21 17:20:28 +02:00
Soggs
b44ca8621b
Changes to Snakier_Swamp as proposed by grilledham.
2019-10-21 12:34:01 +02:00
Soggs
f1bfc70d43
Deleted Builders.remove_decoratives() from Builders.lua as it was a inferior duplicate of the newly added Builders.remove_map_gen_decoratives().
...
Swapped Snakey_Swamp and Snakier_Swamp to use Builders.remove_map_gen_decoratives() instead of Builders.remove_decoratives().
2019-10-21 12:21:54 +02:00
Soggs
f3ffc28512
Merge remote-tracking branch 'upstream/develop' into snakey_swamp
2019-10-21 12:15:26 +02:00
Simon
9a2e5e554f
Hilbert Water Trap + Fixes for Hilbert Sand Trap ( #998 )
...
* Initial commit of hilbert water trap
* Refactoring in features/market.lua
* Fixed ribbon for both Hilberts
* Added remove decoratives function to the builder
* Refactoring the new builder functions
* Simplifying create_standard_market
* remove_map_gen_decoratives_by_filter renamed
* Fixed documentation links having _edit in them
* Formating documents
2019-10-20 16:23:34 +02:00
Simon
5b290676d4
Update map_gen/maps/space_race/cliff_generator.lua
...
Co-Authored-By: grilledham <jrdgillham@gmail.com>
2019-10-20 14:41:01 +02:00
Soggs
78dbd16b30
Added Builders.remove_decoratives(shape) to builders.lua
...
Builders.remove_decoratives(shape) removes any decoratives in the given shape.
Update the map scripts, snakey_swamp and snakier_swamp to use this to remove decoratives from the dividers.
2019-10-20 05:24:35 +02:00
Soggs
d360169ab7
Merge remote-tracking branch 'upstream/develop' into snakey_swamp
2019-10-20 05:16:18 +02:00
SimonFlapse
f85c434077
Fixed whitespace
2019-10-19 00:03:07 +02:00
SimonFlapse
d812c71fe5
Merge remote-tracking branch 'upstream/develop' into diggy_cutscene
2019-10-18 23:41:21 +02:00
Simon
b6bcc70194
Merge branch 'develop' into patch-9
2019-10-17 23:54:40 +02:00
Simon
03f461da36
Merge branch 'develop' into map_description_fixes
2019-10-17 23:53:19 +02:00
Simon
fce544c2d1
Merge branch 'develop' into mapmodify-3
2019-10-17 20:27:42 +02:00
SimonFlapse
2a83ea5ad1
Fixed saved prices being synced between forces
2019-10-14 23:11:04 +02:00
SimonFlapse
5143a12d15
Fixed unlocking disabled research and the random research unlock
2019-10-14 22:54:15 +02:00
SimonFlapse
f0fe5ed20a
Added "random" research unlocks in the market
2019-10-14 22:29:30 +02:00
grilledham
0f88751faf
fix crashsite no wall bug
2019-10-14 19:04:46 +01:00
SimonFlapse
21bb182644
Removed sand-1 beach
2019-10-14 17:25:13 +02:00
SimonFlapse
01fb65f323
Moved entity creation to a new function
2019-10-14 17:21:36 +02:00
SimonFlapse
09a565c115
Nice beach transition
2019-10-14 17:18:06 +02:00
SimonFlapse
f131b4d483
Merge remote-tracking branch 'upstream/develop' into space_race
2019-10-14 15:43:52 +02:00
Soggs
d3e82fb1fa
Purging the evil trailing whitespaces.
2019-10-14 13:10:57 +02:00
Soggs
dd544919c8
Snakier_Swamp Initial Commit
...
Adds another ribbon style map similar to Snakey Swamp with even windier paths.
2019-10-14 13:03:22 +02:00
SimonFlapse
4e4945f159
Changes to starting resources
2019-10-14 09:59:18 +02:00
SimonFlapse
31e534c502
Merge remote-tracking branch 'upstream/develop' into snakey_swamp
2019-10-14 09:45:10 +02: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
Soggs
ef52016d25
Minor fixes to comply with automated testing.
2019-10-13 18:11:06 +02:00
Soggs
706e7bac11
Added Snakey Swamp map script.
...
Creates a ribbon works with a snakey path surrounded by water at the top and bottom.
2019-10-13 15:52:03 +02:00
SimonFlapse
edc727da05
Changed cliff generation to allow map_gen cliffs
2019-10-13 13:55:18 +02:00
SimonFlapse
68744bc91a
Disabled default cliff generation
2019-10-12 23:37:29 +02:00
SimonFlapse
1b317d2941
Fixed missing locals
2019-10-12 23:24:36 +02:00
SimonFlapse
ae3fc079a5
CLIFFS!
2019-10-12 23:23:54 +02:00
SimonFlapse
a128e0d234
Added player count to waiting gui
2019-10-12 16:57:31 +02:00
SimonFlapse
8a304ccb69
Fixed introduced bugs from last commit
2019-10-12 14:09:24 +02:00
SimonFlapse
6eb6574cc4
Refactoring + Changes from #996
2019-10-12 13:29:11 +02:00
SimonFlapse
ac7d60643b
More tweaking
2019-10-11 21:07:16 +02:00
SimonFlapse
839019514b
Result from first alpha run
2019-10-11 20:24:28 +02:00
SimonFlapse
51dfa636fc
Merge remote-tracking branch 'upstream/develop' into space_race
2019-10-11 10:17:19 +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
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
SimonFlapse
f5b40ddd07
Market items now working
2019-10-09 21:36:11 +02:00
