Zahir
7a641312ef
Merge and Update
2019-12-03 20:50:13 -05:00
Zahir Khan
e17c3d28f7
Prevent character collision
2019-12-03 20:47:30 -05:00
Zahir Khan
9ea33b6303
one skip btn press needed
...
Added supporting changes to cutscene_controller.lua
2019-12-03 20:47:30 -05:00
grilledham
a98aea7b49
missing entity + desync fixes
2019-12-03 20:47:30 -05:00
Zahir Khan
4244afd8c5
Condensed code
2019-12-03 20:47:30 -05:00
Zahir Khan
3afde6617b
Added player valid check
2019-12-03 20:47:29 -05:00
Zahir Khan
99a7657681
Timing tweaks for the new strings.
2019-12-03 20:47:29 -05:00
Zahir Khan
46ccb4c277
Added cutscene init
2019-12-03 20:47:29 -05:00
theorangeangle
903947cd6d
small changes to improve grammar and flow
2019-12-03 20:47:29 -05:00
Zahir Khan
5f456347b2
Update cutscene.lua
...
minor addition
2019-12-03 20:47:29 -05:00
Zahir Khan
8a0873f68f
Update scenario.lua
2019-12-03 20:47:29 -05:00
Zahir Khan
20bc8cb5cb
Update cutscene.lua
2019-12-03 20:47:29 -05:00
Zahir Khan
f1e8911968
Create cutscene.lua
2019-12-03 20:47:29 -05:00
Zahir Khan
0d455ac94e
crashsite cutscene strings
2019-12-03 20:47:29 -05:00
Zahir Khan
d66b62c19a
Added cutscene outpost
2019-12-03 20:47:29 -05:00
theorangeangle
c1359be75c
Merge pull request #988 from SimonFlapse/diggy_cutscene
...
[Diggy] Cutscene Fixes
2019-12-03 13:20:30 -06:00
theorangeangle
0e52cb3519
Merge pull request #1012 from Zahir-Khan/turkey
...
Added random messages to print every 10 minutes to the turkey map
just in time!
2019-11-27 23:59:07 -06:00
theorangeangle
2225f5363f
added vauge documentation that will come back to haunt me later
...
local time 11:49 pm and travis better approve this by midnight!
2019-11-27 23:49:24 -06:00
theorangeangle
9e72495790
after playing whack a mole for 20 mins i think it's working now. local time 11:43pm
2019-11-27 23:43:45 -06:00
theorangeangle
bd8e289e58
i wanted to add the turkey ores from the 2018 map onto the 2019 terrain but can't clear out all the errors. going to have inebriate myself and see if that makes things better or worse. -11:10pm local
2019-11-27 23:10:50 -06:00
Zahir Khan
9a6e978a27
Update turkey.lua
2019-11-27 21:01:49 -05:00
Zahir Khan
837eedcc2c
Update turkey.lua
2019-11-27 20:39:26 -05:00
Zahir Khan
97be613e3d
Added random turkey message every 10min
2019-11-27 20:26:37 -05:00
theorangeangle
b0dd0b072c
Merge pull request #981 from Jayefuu/map_description_fixes
...
Updated map descriptions and landfill tech from maps named in issue #906
2019-11-27 11:29:04 -06:00
Zahir Khan
43c2617171
Prevent character collision
2019-11-26 17:18:00 -05:00
Zahir Khan
cad7d9b784
one skip btn press needed
...
Added supporting changes to cutscene_controller.lua
2019-11-26 14:25:43 -05:00
grilledham
a7eede9326
missing entity + desync fixes
2019-11-24 11:37:52 +00:00
Zahir Khan
0659a9a3fc
Condensed code
2019-11-20 22:43:03 -05:00
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
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
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
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
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
