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,648 Commits 73 Branches 88 Tags 752 MiB
b8cd85135e
Commit Graph

12648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Klemm
7ba394c711
Enabled cancel button when exiting arsenal 2018-01-19 18:21:01 +01:00
classic
00af6844cd Update jpn translations (#6031) 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
 2018-01-18 20:16:24 -06:00
jonpas
88963cdae8 Prepare release 3.12.1 (build 2) 2018-01-15 21:35:34 +01:00
jonpas
7c97e5fab6 Merge branch 'master' into release-3.12.1 2018-01-15 21:34:21 +01:00
Dystopian
70ca4d01a7 Fix house-type object carrying in building (#6049) 2018-01-15 19:02:06 +01:00
Josuan Albin
b7606800a1 Match case for magazines in fillRightPanel (ACE Arsenal) (#6044) 
* Match case for magazines in fillRightPanel

Apparently you can have different case between the entry in the weapon magazines array and its actual configname...

* Add possible fix for the mission end bug

* Add ded's proposed fix, remove closeOnMissionEnd

CloseOnMissionEnd is bugged in 3DEN and force close the display after it's opened
 2018-01-15 18:21:38 +01:00
Thomas Müller
fc037d1bc3 Improve function header documentation guidelines (#6042) 2018-01-11 18:34:51 +00:00
ulteq
a5523bc0c7
ATagMX - Allow one decimal place for the bullet mass (in grams) (#6041) 
Closes: #6040
 2018-01-10 19:44:53 +01:00
jonpas
2303f345af Prepare release 3.12.1 2018-01-07 02:49:17 +01:00
PabstMirror
00ba133b21 Dev helper function to convert settings to code (#5752) 
* Dev helper function to convert settings to code

* fix double //

* Add movedToSQF config

* Fix paramArray settings

* Add movedToSQF to moveMarkers

* Add tabs
 2018-01-07 02:46:47 +01:00
Dystopian
e24ed0fa92 Fix back blast if damage not allowed (#6030) 2018-01-06 18:24:44 -06:00
commy2
3eddd5ef72 fix make error (#6028) 2018-01-06 16:57:44 +01:00
commy2
0eb809fb91
Merge pull request #6027 from acemod/cleanupMarkers 
Cleanup markers
 2018-01-06 15:00:18 +01:00
PabstMirror
2ced42ae3a Cleanup markers 2018-01-06 00:52:57 -06:00
Josuan Albin
3839f2f5fc Minor arsenal fixes (#6025) 
* Change "ok" to "apply" while in 3DEN

* Move execNextFrame from initBox's action to openBox

This was done in order to avoid crashes on custom actions
 2018-01-06 01:30:33 +01:00
SilentSpike
dbe6a04e8a Optimise spectator loops (#6021) 
* Optimise spectator loops

`count` is only quicker than `forEach` when the final command returns a
boolean or nil. `forEach` is quicker if the final command returns any
other data type.

* Use `forEach` instead of `count`
 2018-01-06 01:30:15 +01:00
PabstMirror
4eb7868f1a
NVG - Fix grain and color effects (#6018) 2018-01-05 18:23:56 -06:00
Cyruz143
a881e5e2d3 Removing unused classname from wiki (#6024) 2018-01-05 22:26:03 +01:00
SilentSpike
fd815c5ed8
Serialize spectator help control variable (#6023) 
Could result in an on-screen error if the spectator API was used in a scheduled environment.
 2018-01-05 20:41:43 +00:00
Josuan Albin
0acbde1489 Various ACE Arsenal fixes (see description) (#5996) 
* Copy the array properly when using preStart cache in openBox

* Fix add and removeVirtualItems erroring out when passing false as arg

* Disable face, voice, and insignia tabs in 3DEN

* Move grenadeList and putList outside of foreach in scanConfig

* Fix grenadeList and putList indentation

* Change the camera handling in onArsenalClose

Fixes the camera not being focused on the player after using ACE Arsenal on an other unit outside of zeus / 3DEN.
Remove the code that moved the curatorCam near the edited unit after ACE Arsenal is closed.

* Fix message control overflowing, move width defines to defines.hpp

* Add ability to exit arsenal and not apply a loadout in 3DEN

* Add ACE3 logo to common, fix config pathing to a non existing file
 2018-01-05 18:56:21 +01:00
PabstMirror
4379346b2f Medical - Increase revive max time to 60 min (#5992) 2018-01-05 18:55:27 +01:00
commy2
3c41d37417 overhaul movable markers (#5922) 
* overhaul movable markers

* moving markers setting

* disable debug

* fix conflict with map gestures
 2018-01-05 18:55:00 +01:00
SilentSpike
fb3fc09997
Center spectator map correctly in FPP (#6010) 
Instead of centering on the camera object use `positionCameraToWorld` to get the actual viewpoint
 2018-01-04 18:03:38 +00:00
Jo David
9e14a73b3c
Fix docker (#6013) 
* update docker stuff

* finalize docker fix
 2018-01-03 20:31:30 +01:00
Dystopian
71909a9be3 Add custom repair positions to all quadbikes (#6011) 2018-01-03 11:01:17 +00:00
commy2
b7dd5c5692 add sandbag preview image, proper editor category (#6008) 2018-01-02 11:01:25 -06:00
SilentSpike
33e25535c9
Deprecate common function numberToDigitsString (#6007) 
* Deprecate common function numberToDigitsString
 2018-01-02 17:00:01 +00:00
PabstMirror
966cf8d748
Cleanup maverick (#6000) 
* Cleanup maverick config

* x

* Cleanup ACE_Comanche_Test

* fix formatting (and poke Travis)
 2018-01-02 10:37:16 -06:00
SilentSpike
1f818981ed
Fix unconscious hidden status not being reset on respawn (#6006) 2018-01-02 16:18:44 +00:00
SilentSpike
4bb16c043c
Optimise cellphone IED function slightly (#6005) 
* Optimise cellphone IED function slightly
* Fix distribution and use CBA function
 2018-01-02 16:18:12 +00:00
commy2
183fc93c5a
Merge pull request #6001 from acemod/fishykins-master 
add allowFadeMusic setting
 2018-01-02 17:12:47 +01:00
commy2
306c449986 implement pr #5385 2018-01-02 16:36:17 +01:00
commy2
6520fdb624 implement pr #5385 2018-01-02 16:34:13 +01:00
commy2
ef77bb077e
Merge pull request #5987 from acemod/setHidden-forgetTarget 
make setHidden use forgetTarget
 2018-01-02 16:28:10 +01:00
commy2
32755e4e91
forget only different side 2018-01-02 16:26:13 +01:00
commy2
bcf834d2c7
Merge pull request #5894 from acemod/ownerEvent-instead-of-local-logic 
use ownerEvent instead of game logics
 2018-01-02 16:16:58 +01:00
commy2
787f047804
Merge pull request #6002 from acemod/tripd-updates2 
disable debug mode
 2018-01-02 16:16:42 +01:00
commy2
b0d0029c7a disable debug mode 2018-01-02 16:13:57 +01:00
commy2
fc0f6b47b1
Merge pull request #5886 from acemod/tripd-updates 
update tripod
 2018-01-02 16:09:48 +01:00
commy2
8ecd44b9f2 fix a bug in place after anim adjustment 2018-01-02 16:04:21 +01:00
commy2
be56c991ed
Update stringtable.xml 2018-01-02 16:00:35 +01:00
commy2
3e2ef7ba36 editor icon, editor category, delete on death 2018-01-02 15:56:15 +01:00
commy2
3b02e5e90e Merge branch 'master' of https://github.com/acemod/ACE3 into tripd-updates 2018-01-02 15:14:04 +01:00
commy2
1f2b187ee3 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2018-01-02 15:11:49 +01:00
commy2
f8ff279c6b Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2018-01-02 15:11:14 +01:00
commy2
5c9d1ada84
Merge pull request #5191 from Arcanum417/medical-rewrite-kill-ai 
[Medical Rewrite] Options to enable insta-death for AI
 2018-01-02 15:09:47 +01:00
commy2
b9d792ebcd merge 2018-01-02 15:08:10 +01:00
commy2
68228e9fef merge 2018-01-02 15:06:53 +01:00
commy2
6a70ab1ff4 allowFadeMusic setting 2018-01-02 14:57:19 +01:00
commy2
7e3f36e23d Merge branch 'master' of https://github.com/acemod/ACE3 into fishykins-master 2018-01-02 14:37:54 +01:00