Commit Graph
52 Commits
Author SHA1 Message Date
Cooldude2606andGitHub be5a893994 Merge pull request #262 from PHIDIAS0303/patch-3
prompt for steel chest placement in waterfill
2023-12-21 21:45:35 +00:00
Cooldude2606andGitHub 53b5549c97 Merge pull request #261 from PHIDIAS0303/dev8
artillery target remote
2023-12-21 21:44:42 +00:00
Cooldude2606andGitHub 81abb265a5 Merge branch 'dev' into dev8 2023-12-21 21:44:07 +00:00
Cooldude2606andGitHub 43155e0d4c Merge pull request #260 from PHIDIAS0303/dev7
clear blueprint and clear item on ground
2023-12-21 21:35:53 +00:00
Cooldude2606andGitHub ab53c0d8ee Fix missing comma from merge conflict 2023-12-21 21:35:12 +00:00
Cooldude2606andGitHub 8b9804543b Merge branch 'dev' into dev7 2023-12-21 21:32:01 +00:00
Cooldude2606 73fc647823 Items are moved to spawn chests on clear 2023-12-21 21:29:58 +00:00
Cooldude2606andGitHub 47344d4540 Merge pull request #259 from PHIDIAS0303/patch-2
deconstruction of tree and rocks when drive over them
2023-12-21 20:38:02 +00:00
Cooldude2606 c6d7a24ff5 Allowed for fast decon toggle 2023-12-21 20:36:52 +00:00
Cooldude2606andGitHub 43b6f974ee Merge pull request #258 from PHIDIAS0303/patch-1
1 decimal place on last location gps
2023-12-21 20:19:55 +00:00
Cooldude2606andGitHub e43cb3d6a4 Merge pull request #257 from PHIDIAS0303/dev5
fixed non prod module insertion with recipe
2023-12-21 20:16:24 +00:00
Cooldude2606andGitHub d0dec6bae3 Merge branch 'dev' into dev5 2023-12-21 20:15:13 +00:00
Cooldude2606 0b9cbfb64c Fix broken module substitution 2023-12-21 20:14:04 +00:00
Cooldude2606andGitHub ca25401653 Merge pull request #251 from PHIDIAS0303/dev4
CCTV module
2023-12-21 19:57:07 +00:00
Cooldude2606andGitHub 3b66ab1123 Merge pull request #252 from PHIDIAS0303/dev2
fix no recipe module insertion
2023-10-04 23:16:58 +01:00
Cooldude2606andGitHub 9dca383160 Merge pull request #255 from PHIDIAS0303/patch-1
waterfill role
2023-10-04 00:01:10 +01:00
Cooldude2606 f08cc91bdd Changed enough to prevent join errors 2023-10-02 18:58:26 +01:00
Cooldude2606andGitHub 832ff0acef Merge pull request #250 from PHIDIAS0303/patch-1
ignore alt mode of decon event and 1dp in gps display of message in decon log
2023-09-25 21:44:52 +01:00
Cooldude2606andGitHub 2eb8dc41fc Merge pull request #248 from PHIDIAS0303/dev3
addon module inserter gui
2023-09-25 21:42:31 +01:00
Cooldude2606andGitHub 142244e0b8 Merge branch 'dev' into dev3 2023-09-25 21:41:37 +01:00
Cooldude2606andGitHub bfb2167244 Merge pull request #249 from PHIDIAS0303/dev2
cmd personal logistics for spidertron
2023-09-25 21:20:13 +01:00
Cooldude2606andGitHub de6f3793b6 Merge pull request #247 from PHIDIAS0303/dev2
some fix
2023-09-22 22:29:39 +01:00
Cooldude2606andGitHub 72153df210 Merge pull request #245 from oof2win2/feat/disable-nukes
Disable nukes completely
2023-09-08 00:27:41 +02:00
Cooldude2606andGitHub 3f4e5f35ad Merge pull request #246 from oof2win2/feat/add-control-functions
Add some functions to control.lua
2023-09-08 00:22:17 +02:00
Cooldude2606andGitHub 7d5254f44e Merge pull request #244 from DrahcPro/dev
Language detection module
2023-08-15 19:30:19 +01:00
Cooldude2606andGitHub f66ccdfb0b Update contributing guidelines
Following a PR with over 10 features being added at once, the contributing guidelines have been updated to limit a PR to a single feature or multiple bug fixes.
2023-08-15 18:59:58 +01:00
Cooldude2606andGitHub cdd34ebaea Merge pull request #240 from bbassie/fix/autofill
Fix button
2023-03-07 21:12:26 +00:00
Cooldude2606andGitHub fe9758b9c2 Merge branch 'dev' into fix/autofill 2023-03-07 21:11:26 +00:00
Cooldude2606andGitHub 8fc19e918b Merge pull request #238 from Cooldude2606/fix/autofill-amounts
Fixed auto fill amounts not working
2023-03-07 00:08:52 +00:00
Cooldude2606 4b4202b4b7 Fixed auto fill amounts not working 2023-03-05 23:27:20 +00:00
Cooldude2606andGitHub 277dfa53e4 Merge pull request #235 from oof2win2/bugfix/jail
fix: set roles after jailing
2023-02-25 15:41:04 +00:00
Cooldude2606 19ad8838a6 Fixed Indentation 2023-02-25 15:36:33 +00:00
Cooldude2606 fce01baf1c Fixed assignment logic edge cases 2023-02-25 15:36:33 +00:00
Cooldude2606 7568da8e8d Automatic Doc Update 2022-12-09 21:10:01 +00:00
Cooldude2606andGitHub 1b833edc4c Merge pull request #229 from oof2win2/feature/nukeprotect
Implement nuke protect, fix move_items
2022-12-09 21:09:26 +00:00
Cooldude2606 9750ff7d6a Automatic Doc Update 2022-10-31 15:14:46 +00:00
Cooldude2606andGitHub 89eaea8612 Merge pull request #230 from PHIDIAS0303/dev
Locale
2022-10-31 15:14:17 +00:00
Cooldude2606 6f8a9381b1 Automatic Doc Update 2022-10-23 19:01:37 +00:00
Cooldude2606 6e31c6cf0e Merge branch 'patch/6.2.1' into dev 2022-10-23 20:00:47 +01:00
Cooldude2606andGitHub 64bd0991a7 Merge pull request #234 from explosivegaming/patch/6.2.1
Patch/6.2.1
2022-10-23 19:58:20 +01:00
Cooldude2606 c441a01828 Merge branch 'patch/6.2.1' of github.com:explosivegaming/scenario into patch/6.2.1 2022-10-23 18:33:28 +01:00
Cooldude2606 22cc0905df Automatic Doc Update 2022-10-23 17:22:37 +00:00
Cooldude2606andGitHub 5c2c8aa793 Merge pull request #233 from Windsinger1985/patch-2
Update reports.lua
2022-10-23 18:22:11 +01:00
Cooldude2606 86c51157f4 Automatic Doc Update 2022-10-23 17:06:24 +00:00
Cooldude2606andGitHub 8de39094bb Merge pull request #232 from Windsinger1985/patch-1
Update deconlog.lua
2022-10-23 18:05:57 +01:00
Cooldude2606 c36f42d7e8 Automatic Doc Update 2022-09-25 00:10:59 +00:00
Cooldude2606andGitHub ab806ad8fc Merge pull request #231 from oof2win2/feature/fagc
Add ban and unban logging for FAGC clientside bot support
2022-09-25 01:10:31 +01:00
Cooldude2606 9955905079 Automatic Doc Update 2022-05-14 20:36:59 +00:00
Cooldude2606andGitHub 7958f045d1 Merge pull request #228 from oof2win2/feature/graftorio
Add graftorio
2022-05-14 21:36:29 +01:00
Cooldude2606 49ccd5040a Automatic Doc Update 2022-05-14 14:33:24 +00:00
Cooldude2606andGitHub ffb63b46ee Merge pull request #227 from oof2win2/bugfix/move-items
Fix transfer of items after death and ban
2022-05-14 15:32:52 +01:00
Cooldude2606 245d15431e Merge branch 'bugfix/move-items' of github.com:oof2win2/AwF-Scenario into bugfix/move-items 2022-05-14 15:28:56 +01:00