Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,202 Commits 73 Branches 88 Tags 752 MiB
3ebdb31a82
Commit Graph

12202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BaerMitUmlaut
3ebdb31a82 Replace make.bat with more advanced make.ps1 2018-05-27 20:28:38 +02:00
Thomas Kooi
e916f3eb5b
Increase build parallelism on circleci 2018-05-23 22:05:33 +02:00
jonpas
c9d774eeeb Merge branch 'master' into armake 2018-05-23 00:44:55 +02:00
jonpas
5e6ae3ca36 Revert documentation changes 2018-05-23 00:41:15 +02:00
Thomas Kooi
9d0e2014cf
Delete travis ci config file (#6361) 
Travis CI is no longer being used.
 2018-05-22 23:02:34 +02:00
jonpas
326604ae9f Fix particles preprocessing for both armake and pboProject 2018-05-22 20:09:30 +02:00
jonpas
9a37713710 Fix pboProject compatibility 2018-05-22 19:53:26 +02:00
jonpas
f613597636 Make setup.py compatible with new include CBA structure 2018-05-22 19:49:19 +02:00
jonpas
ef2c8c9502 Remove copying of inexisting userconfig, Bring version number up to date 2018-05-22 18:55:12 +02:00
jonpas
4054b0acba Update CBA include (from its armake setup) and enable excessive concatenation warnings 2018-05-22 18:45:27 +02:00
jonpas
90e51e501c Update A3 includes 2018-05-22 18:42:14 +02:00
jonpas
7dda6c62ef Update armake Windows binaries to 0.6.1, Use new signature name argument and header info for 'version' 2018-05-22 17:21:48 +02:00
jonpas
40de340d82 Revert changes that shouldn't be changed 2018-05-22 17:17:05 +02:00
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 (#6356) 
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 #5773 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 (#6346) 2018-05-16 20:00:51 -05:00
commy2
d6a88ac34a
Merge pull request #5828 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 (#6340) 
* 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 (#6332) 
Close #6331
 2018-05-09 10:32:44 -05:00
Dystopian
a4b803e2c1 Interaction - Allow RHIB push (#6302) 2018-05-09 10:09:34 -05:00
PabstMirror
b1526ccb86
Spall - Don't throw script errors in doSpall if input is bad (#6322) 
- Fix #5614
- 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 (#6329) 2018-05-07 22:44:15 +01:00
commy2
2fae6754f5
Merge pull request #6327 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 (#6325) 
Fix #6320
 2018-05-04 16:13:42 -05:00
Vdauphin
2668bdc665 Check if suicide bomber isAwake (#6324) 
Zeus - Don't trigger suicide bomber if unconsicous
 2018-05-04 11:57:38 -05:00
Vdauphin
5f67e81355 Fix suicide bomber explosion position (#6323) 2018-05-04 16:36:08 +01:00
commy2
898c01587a Optimize suicide bomber zeus module (#6314) 
- 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 (#6313) 
* 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 (#6292) 
* 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 (#6310) 2018-04-28 14:34:52 -05:00
Cuel
265bc62259 (repair) - isRepairVehicle handling values according to wiki (#6278) 
* handle boolean and integer

* check if value is 1 or true
 2018-04-27 10:30:03 -05:00
commy2
fbacf1a3e4
Merge pull request #6183 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 (#6303) 
* 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 (#6294) 
* 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 (#6296) 2018-04-23 17:47:41 +01:00
Josuan Albin
704dd66d38 Ace arsenal doc improvement (#6251) 
* 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 (#6219) 
* 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 (#6283) 
* 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 (#6280) 
Fix #6232

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 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 (#6276) 
Fix #6177
 2018-04-16 23:35:50 -05:00
mharis001
7239ad561f Change ACE Hint preview (#6271) 2018-04-15 13:14:31 -05:00
mharis001
bd754b6415 Rename ambiance sounds module (#6272) 2018-04-15 13:14:10 -05:00