esteldunedain
3d4a94a264
Make the fcs extension compile without C++11
2015-04-12 00:42:58 -03:00
esteldunedain
01bc6b233a
Merge branch 'breakLineExtension' into linearMenuExperiment
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
2015-04-12 00:21:05 -03:00
esteldunedain
7b797d906f
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/overheating/stringtable.xml
2015-04-12 00:19:33 -03:00
esteldunedain
df17df61f9
Improve the way lines are split
2015-04-11 23:39:06 -03:00
esteldunedain
d06e1b4a2a
Break line extension
2015-04-11 22:22:19 -03:00
esteldunedain
a01864319a
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-11 19:34:53 -03:00
esteldunedain
488000bdf3
Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494
2015-04-11 19:34:29 -03:00
PabstMirror
baf4b0146e
Missing semmicolon
2015-04-11 16:50:35 -05:00
PabstMirror
0805d5b640
Update UAV battery icon from AGM
2015-04-11 16:48:49 -05:00
jaynus
1a9b25c70e
Merge pull request #492 from acemod/acreCompat
...
ACRE API functions and core functions were incorrect.
2015-04-11 14:14:04 -07:00
jaynus
2a2f96a034
ACRE API functions and core functions were incorrect.
2015-04-11 14:10:30 -07:00
jaynus
ffb7c0fbaa
Merge pull request #488 from acemod/javelinLocking
...
Javelin locking and CLU interface
2015-04-11 14:02:41 -07:00
jaynus
458c49b0a7
Merge remote-tracking branch 'origin/master' into javelinLocking
...
Conflicts:
addons/common/XEH_preInit.sqf
2015-04-11 14:01:47 -07:00
jaynus
6e28b3b9b7
Disable gates (reload)
2015-04-11 13:59:17 -07:00
jaynus
d744074b2f
localization.
2015-04-11 13:48:46 -07:00
jaynus
2418d99f97
Finalizes port. Closes #75
2015-04-11 13:41:00 -07:00
jaynus
75216c2f8b
readme, authors.
2015-04-11 13:39:16 -07:00
jaynus
2999ff55e1
Working javelin targeting and gating. Still has red center target optic because I cant do optic p3d's. TODO: We need an optic p3d.
2015-04-11 13:37:55 -07:00
jaynus
505005891d
Remove debug, targeting constraints working.
2015-04-11 12:42:30 -07:00
PabstMirror
f5cce94b91
Merge pull request #136 from acemod/disarmingTest
...
Unit Disarming/DropGear Merge
2015-04-11 14:14:22 -05:00
jaynus
458958ef09
Target gating implemented.
2015-04-11 11:17:34 -07:00
jaynus
aa53a1815c
scaling.
2015-04-11 10:58:27 -07:00
jaynus
fb6c99d69b
re-path. Wtf safezones.
2015-04-11 10:56:58 -07:00
jaynus
efaee770bb
rename wep_javelin to javelin
2015-04-11 10:44:13 -07:00
Felix Wiegand
0bf32bfb3a
Merge pull request #476 from acemod/dropbackpack
...
function to drop backpack
2015-04-11 18:23:27 +02:00
commy2
e1bf475355
Merge pull request #419 from acemod/cfgtriggers
...
rename cfgAce_Triggers to ACE_Triggers
2015-04-11 18:19:36 +02:00
commy2
4dc38ca7ee
Merge pull request #395 from acemod/flashsup
...
flashsupressors for new weapons, #264
2015-04-11 18:18:05 +02:00
commy2
761e4aec64
edit description
2015-04-11 16:27:04 +02:00
esteldunedain
dec5aa3ec5
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-11 11:12:56 -03:00
esteldunedain
b8e0388581
Fix nearestObjects with getPos choking over seawater. Fix #465
2015-04-11 11:12:40 -03:00
commy2
62b45a8a07
initial commit
2015-04-11 15:59:21 +02:00
commy2
5a5a1fd66a
ACE_optic_SOS_PIP - iron sight was missing, fix #470
2015-04-11 13:18:45 +02:00
bux578
eeb94b617f
add x64 make.py
...
takes into account that mikero's tools are in Wow6432Node
2015-04-11 08:14:38 +02:00
PabstMirror
787df67248
Merge branch 'master' into disarmingTest
2015-04-10 19:20:34 -05:00
jaynus
4188893839
Move spatial model translations to ace_common
2015-04-10 14:23:55 -07:00
jaynus
0a88220fc2
Constraints work, added worldToScreenBounds to common.
2015-04-10 14:20:06 -07:00
jaynus
721898d9fb
Constraint dialogs working.
2015-04-10 13:57:44 -07:00
commy2
11ad74735c
Merge pull request #458 from Tenga/master
...
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
2015-04-10 22:12:55 +02:00
PabstMirror
adc7db9ae9
#456 - Fix AI rotating while dead (disableAI func)
...
Still some small head movements, but I don't know how to fix that.
2015-04-10 15:02:40 -05:00
Tenga
b710c2543e
Return the newline to fnc_externalCamera.sqf
2015-04-10 21:59:28 +02:00
commy2
2a72e183b1
Merge pull request #450 from Tenga/master
...
Count the commander camera as a 3rd person camera
2015-04-10 21:54:52 +02:00
Tenga
229590ed20
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
2015-04-10 21:54:47 +02:00
Tenga
c8cff6e91c
- Added isFeatureCameraActive to ace_common
...
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
2015-04-10 21:48:24 +02:00
jaynus
83b453a294
Merge pull request #379 from acemod/allTheMissiles
...
Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.
2015-04-10 12:48:10 -07:00
jaynus
8429b262f2
more debug removal, backup vanilla usage.
2015-04-10 12:40:58 -07:00
PabstMirror
661ddc3562
#441 - Crash with no model on ace_fakeweapon
2015-04-10 14:35:08 -05:00
esteldunedain
8715a9c4a1
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3
...
Conflicts:
addons/medical/stringtable.xml
2015-04-10 16:25:07 -03:00
esteldunedain
ee8af7f153
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-10 16:21:27 -03:00
esteldunedain
d6e70cfe6b
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
...
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 16:20:18 -03:00
jaynus
5577a541ca
Add example.
2015-04-10 12:19:02 -07:00
