Commit Graph

2327 Commits

Author SHA1 Message Date
Cooldude2606
5d42fffa64 Automatic Doc Update 2021-05-10 21:10:21 +01:00
Cooldude2606
12917fed08 Jail forces player into idle state 2021-05-10 21:08:12 +01:00
Cooldude2606
380b114b97 Added protection auto jail 2021-05-10 20:57:04 +01:00
Cooldude2606
83a2b1d631 Added playtime to some alerts 2021-05-10 20:22:45 +01:00
Cooldude2606
2a66e83d1e Added traceback to scenario loader 2021-05-07 16:59:00 +01:00
Cooldude2606
cb2522dcb4 Fixed edge case for bonus 2021-05-06 17:25:07 +01:00
Cooldude2606
9933857b4f Spelling correction 2021-05-06 17:21:54 +01:00
Cooldude2606
f074dc885a Removed outdated wiki link 2021-05-06 15:19:07 +01:00
Cooldude2606
e7c0ad29e6 Updated readme 2021-05-06 15:17:39 +01:00
Cooldude2606
ecf2c59bb1 Fixed other errors 2021-05-06 01:10:54 +01:00
Cooldude2606
6e00b2cd40 Fixed left flow guis 2021-05-06 00:56:50 +01:00
Cooldude2606
0c0dba384b Fixed issues in expcore 2021-05-06 00:28:52 +01:00
Cooldude2606
a6a417b37b Automatic Doc Update 2021-04-29 22:55:28 +00:00
Cooldude2606
2db8910b77 Merge pull request #215 from Cooldude2606/fix/6.1.1-bugs
fix/6.1.1-bugs
2021-04-29 23:54:57 +01:00
Cooldude2606
8f9f936385 Merge branch 'fix/6.1.1-bugs' of github.com:Cooldude2606/expgaming-scenario into fix/6.1.1-bugs 2021-04-29 23:54:05 +01:00
Cooldude2606
2bd5df7eb3 Changed top flow comment 2021-04-29 23:53:43 +01:00
Cooldude2606
b7d005fadc Update expcore/datastore.lua
Co-authored-by: mark9064 <30447455+mark9064@users.noreply.github.com>
2021-04-29 23:53:35 +01:00
Cooldude2606
a592439a25 Merge branch 'dev' into fix/6.1.1-bugs 2021-04-29 23:24:12 +01:00
Cooldude2606
55cccdd5be Fixed no error log from Datastore:update 2021-04-29 23:07:54 +01:00
Cooldude2606
7fd84bd977 Automatic Doc Update 2021-04-29 22:05:21 +00:00
Cooldude2606
1ccc7fbcc6 Merge pull request #195 from bbassie/feature/task-list-update
Tasklist redesign
2021-04-29 23:04:48 +01:00
Cooldude2606
27b4f8b853 Fixed linting errors 2021-04-29 23:03:14 +01:00
Cooldude2606
bb0bf13728 Fixed opening view and create at same time 2021-04-29 22:48:59 +01:00
Cooldude2606
531d5d807f Fixed task removal 2021-04-29 22:48:22 +01:00
Cooldude2606
e1e20162cf Fixed tasks not updating while offline 2021-04-29 22:47:28 +01:00
Cooldude2606
909f4ce426 Removed player editing during add_task 2021-04-29 22:46:17 +01:00
Cooldude2606
6653e5904a Corrected toggle element doc name 2021-04-29 21:07:23 +01:00
bbassie
dfcefb3a1b Merge branch 'feature/task-list-update' of https://github.com/bbassie/scenario into feature/task-list-update 2021-04-28 00:28:51 +02:00
bbassie
a3fe06b1f8 Fix documentation and some names of functions, variables and arguments 2021-04-28 00:25:19 +02:00
Bastiaan
ea8e093c31 Apply suggestions from code review
Co-authored-by: mark9064 <30447455+mark9064@users.noreply.github.com>
2021-04-27 23:33:05 +02:00
Bastiaan
254d69f646 Fix documentation modules/gui/task-list.lua
Co-authored-by: mark9064 <30447455+mark9064@users.noreply.github.com>
2021-04-27 23:29:28 +02:00
Bastiaan
0f5868378a Fix documentation modules/control/tasks.lua
Co-authored-by: mark9064 <30447455+mark9064@users.noreply.github.com>
2021-04-27 23:16:18 +02:00
bbassie
77e0aff451 Variable name fix 2021-04-26 10:57:19 +02:00
bbassie
9e6d4e7454 Move close button to the side of the header 2021-04-26 02:31:23 +02:00
Cooldude2606
22f973ad84 Fixed empty top bar flow 2021-04-26 00:33:09 +01:00
Cooldude2606
3229318deb Automatic Doc Update 2021-04-25 23:23:07 +00:00
Cooldude2606
dd313d8b46 Merge pull request #213 from Cooldude2606/feature/entity-alert
Entity protection
2021-04-26 00:22:36 +01:00
Cooldude2606
2e1e024ac7 Merge branch 'dev' into feature/entity-alert 2021-04-26 00:21:48 +01:00
Cooldude2606
2df7482a77 Implemented requested changes 2021-04-26 00:20:55 +01:00
Cooldude2606
1cce4284c6 Automatic Doc Update 2021-04-25 22:55:00 +00:00
Cooldude2606
dd601a5f2d Merge pull request #211 from Cooldude2606/feature/spectate
Spectate and Follow
2021-04-25 23:54:33 +01:00
Cooldude2606
7dbb22f575 Merge branch 'dev' into feature/spectate 2021-04-25 23:53:34 +01:00
Cooldude2606
ca25dc7cb7 Implemented requested changes 2021-04-25 23:52:19 +01:00
bbassie
ea24477175 Fixed some of the requested changes
* Made add_task and update_task have consistent arguments
* Removed default task title and body
* Task list resized to fit to 10 items
2021-04-25 22:26:22 +02:00
Cooldude2606
e5f3ce5966 Automatic Doc Update 2021-04-25 19:21:17 +00:00
Cooldude2606
40ce5889e4 Merge pull request #210 from Cooldude2606/feature/admin-markers
Admin map markers
2021-04-25 20:20:46 +01:00
Cooldude2606
1660cf8ed8 Automatic Doc Update 2021-04-25 19:19:56 +00:00
Cooldude2606
0b7d2c949f Merge pull request #208 from Cooldude2606/feature/refactor-spawn-area
Refactor of spawn area, now includes water.
2021-04-25 20:19:26 +01:00
Cooldude2606
62f3e75f28 Merge branch 'dev' into feature/admin-markers 2021-04-25 20:18:32 +01:00
Cooldude2606
c899674ef6 Implimented Changes 2021-04-25 20:17:46 +01:00