1
0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

12554 Commits

Author SHA1 Message Date
Thomas Kooi
04a452bbc3
Add deploy step to same build step 2018-05-20 11:11:11 +02:00
Thomas Kooi
58f4ca4581
Merge branch 'master' into armake 2018-05-20 11:08:58 +02:00
Thomas Kooi
10f19997bd
Armake install ()
Add building ace3 on CircleCI using armake. It will build it on every commit / PR
2018-05-20 11:07:00 +02:00
commy2
104efe28bc
Merge pull request from jlillis/adv_fatigue_sway_factor
Add sway factor option to advanced fatigue
2018-05-19 02:43:53 +02:00
commy2
e289acbb4e
Merge branch 'master' into adv_fatigue_sway_factor 2018-05-19 02:43:11 +02:00
Dedmen Miller
4ede9858e5 Fix minor typo in fnc_cachedCall () 2018-05-16 20:00:51 -05:00
commy2
d6a88ac34a
Merge pull request from xrufix/AimCoef
Add ability to set aiming coefficient for mission scripting.
2018-05-16 07:53:09 +02:00
classic
2cd4615d5d Update Japanese translations ()
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-05-11 08:39:32 -05:00
PabstMirror
4df3cfe8a0
Clean up ace_main requiredAddons list ()
Close 
2018-05-09 10:32:44 -05:00
Dystopian
a4b803e2c1 Interaction - Allow RHIB push () 2018-05-09 10:09:34 -05:00
PabstMirror
b1526ccb86
Spall - Don't throw script errors in doSpall if input is bad ()
- Fix 
- Don't run tracking siumlation on small calibre ammo that won't ever spall
2018-05-09 10:08:26 -05:00
mharis001
fa98316424 Correct arsenal openBox center check () 2018-05-07 22:44:15 +01:00
commy2
2fae6754f5
Merge pull request from Dystopian/cleanup_deprecated_13
Clean up deprecated in 3.13
2018-05-06 10:48:36 +02:00
Dystopian
c35a53ba79 Clean up deprecated in 3.13 2018-05-05 21:54:13 +03:00
PabstMirror
d68f67a1ef
Arsenal - Fix weight stat for NVGs ()
Fix 
2018-05-04 16:13:42 -05:00
Vdauphin
2668bdc665 Check if suicide bomber isAwake ()
Zeus - Don't trigger suicide bomber if unconsicous
2018-05-04 11:57:38 -05:00
Vdauphin
5f67e81355 Fix suicide bomber explosion position () 2018-05-04 16:36:08 +01:00
commy2
898c01587a Optimize suicide bomber zeus module ()
- decrease check frequency from each frame to 1 per second
- simplify some math
- remove some very redundant parenthesis
- re-formated if control structure for readability
- use more appropriate skillFinal
- macro to change check delay, set to 0 in debug mode for debug line drawing
2018-05-04 16:35:28 +01:00
PabstMirror
ab23f4e4dc
Map - Fix ambient light effect flicking ()
* Map - Fix ambient light effect flicking

* Remove format

* formating
2018-04-28 17:23:59 -05:00
mharis001
e9af086454 Interaction Menu - Add ability to change selector color ()
* Add selector color changing

* Setup colors once at init
2018-04-28 17:23:44 -05:00
Dystopian
2454ade07b Quick Mount - Fix mount from water () 2018-04-28 14:34:52 -05:00
Cuel
265bc62259 (repair) - isRepairVehicle handling values according to wiki ()
* handle boolean and integer

* check if value is 1 or true
2018-04-27 10:30:03 -05:00
commy2
fbacf1a3e4
Merge pull request from DeliciousJaffa/patch-1
Allow goggle effects to be set locally per client
2018-04-27 01:14:51 +02:00
Thomas Kooi
6814de0f3c Upgrade grunt versions used for building docs static assets 2018-04-26 20:31:27 +02:00
PabstMirror
7b6b1eadcd
Update coding-guidelines.md ()
* Update coding-guidelines.md

* Update coding-guidelines.md
2018-04-26 10:04:00 -05:00
mharis001
87c3a7a334 Zeus - Improve Editable Objects module and Cleanup ()
* Improve Update Editable Objects ui and add icon

* Cleanup and remove broken attribute position

* Use QQGVAR
2018-04-24 18:46:59 +01:00
Josuan Albin
e7710d719b Add ace hearing support to the tank DLC helmet () 2018-04-23 17:47:41 +01:00
Josuan Albin
704dd66d38 Ace arsenal doc improvement ()
* Add a part of the stats documentation

* Finish documenting stats

It's barebone but it'll do.

* Add EH list to ace arsenal framework doc

* Remove I form in framework doc, capitalize default loadouts

* Add section about importing BI VA loadouts
2018-04-19 14:03:53 -05:00
mharis001
ec8115d2a4 Zeus - Toggle NVGs and Flashlights improvements ()
* New Toggle NVG ui and improve function

* Add Toggle Flashlights icon

* New Toggle Flashlights ui and improve function

* Stringtable changes and ace_ai postInit clean up

* TRACE fix and stringtable capitalization
2018-04-19 14:01:26 -05:00
PabstMirror
a828ebe591
Repair - Disable repair on ERA/Slat armor hitpoints ()
* Repair - Disable repair on ERA/Slat armor

Disable "miscRepair" action for all era and slat armor hitpoints.
Can still be repaired via "Full Repair"

* Minor perf improvment

* Add hitpoint names for 1.82 comTurret/gun

* Fix russian translations
2018-04-19 12:31:00 -05:00
PabstMirror
f4473ccfd3
Tactical Ladder - Fix args to cancleTLdeploy ()
Fix 

cancelTLdeploy expects `[unit, mouse button key]`
2018-04-19 12:20:18 -05:00
PabstMirror
853b4ffe0a Bump wiki version to 3.12.2 2018-04-19 12:07:14 -05:00
PabstMirror
3ca1bd77b8 Build Number for RC2 v3.12.2 2018-04-16 23:38:58 -05:00
PabstMirror
6dace8f380 Merge branch 'master' into release-3.12.2 2018-04-16 23:37:17 -05:00
PabstMirror
336b8973c4
Rearm - Increase rearm distance check ()
Fix 
2018-04-16 23:35:50 -05:00
mharis001
7239ad561f Change ACE Hint preview () 2018-04-15 13:14:31 -05:00
mharis001
bd754b6415 Rename ambiance sounds module () 2018-04-15 13:14:10 -05:00
PabstMirror
451d50f4a2 Fix titan on blufor LSV () 2018-04-15 16:58:00 +01:00
commy2
4aa2ebc991
Merge pull request from acemod/getMissionConfigValue
getMissionConfigValue instead of missionConfigFile
2018-04-15 14:49:13 +01:00
commy2
ede072cd5c
getMissionConfigValue instead of missionConfigFile 2018-04-15 12:59:14 +02:00
PabstMirror
99299f285e
NLAW - Fix "no shape for" rpt warning ()
```
No shape for ammo type ACE_NLAW_Explosion
No shape for ammo type ACE_NLAW_ShapedCharge
```
2018-04-14 16:05:30 -05:00
PabstMirror
f829180283 Fix realistic name for maverik pylon ()
Fix 
2018-04-14 09:24:41 +01:00
PabstMirror
5d039b72d6
Cookoff- Damage handling disabled by default () 2018-04-13 23:09:16 -05:00
PabstMirror
6a4f2b1fda
Hellfire - Fix hellfires not showing after 1.82 ()
Inherit from RocketPods instead of scalpel which has changed
2018-04-13 23:08:56 -05:00
PabstMirror
10a3a29ea0
Drop FCS from aircraft () 2018-04-13 23:08:39 -05:00
Dystopian
350711a86c Fix repair at dead vehicle () 2018-04-13 18:37:08 -05:00
PabstMirror
13d338a789
make.py - cleanup old optional pbos before rename () 2018-04-12 12:16:44 -05:00
PabstMirror
fa39e97203 Merge branch 'master' into release-3.12.2 2018-04-12 10:59:46 -05:00
Josuan Albin
1994e301fd More various ace arsenal fixes ()
* Compile stats on preInit

* Remove uneeded check in add/removeStat

* Remove perf profiler vars

They aren't required anymore

* Fix case issue in verifyLoadout, remove uneeded line

* Fix ace arsenal cam not working porperly underwater

By removing those checks the cam is allowed to clip through objects and work properly underwater, sounds like features to me :D

* Fix gunbag behavior in ace arsenal

Switching between gunbags will keep the weapon, switching to another backpack then back to a gunbag will also keep the weapon.

* Fix text scaling in the searchbars and loadout name edit boxes

Also made the text bigger by default
2018-04-12 10:44:23 -05:00
shukari
468da8b79b Fix fastropes being blocked after rope breaking ()
* add broken state

* add broke state

* add broken state

* add broken state

* add broken state
2018-04-12 10:23:18 -05:00