c226d49ab9
Merge branch 'lmbmenu'
...
Conflicts:
addons/interact_menu/stringtable.xml
2015-04-15 01:33:44 -03:00
25e8e93fd0
Add back stringtables for the list menu
2015-04-15 01:32:42 -03:00
d7a0503dbc
Merge pull request #600 from acemod/lmbmenu
...
disable firing if menu is opened, fix #368 , close #483
2015-04-15 01:29:39 -03:00
5faf4b7dfa
Remove comment
2015-04-15 01:27:29 -03:00
a36739c697
Merge pull request #418 from acemod/flashbangTweaks
...
Flashbang tweaks
2015-04-14 23:23:15 -05:00
a9f44530c9
Move the function that prevents firing while the interact_menu is open to the interact_menu pbo
2015-04-15 01:20:20 -03:00
1f51a3fc8a
Never use this func anywhere
2015-04-14 23:10:05 -05:00
a0199c0e3f
Merge pull request #601 from firefly2442/cmake-fix
...
match to exact directory name (case-sensitive)
2015-04-14 21:03:20 -07:00
428688422e
Missing stringtable for listMenu
2015-04-14 22:47:57 -05:00
c81fa61f2e
match to exact directory name (case-sensitive)
2015-04-14 22:34:58 -05:00
d6a293c573
disable firing if menu is opened
2015-04-15 05:19:03 +02:00
7ad9238bbf
Fixes
2015-04-14 23:32:03 -03:00
c6c7ef7c79
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 23:22:35 -03:00
c397246534
Fix the fov test. Issue not fixed
2015-04-14 23:22:08 -03:00
57acee0f89
Changed: Cleaned up Missile guidance setting for AI, SCALAR.
2015-04-14 19:19:14 -07:00
53ce7d0be4
Increase the tolerance to 2m
2015-04-14 23:12:48 -03:00
7a606a2352
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 22:54:10 -03:00
ee34078960
Add early visibility check to interact menu
2015-04-14 22:53:10 -03:00
00b9e2d72c
draw3d
2015-04-14 20:49:44 -05:00
91c8c89e87
Only sync A3 VON status over network
2015-04-14 20:47:07 -05:00
b307b4bc4b
Fixed: Flummi missed 2 isClientSettable renames.
2015-04-14 18:38:52 -07:00
ad95105508
Added and enabled AMG for AI.
2015-04-14 18:25:02 -07:00
ef6d090238
Fixed: JAV_DIR was erroring.
2015-04-14 18:18:38 -07:00
37de67395f
Fixed: issue where Javelin wouldn't hit > 1500
2015-04-14 18:18:27 -07:00
2940d1f83c
base rallypoints create a respawn marker if none is present in the mission
2015-04-15 03:10:17 +02:00
1488ba2aac
#595 - Hide ace optino button if no world loaded
...
I wanted to use a rscMapControl onDraw, but it throws an error
onMouseMoving seems odd, but it works and I don't have to overload
onLoad
2015-04-14 19:52:35 -05:00
e1926c6af1
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 02:12:16 +02:00
b39209cc28
BAD @esteldunedain! BAD DOGGY!
2015-04-14 17:09:13 -07:00
29633d763a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 02:05:55 +02:00
fb6553a7a7
Only show distance if laser is on.
2015-04-14 16:57:01 -07:00
4cdf61ab9e
fix misc issues with rallypoints
2015-04-15 01:50:58 +02:00
4d6e757409
Merge pull request #596 from gienkov/patch-4
...
PL translation fix
2015-04-14 20:45:23 -03:00
d538cd257c
PL translation fix
...
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
2015-04-15 01:44:33 +02:00
10b1587453
Merge pull request #592 from gienkov/master
...
PL translation
2015-04-14 20:36:25 -03:00
934f2ce097
Display current laser code. Standardize GVARs
2015-04-14 16:29:49 -07:00
88b78ad3ca
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 20:21:39 -03:00
ee04ea2f41
Allow actions on coordinates instead of selections
2015-04-14 20:21:11 -03:00
2ec74a6a3e
align correctly, create event, remove FCS from laserDesignator.
2015-04-14 16:20:03 -07:00
971566fc3e
Laser code dialog entry. ACTUALLY HIDE THE DAMN LASER
2015-04-14 16:05:01 -07:00
3543b9c806
PL Translation
...
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
dc45228e32
Merge branch 'master' of https://github.com/gienkov/ACE3
2015-04-15 00:42:38 +02:00
81e61e2f04
Added non-radio speaking event to ACRE isSpeaking functionality. Why is this propegating a setVariable every speaking event though? ACRE already propegates that. Closes #591
2015-04-14 15:30:04 -07:00
2ff6eef792
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 19:18:08 -03:00
ad750977e0
Fix ACRE volume on medical unconsciousness
2015-04-14 19:17:05 -03:00
10bb77e738
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 15:11:55 -07:00
c136b78fc8
rename 20mm
2015-04-14 15:11:49 -07:00
495c822061
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 19:10:31 -03:00
6f4bb48489
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/attach/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/overheating/stringtable.xml
extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
7c5a6538a9
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 00:06:12 +02:00
36ebb96531
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:58:29 -07:00
