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
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
b39209cc28
BAD @esteldunedain! BAD DOGGY!
2015-04-14 17:09:13 -07: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
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
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
36ebb96531
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:58:29 -07:00
85c10328ae
missed one.
2015-04-14 14:58:19 -07:00
5d8dd701d2
Merge pull request #518 from acemod/basic-medical-tweaks
...
Basic medical tweaks
2015-04-14 23:49:00 +02:00
df3c8155a0
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:45:30 -07:00
c6943fbdaf
fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588
2015-04-14 14:45:21 -07:00
4c6cc8dddf
merging stringtables
2015-04-14 23:22:25 +02:00
9b80245479
Fix speed limiter not working
2015-04-14 23:13:02 +02:00
8b1bce3b3d
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-14 23:00:59 +02:00
9e64538bc7
Fix minor adjustment strings
2015-04-14 23:00:17 +02:00
f07949cf19
Remove some old todos
2015-04-14 22:57:18 +02:00
676f7c8732
Remove hitpart from action names for non-self
2015-04-14 22:50:06 +02:00
13d7649c4a
Buff colour flashing effect
2015-04-14 22:49:26 +02:00
2391c5e6d6
Tweak crate names
2015-04-14 22:34:19 +02:00
91e25dc215
Missing stringtable entries
2015-04-14 22:34:08 +02:00
8aad369ed3
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-14 22:23:56 +02:00
035ed573b8
Reworked the magazine configs
2015-04-14 22:23:36 +02:00
1d64b8c36e
Added the new magazines into various ammo boxes
2015-04-14 22:22:36 +02:00
e214511e36
Added new magazine classes:
...
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
2015-04-14 22:19:51 +02:00
f0a716fee8
Added new ammo classes:
...
*762x67mm Mk248 Mod 0
*762x67mm Mk248 Mod 1
*762x67mm Berger Hybrid OTM
*65x47mm Scenar
2015-04-14 22:17:27 +02:00
7af6ea36a6
Fix missing pain effect option name
2015-04-14 22:07:43 +02:00
348bf611f8
Merge branch 'master' into basic-medical-tweaks
2015-04-14 21:55:45 +02:00
684c36f8a5
Add pain effect option
2015-04-14 21:49:56 +02:00
462947a04c
Merge pull request #585 from acemod/fix-clientSetable
...
Fix spelling of "isClientSetable"
2015-04-14 16:48:50 -03:00
ebcdafe610
Fix spelling of "isClientSetable"
2015-04-14 21:43:19 +02:00
e7807c009f
Use playerInventoryChanged instead of Take
...
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
2015-04-14 21:28:18 +02:00
f9630f3a1c
Merge pull request #582 from acemod/build_check_for_obsolete_pbos
...
Added Obsolete PBO removal support added to build.py
2015-04-14 12:01:46 -07:00
2f2eab87e2
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 11:42:38 -07:00
739807303b
Fix script error for canceling designation and dying while designating.
2015-04-14 11:42:26 -07:00
71b19b4621
Remove duplicate bleeding code
2015-04-14 20:40:38 +02:00
ba377dfd3a
Show seperate message for "scratches"; localize
2015-04-14 20:40:17 +02:00
c6118901b4
Merge branch 'master' into basic-medical-tweaks
2015-04-14 20:35:17 +02:00
7ca36cdb65
Always show wounds, even for very low damage
2015-04-14 20:28:19 +02:00
