Gerkiz
67d53c5b40
Merge branch 'develop' into changes_to_mtn
2021-05-16 14:43:41 +02:00
Gerkiz
de4ff3b2e1
more changes to mtn fortress
2021-05-16 14:42:15 +02:00
Gerkiz
feb402ea02
Merge pull request #56 from ComfyFactory/changes_to_mtn
...
minor changes to mtn fortress
2021-05-16 13:54:19 +02:00
Gerkiz
049f1162af
minor changes to mtn fortress
2021-05-16 13:48:50 +02:00
Gerkiz
c9bff24fad
Merge pull request #55 from ComfyFactory/conditionals_removals
...
removal of conditionals and fixes
2021-05-15 16:03:21 +02:00
Gerkiz
01762f6f81
removal of conditionals and fixes
2021-05-15 16:01:07 +02:00
MewMew
ba9124291c
Merge pull request #54 from ComfyFactory/journey
...
Remove offline players to shrink save file.
Delete chunks slowly during the world selection phase.
Randomize daytime of created worlds.
Artillery that sometimes shoots.
2021-05-13 11:28:41 +02:00
MewMew
1b36ee8388
Merge branch 'develop' into journey
2021-05-13 11:27:26 +02:00
MewMew
6dd88c505d
Update
...
Remove offline players to shrink save file.
Delete chunks slowly during the world selection phase.
Randomize daytime of created worlds.
Artillery that sometimes shoots.
2021-05-13 11:25:27 +02:00
Gerkiz
37ebfb1e64
Merge pull request #53 from ComfyFactory/mtn_v3_and_inventory_fixes
...
various tweaks
2021-05-12 20:53:52 +02:00
Gerkiz
5b8c1a2fee
various tweaks
2021-05-12 20:52:29 +02:00
MewMew
e0e7d039fc
Merge pull request #52 from ComfyFactory/journey
...
Journey
2021-05-11 19:41:45 +02:00
MewMew
463cea090d
Update
...
Make entities in the ship indestructible.
Add msg after capsule drops completed.
Restrict capsule drop radius.
2021-05-11 19:30:07 +02:00
MewMew
8f6319b88e
Merge branch 'develop' into journey
2021-05-09 19:46:13 +02:00
MewMew
700581325c
Merge pull request #51 from ComfyFactory/journey
...
small fix
2021-05-09 19:45:23 +02:00
MewMew
dcc85230df
Merge branch 'develop' into journey
2021-05-09 19:44:08 +02:00
MewMew
65bdc58d07
small fix
2021-05-09 19:26:14 +02:00
MewMew
87783eeed1
Merge pull request #50 from ComfyFactory/journey
...
Journey
2021-05-09 19:25:31 +02:00
MewMew
ae256c42c9
custom teleporter
2021-05-09 19:09:48 +02:00
MewMew
ad8a76047b
Merge branch 'develop' into journey
2021-05-09 19:05:03 +02:00
Gerkiz
dc9899298d
Merge pull request #49 from ComfyFactory/various_fixes
...
mountain fortress and admin panel fixes
2021-05-09 17:12:29 +02:00
Gerkiz
45638522a7
mountain fortress and admin panel fixes
2021-05-09 17:11:18 +02:00
MewMew
0ccbe23c71
Merge pull request #47 from ComfyFactory/journey
...
New Map
2021-05-09 15:49:32 +02:00
MewMew
33935dd3dd
New Map
2021-05-09 15:47:39 +02:00
Gerkiz
b59ac64d97
Merge pull request #46 from ComfyFactory/new_map
...
new map - pigeotto
2021-05-08 16:16:03 +02:00
Gerkiz
6621d854e2
new map - pigeotto
2021-05-08 15:12:33 +02:00
Gerkiz
a0cb458f3d
Merge pull request #45 from ComfyFactory/mtn_v3
...
Mtn - remove lights inside icw
2021-05-08 11:35:17 +02:00
Gerkiz
617d99eac1
Mtn - remove lights inside icw
2021-05-08 11:34:13 +02:00
Gerkiz
504d5ded97
Merge pull request #44 from ComfyFactory/poll_fix_and_removal_of_task_functions
...
Fix gui config when clicking poll and remove unused functions
2021-05-08 02:04:56 +02:00
Gerkiz
1644b024cf
Fix gui config when clicking poll and remove unused functions
2021-05-08 02:03:38 +02:00
Gerkiz
a2463bbbfd
Merge pull request #43 from ComfyFactory/territorial_control
...
Fix Territorial Control
2021-05-07 01:47:30 +02:00
Gerkiz
6d9aa6645a
Fix Territorial Control
2021-05-07 01:46:27 +02:00
Gerkiz
249246ddba
Merge pull request #42 from ComfyFactory/remove_ups_heavy_functions
...
Removal of global variables and removed laggy functions
2021-05-07 01:39:41 +02:00
Gerkiz
6add8a3db5
make luacheck happy
2021-05-07 01:38:45 +02:00
Gerkiz
a94fcc98af
Removal of global variables and removed laggy functions
2021-05-07 01:36:10 +02:00
Gerkiz
a5c5f5d183
Merge pull request #41 from ComfyFactory/function_validation
...
Validate functions and log player messages.
2021-05-07 01:20:50 +02:00
Gerkiz
64e588128e
Validate functions and log player messages.
2021-05-07 01:19:38 +02:00
Gerkiz
cf0b254bf7
Merge pull request #40 from ComfyFactory/poll_fix
...
Remove voters name and fix that we were storing desync values
2021-05-07 00:22:13 +02:00
Gerkiz
acb562fc3b
Remove voters name and fix that we were storing desync values
2021-05-07 00:20:10 +02:00
Gerkiz
24636b0629
Merge pull request #37 from ComfyFactory/cave_choppy_and_mtn_updates
...
Cave Choppy and Mtn Updates
2021-05-04 19:54:40 +02:00
Gerkiz
212ea49997
make luacheck happy
2021-05-04 19:53:40 +02:00
Gerkiz
6c4f9e5af7
rename cave choppy
2021-05-04 19:52:58 +02:00
Gerkiz
beaca0fc82
minor changes to cave choppy
2021-05-04 19:51:11 +02:00
Gerkiz
2065118aca
mountain fortress and rpg updates
2021-05-04 19:51:02 +02:00
Gerkiz
6a95cb2108
Merge pull request #36 from ComfyFactory/mtn_fortress
...
Mtn Fortress - Make ICW interior more pretty
2021-05-04 18:57:17 +02:00
Gerkiz
71ca0574dd
Merge branch 'develop' into mtn_fortress
2021-05-04 18:56:32 +02:00
Gerkiz
734d5f7d6b
Merge pull request #35 from Quadrum1/patch-4
...
Fix nil bug - Fancy Time
2021-05-04 18:56:23 +02:00
Gerkiz
eea184ba1e
Mtn Fortress - Make ICW interior more pretty
2021-05-04 18:55:32 +02:00
Quadrum
21d33afaaf
More elegant solution for more use-cases
...
Filter_time will return input table if filtered table would have been empty, should fix bugs
2021-05-04 18:38:33 +02:00
Quadrum
ba75b9741e
Fix nil bug - Fancy Time
...
Values below 60 seconds were returning nil in short_fancy_time()
Filter removed seconds, resulting values was empty (nil)
2021-05-04 18:34:44 +02:00
