Commit Graph

12010 Commits

Author SHA1 Message Date
d5847f15eb Switch anim to civil for the rest of the tabs that need it 2017-10-25 22:05:09 +02:00
4334c5b6ac Fix item duplication when loadout loadouts 2017-10-25 21:57:34 +02:00
b2d26b60e9 Add item check for containers in fillLoadoutsList 2017-10-25 20:58:40 +02:00
90705476f6 Add mag in container check for fillLoadoutsList 2017-10-25 20:50:12 +02:00
47290cb32b Add weapon in container support for fillLoadoutsList 2017-10-25 20:42:00 +02:00
3502efddba Change the way weapons are checked in fillLoadoutsList 2017-10-25 19:43:01 +02:00
7e78628e9a Move buttonHide above panel fill in loadoutsClose 2017-10-25 19:07:19 +02:00
b842750b0f Remove useless lines in fillLoadouts 2017-10-25 18:32:55 +02:00
0cbe9aefe7 Start adding non available items and missing mods for loadouts 2017-10-25 18:23:17 +02:00
154d56a0e4 Ability for ace engineer to configure pylons (#5672)
* let ace engineer configure pylons

* fix double usage
2017-10-24 20:49:51 -05:00
cef4f9d923 make.py - Make no-bin work (#5670) 2017-10-24 15:52:04 -05:00
1cd86efc06 Zeus - Fix moduleLoadIntoCargo (#5669) 2017-10-24 14:11:16 -05:00
d82fceb511 Make the arsenal layout a bit prettier 2017-10-24 20:40:42 +02:00
f30727e566 fixes shemagh having overlay despite no goggles (#5665)
RHS Compatibility - fixes shemagh having overlay despite no goggles
2017-10-24 13:39:45 -05:00
2efe2642ab Remove duplicate weapon srifle_DMR_03_spotter_F (#5492) 2017-10-24 13:28:48 -05:00
e294e0b178 Fix weight not updating when using arrows to add / remove items 2017-10-24 18:44:30 +02:00
e769d092af Pylons: Evaluate String Values from config (#5667) v3.11.0 2017-10-24 18:22:02 +02:00
914ea66b2f Fix refuel framework page build failure (#5664)
Jekyll thinks {{}} is a variable in code blocks too
2017-10-24 11:14:25 -05:00
589574c433 Add close button for loadouts dialog 2017-10-24 17:48:21 +02:00
5160a4d767 Prepare release 3.11.0 (build 4) 2017-10-24 15:42:18 +02:00
c2c1ae538a Merge branch 'master' into release-3.11.0 2017-10-24 15:40:38 +02:00
1936343428 Fix refuel documentation (#5547)
* Update refuel.md

* Update refuel-framework.md

* Fix refuel-framework.md

* Fix refuel.md

* Add version note

* Fix version note

* Fix hooks
2017-10-24 15:39:32 +02:00
b45a7e2413 Add custom combo box control (#5661) 2017-10-24 15:39:15 +02:00
53b8649d85 Fix carrying on water (AGL->ASL) (#5659) 2017-10-24 15:38:47 +02:00
7096ab11da Fix loadout save not updating the pictures properly (again) 2017-10-24 13:39:02 +02:00
ce260421fa Reload pictures when saving over old loadout 2017-10-24 13:27:56 +02:00
c0b13bfd1d Keep cursor at same index when deleting loadouts
Woops
2017-10-24 13:21:41 +02:00
c89dba6b71 Fix loadout deleting not triggering curSel change 2017-10-24 13:20:55 +02:00
7717438d2e Add double click loading 2017-10-24 13:16:21 +02:00
c153a438ed Redo button layout, Add rename button, Add messages 2017-10-24 12:31:41 +02:00
ea7e321a2c Add select current after list is refreshed after saving 2017-10-24 10:48:12 +02:00
d6eb10ad18 Add loadouts loading 2017-10-24 10:33:38 +02:00
74f65bb299 Add loadout saving and deleting 2017-10-24 10:14:27 +02:00
793c1fbe4b Add editBox for loadout names 2017-10-24 02:39:15 +02:00
e0bcc7023b Finish button logic, start adding filling and button funcs 2017-10-24 02:11:56 +02:00
58d69a7978 Prepare release 3.11.0 (build 3) v3.11.0-rc3 2017-10-23 20:21:01 +02:00
84cd5d8749 Merge branch 'master' into release-3.11.0 2017-10-23 20:20:04 +02:00
e8feca9876 Implement button logic for loadouts display 2017-10-23 18:56:01 +02:00
e283fc89eb Add CBA settings for the loadouts display 2017-10-23 18:55:46 +02:00
dab034a833 Continue laying the base for the SQF of the loadouts display 2017-10-23 18:32:59 +02:00
a19774ce34 Prepare the SQF base for the loadouts display 2017-10-23 18:12:16 +02:00
489427f755 Add base layout for loadouts GUI 2017-10-23 16:33:30 +02:00
f54fce11e1 Merge pull request #5657 from acemod/fix-team-page
fix display error on team page
2017-10-23 16:03:02 +02:00
bux
f0d38cd907 fix display error on team page 2017-10-23 15:17:37 +02:00
a614744e31 AB compat rail/scope height update (#5650)
* Compat rail/scope height update

* fix
2017-10-23 15:02:48 +02:00
f6baa7e58e Merge pull request #20 from dedmen/arsenal_magazineGroups
magazineGroups
2017-10-22 19:04:44 +02:00
44084b63a9 magazineGroups 2017-10-22 18:16:22 +02:00
365a8c616a Merge pull request #19 from alganthe/arsenal_fontSettings
Add arsenal font setting
2017-10-22 16:58:03 +02:00
a95c203618 Add CBA setting for fontHeight for left and right panel 2017-10-22 16:48:38 +02:00
3484942680 Scopes - Fixed MRAD conversion (#5651)
* Same issue as https://github.com/acemod/ACE3/pull/5640
2017-10-22 10:44:00 +02:00