Commit Graph

1621 Commits

Author SHA1 Message Date
Wyqer 15c8ec22fd
Update Changelog 2019-05-05 18:34:55 +02:00
Filip Maciejewski ce03699d24
Merge pull request #602 from KillahPotatoes/v0.97S12-585-veteran29
S11 Review - Calculate limited curator camera max height from terrain height
2019-05-05 11:26:35 +02:00
Filip Maciejewski 66f5d1f9a5 Calculate limited curator camera max height from terrain height 2019-05-05 10:11:24 +02:00
Filip Maciejewski 363876a7e5
Merge pull request #600 from KillahPotatoes/v0.97S12-575
Build module - basic resource payment
2019-05-05 10:09:29 +02:00
Filip Maciejewski 924ed1b796 Cleanup dead code 2019-05-05 10:08:17 +02:00
Filip Maciejewski d993db7051 Update Left and Right panel defines/comments 2019-05-05 10:08:17 +02:00
Christian 14c931f86e
Merge branch 'v0.97S12' into v0.97S12-575 2019-05-05 07:38:12 +02:00
Dubjunk a7408ad057
Merge pull request #595 from KillahPotatoes/v0.97S12-588
Arsenal, Logistic, Permission codework finishing
2019-05-04 23:44:06 +02:00
Dubjunk ea49f808c1 readded multiple code ability for perms 2019-05-04 23:40:49 +02:00
Wyqer 9778f1990b
`checkPermission` instead of `getPermission` 2019-05-04 22:41:57 +02:00
Wyqer 97412b3c5a
Adjust garrison permission to new parameters 2019-05-04 22:34:55 +02:00
Dubjunk 51a8fa062b Merge branch 'v0.97S12' into v0.97S12-588 2019-05-04 22:27:20 +02:00
Dubjunk b97f78d980 Merge branch 'v0.97S12-588' of https://github.com/KillahPotatoes/KP-Liberation into v0.97S12-588 2019-05-04 21:59:54 +02:00
Dubjunk b7503addc8 fixed some smaller bugs 2019-05-04 21:59:48 +02:00
Christian 510677865d
Merge pull request #599 from KillahPotatoes/v0.97S12-587
Garrison module pt4 (Garrison dialog)
2019-05-04 19:15:54 +02:00
Christian 5dc86f6f48
Update Missionframework/stringtable.xml
Co-Authored-By: Dubjunk <31448659+Dubjunk@users.noreply.github.com>
2019-05-04 19:14:45 +02:00
Wyqer 1777a0fb38
publicVariable after garrison despawn 2019-05-04 19:10:30 +02:00
Wyqer 1bd30838c5
Fixed garrison reinitialization eventhandler 2019-05-04 18:56:16 +02:00
Wyqer 45b8a8aa52
Fixed vehicle not deleted when adding group 2019-05-04 18:21:53 +02:00
Wyqer f36b4dd35e
Tweaked Missionstart information logging 2019-05-04 18:21:18 +02:00
Wyqer 754e6f837b
Update Changelog 2019-05-04 18:20:57 +02:00
Wyqer 8834dd0ff2
publicVariable after data load or reinitialize 2019-05-04 14:13:17 +02:00
Wyqer e285251cd9
Wrong string key for setting category 2019-05-04 14:12:56 +02:00
Wyqer 7042d005d7
Sorting and conventions 2019-05-04 13:34:50 +02:00
Wyqer 260e044605
German strings for build module 2019-05-04 13:32:34 +02:00
Filip Maciejewski f06d584a20 Fixes according to review 2019-05-04 11:52:42 +02:00
Christian 261fc38470
Update Missionframework/modules/15_build/ui/buildDisplay_left.hpp
Co-Authored-By: veteran29 <veteran29@users.noreply.github.com>
2019-05-04 11:45:08 +02:00
Christian 79b476f5f5
Update Missionframework/stringtable.xml
Co-Authored-By: veteran29 <veteran29@users.noreply.github.com>
2019-05-04 11:44:46 +02:00
Christian 7ff0206c6c
Update Missionframework/stringtable.xml
Co-Authored-By: veteran29 <veteran29@users.noreply.github.com>
2019-05-04 11:44:22 +02:00
Wyqer dd675c2e7c
Removed diag_log command in build module 2019-05-04 10:01:01 +02:00
Wyqer c602c8dd4a
`res` to `resources` in build module function call 2019-05-04 09:55:49 +02:00
Wyqer 135c24988b
Removed unused functions 2019-05-04 09:09:20 +02:00
Christian d6422ac61f
Merge branch 'v0.97S12' into v0.97S12-575 2019-05-04 08:51:56 +02:00
Christian 4bc8eea224
Merge branch 'v0.97S12' into v0.97S12-587 2019-05-04 08:49:51 +02:00
Christian b7ce1dfaf0
Merge pull request #593 from KillahPotatoes/v0.97S12-508
Documentation pt1
2019-05-04 08:47:29 +02:00
Christian b6250ce5fe
Update Missionframework/stringtable.xml
Co-Authored-By: Dubjunk <31448659+Dubjunk@users.noreply.github.com>
2019-05-04 08:39:26 +02:00
Dubjunk 232f3fa94a Suggestions by @Wyqer 2019-05-03 23:18:53 +02:00
Dubjunk a30f583c01 Suggestions by @veteran29 2019-05-03 21:54:58 +02:00
Wyqer 6f97a84ec2
Comments like requested in review 2019-05-03 18:25:52 +02:00
Dubjunk 4feb31af0d
Merge branch 'v0.97S12' into v0.97S12-588 2019-05-03 01:05:07 +02:00
Dubjunk bf46c1dfeb removed notify queueing 2019-05-03 01:01:31 +02:00
Dubjunk dcd4b7a22b fixed some bugs from define implementation 2019-05-03 00:48:16 +02:00
Dubjunk ea2adf3581 Added UI defines to cratefiller module 2019-05-02 23:56:34 +02:00
Dubjunk b2ef3903e9 Added UI defines to logistic module 2019-05-02 23:35:25 +02:00
Dubjunk 4cfff122ef Added UI defines to permission module 2019-05-02 23:07:03 +02:00
Dubjunk 02c9b471b6 Added arsenal UI defines 2019-05-02 23:03:30 +02:00
Dubjunk 8dcde99d22 replaced all cf buttons with a new ListNBox 2019-05-02 00:19:42 +02:00
Wyqer f36c2199a3
Ungarrison vehicles from sector garrison 2019-05-01 22:32:43 +02:00
Filip Maciejewski b11873ebb7
Basic (and crude) build module resource paying mechanics 2019-05-01 02:29:59 +02:00
Filip Maciejewski c9044a1070
Fix bug with local items when changing between build and move modes 2019-05-01 01:46:09 +02:00