Zahir Khan
ba6cdf9c49
Added player valid check
2019-11-20 22:20:49 -05:00
Zahir Khan
9bea5a4439
Timing tweaks for the new strings.
2019-11-18 18:47:07 -05:00
Zahir Khan
e9c7bb0ce0
Added cutscene init
2019-11-18 18:22:14 -05:00
theorangeangle
d4cb84610c
small changes to improve grammar and flow
2019-11-17 23:21:50 -06:00
Zahir Khan
42a4c90b20
Update cutscene.lua
...
minor addition
2019-11-18 00:08:27 -05:00
Zahir Khan
899d938174
Update scenario.lua
2019-11-17 23:34:07 -05:00
Zahir Khan
7785099753
Update cutscene.lua
2019-11-17 23:32:20 -05:00
Zahir Khan
94159211ee
Create cutscene.lua
2019-11-17 23:13:36 -05:00
Zahir Khan
e768989bf3
crashsite cutscene strings
2019-11-17 23:03:52 -05:00
Zahir Khan
80ba14762b
Added cutscene outpost
2019-11-17 23:01:33 -05:00
theorangeangle
6347833eaf
removed unnecessary commenting
2019-11-16 12:37:50 -06:00
theorangeangle
4e7b3f8e21
reduced movement for players during combat
2019-11-16 12:27:19 -06:00
grilledham
da51264761
Merge pull request #1005 from Claude477/patch-2
...
Update creation_of_adam2.lua
2019-11-15 21:14:15 +00:00
Claude
aca98f7098
Update creation_of_adam2.lua
...
This fix "map_gen.ores" path to "map_gen.entities"
2019-11-15 23:06:46 +02:00
grilledham
0041dc9340
Merge pull request #1004 from Claude477/patch-1
...
Update vanilla.lua
2019-11-12 19:20:02 +00:00
Claude
8d0766cecc
Update vanilla.lua
...
This fix path for tiny_ores.lua start vanilla.lua
2019-11-12 18:48:37 +02:00
SimonFlapse
738e105766
v0.4.6 dark nights and market + coin fixes
2019-11-03 17:38:23 +01:00
SimonFlapse
69d3fd64d1
Minor changes to fix join team bug
2019-11-03 15:14:21 +01:00
grilledham
71356cc504
Merge pull request #1003 from grilledham/crashsite/biters_to_worms
...
Crashsite: Change biters to spawn worms on death
2019-11-01 20:35:02 +00:00
grilledham
e341c6230e
Merge pull request #997 from Soggs/snakey_swamp
...
Added Snakey Swamp map script.
2019-11-01 16:14:45 +00:00
grilledham
a7ec8e9856
Change biters to spawn worms on death
2019-11-01 16:04:43 +00:00
SimonFlapse
0d3c93bad0
Minor fixes involving the gui and market
2019-10-27 19:40:27 +01:00
SimonFlapse
337eabc08a
Bug fixes and team balancing changes
2019-10-27 14:46:57 +01:00
SimonFlapse
f4710e824a
Changing seed
2019-10-27 12:36:05 +01:00
SimonFlapse
63d2b85407
New ore shapes
2019-10-27 12:21:08 +01:00
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
Simon
0a8dc3012e
Update map_gen/shared/generate.lua
...
Co-Authored-By: grilledham <jrdgillham@gmail.com>
2019-10-20 14:40:22 +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
SimonFlapse
7ca4e61da9
New Description Generator GUI
...
Changes to the info gui to better communicate the max text width to support the server description in the server browser
2019-10-18 23:20:55 +02:00
SimonFlapse
268959331e
Updated rich text generation gui
2019-10-18 14:49:33 +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
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
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
23f1f976a4
Merge pull request #1000 from grilledham/crashsite_wall_bug
...
fix crashsite no wall bug
2019-10-14 19:11:48 +01:00
