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
3,816 Commits 73 Branches 88 Tags 752 MiB
414a50fb9b
Commit Graph

3293 Commits

Author SHA1 Message Date
ulteq
09ff217e93 Improved the init process 2015-04-22 21:16:01 +02:00
ulteq
74888b4fff Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-22 19:47:06 +02:00
ulteq
a9726d2b60 Simplified the wind direction change calculation 2015-04-22 19:46:27 +02:00
ulteq
caf2f12eb9 Improved the wind direction selection based on the probability array 2015-04-22 19:46:09 +02:00
jaynus
0c6786a138 use the vehicle of the player for variables, not the player. allows static optics. FIxes #808 2015-04-22 08:07:58 -07:00
jaynus
d63de3a09e restart PFH on optic reload. Fixes #812 2015-04-22 07:49:18 -07:00
Grzegorz Sikora
1063d4bb2c PL translation 2015-04-22 13:17:43 +02:00
ulteq
ac5d593271 Switched to an improved version of the old getWind function 2015-04-22 12:56:07 +02:00
ulteq
e7bc0c26bc Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-22 11:54:18 +02:00
ulteq
1d108f42a7 Added a magazine for the new 6.5 Creedmor cartridge 
*Fixed the 65x47mm short name
 2015-04-22 11:53:22 +02:00
ulteq
2ec95c2862 Brackets 2015-04-22 11:32:16 +02:00
ulteq
f8006eaac9 Expanded the ammo database: 
*30-06 Springfield (.30 Cal M1 Ball 174 grain)
*6.5 Creedmore (Berger .264 cal 140 grain Hybrid)
*7mm Rem Mag (Berger .284 cal 180 grain Hybrid)
*.243 Win (Berger .243 cal 105 grain Hybrid)
 2015-04-22 11:31:11 +02:00
ulteq
e479557f8a Some magazine Stringtable fixes 2015-04-22 10:48:45 +02:00
ulteq
b4ec13aa8c Merge branch 'feature/realname_extend' of https://github.com/rlex/ACE3 into rlex-feature/realname_extend 
Conflicts:
	addons/realisticnames/stringtable.xml
 2015-04-22 10:10:00 +02:00
Glowbal
fedbf84d5f Merge pull request #800 from acemod/fixDraggingAvailableWithoutMedical 
Fixed dragging always available when medical module is removed
 2015-04-22 07:43:23 +02:00
PabstMirror
8ec86a337f Show Loaded Ammo for static weapons 2015-04-21 19:35:04 -05:00
jaynus
b2c5e5e9f1 Remove AB verison check until versioning is complete. 2015-04-21 17:04:16 -07:00
jaynus
b384d62edd Fixes typos in medical strings causing missing strings. 2015-04-21 17:02:50 -07:00
Nicolás Badano
b6d7e12507 Merge pull request #779 from gienkov/master 
PL translation fix
 2015-04-21 19:25:53 -03:00
commy2
1facca2ba9 fix: missing authors on flares, remove inert duplicate of handgrenade from zeus 2015-04-22 00:24:54 +02:00
Grzegorz
485fd7078f Update stringtable.xml 2015-04-22 00:22:44 +02:00
Nicolás Badano
1bfb13abac Revert "remove author from items inheriting ACE_ItemCore" 2015-04-21 19:07:42 -03:00
commy2
cfda0e17c6 Merge pull request #788 from acemod/animfix 
put weapon on back without having to stand up
 2015-04-21 23:40:52 +02:00
ulteq
a886afb7d0 Added a model for the ACE_Box_Ammo 2015-04-21 23:26:38 +02:00
Nicolás Badano
3105cef364 Merge pull request #787 from acemod/interactionHighVisibility 
User changeable text/shadow colors for interaction
 2015-04-21 17:31:11 -03:00
Nicolás Badano
18bb40b72b Merge pull request #798 from acemod/fixMapAir 
Illuminate map for gunner of helicopters. Fixes #558
 2015-04-21 16:52:17 -03:00
jaynus
d8d658602f Apply to all aircraft gunner and pilot 2015-04-21 12:50:42 -07:00
Glowbal
0ab25a2866 fixed #659 2015-04-21 21:41:00 +02:00
ulteq
2fa39615f3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-21 21:06:30 +02:00
jaynus
b2f978da3c Added unstabalized optic mode to comanche for following the chopper. Is the first optic, all other zoom levels are stabalized. Fixes #556 2015-04-21 12:01:30 -07:00
jaynus
08203b26c7 Illuminate map for gunner of helicopters. Fixes #558 2015-04-21 11:58:07 -07:00
ulteq
d7f67970a4 Fixed a bug in the wind direction init code 2015-04-21 20:55:04 +02:00
ulteq
1db9f055e2 Removed debug output 2015-04-21 20:54:47 +02:00
ulteq
428baefc2c Added random temperatureShift, badWeatherShift, humidityShift 2015-04-21 20:41:50 +02:00
ulteq
30d1b1b5e5 Fixed a typo in the updateTemperature function 2015-04-21 20:20:22 +02:00
ulteq
af4fdda477 Continued work on the new wind system: 
* Moved the wind data into CfgWorlds.hpp
* Modified the contents of ACE_WIND_PARAMS
* new getWind function for the clients
* new wind init based on the real world weather data
 2015-04-21 20:20:05 +02:00
Nicolás Badano
ce3cc71869 Merge pull request #795 from acemod/fixAuthor 
remove author from items inheriting ACE_ItemCore
 2015-04-21 15:08:53 -03:00
Nicolás Badano
421954c829 Merge pull request #794 from Legolasindar/master 
updated stringtable for spanish
 2015-04-21 15:07:12 -03:00
bux578
3897b73d56 remove author from items inheriting ACE_ItemCore 2015-04-21 19:16:54 +02:00
PabstMirror
be031801ab #770 - m84 - don't add pain if strength is low 2015-04-21 12:09:58 -05:00
Ivan Navarro Cabello
55887b7cfe updated stringtable for spanish 
added some spanish translate
 2015-04-21 19:03:55 +02:00
bux578
7b4f451d8a reduce m84 mass 
m84 weighs ~260g compared to a m18 with ~520g. Ingame the m18 has a mass
of 4 but giving the m84 a mass of 2 seems odd to me. That's why I've
reduced it from 10 to 4.
 2015-04-21 19:00:13 +02:00
ulteq
7c57ad25bd Fixes a recently introduced bug in the relative click memory 2015-04-21 16:54:26 +02:00
ulteq
287c0d62ca Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-21 16:03:28 +02:00
ulteq
e22a7e1aad Improved the range card column spacing 2015-04-21 16:01:53 +02:00
ulteq
c27f3fb131 Added target speed direction switch / Improved the solution result output 2015-04-21 15:46:53 +02:00
ulteq
4833193860 Added a new solution setup menu 2015-04-21 15:01:23 +02:00
ulteq
c24586ce02 Reworked the result output GUI on the main page 2015-04-21 11:53:28 +02:00
ulteq
0cf2374475 Atmospheric Calc Method GUI improvement 2015-04-21 11:43:16 +02:00
ulteq
f98a0cdfae Overworked the scope click number GUI 2015-04-21 11:24:59 +02:00
ulteq
6c4b078dce Updated the default gun profile used for adding new profiles 2015-04-21 09:46:57 +02:00
commy2
616eee6aa4 remove broken launcher anim 2015-04-21 06:22:41 +02:00
commy2
5093307756 experiment with launcher anim 2015-04-21 06:10:30 +02:00
commy2
de660cf45f messing with animations 2015-04-21 05:21:04 +02:00
commy2
5e440686bb put weapon on back without having to stand up 2015-04-21 04:43:24 +02:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
Glowbal
166c8147cf Using ace_frag_fnc_addManualTrack instead of fired function 2015-04-20 23:55:23 +02:00
Glowbal
4543bab7fb added nil check for function ace_frag_fnc_fired 2015-04-20 23:41:22 +02:00
Glowbal
fb93e9e9bc wrapped track in debug define 2015-04-20 23:38:50 +02:00
esteldunedain
1fa9ba1cbf Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-20 18:24:50 -03:00
esteldunedain
90288b495e Interactions inside vehicles. Skip the "Main Interactions" level; mount its children intead. 2015-04-20 18:24:12 -03:00
Glowbal
24c32d8e3f added configuration 2015-04-20 23:18:53 +02:00
PabstMirror
fdbd0c1905 #777 - mDagr - Update map pos each frame. 2015-04-20 16:12:01 -05:00
Glowbal
7b790ffb1a staged work 2015-04-20 22:48:11 +02:00
Nicolás Badano
2a945df150 Merge pull request #782 from acemod/nobag 
hide open bag option when it's not selected via scroll wheel
 2015-04-20 17:25:11 -03:00
Glowbal
1df42b17c2 close all dialogs 2015-04-20 22:22:09 +02:00
Glowbal
89a1306605 Merge branch 'master' into KeyPressesWhileUnconscious 2015-04-20 22:19:40 +02:00
Glowbal
362051e2db Merge pull request #717 from acemod/medicalFixes 
Medical fixes
 2015-04-20 22:16:57 +02:00
Glowbal
f7719f0e0a tab 2015-04-20 22:08:31 +02:00
commy2
afc8abce85 hide open bag option when it's not selected via scroll wheel 2015-04-20 22:00:13 +02:00
Glowbal
842bfe0b98 enabled advanced wounds setting 2015-04-20 22:00:11 +02:00
Glowbal
90cf882e02 Using setvar instead of event sync again 2015-04-20 21:58:27 +02:00
Glowbal
8be7ccaab7 setting for moving unit from group on unconscious 2015-04-20 21:37:30 +02:00
commy2
ae3c8e3d88 weapon select keys are optional 2015-04-20 21:10:56 +02:00
commy2
43707342a8 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into wselect 2015-04-20 20:07:48 +02:00
commy2
438b6a1adb Merge pull request #618 from acemod/recoil 
Recoil overhaul
 2015-04-20 19:47:02 +02:00
commy2
ed72697141 Merge pull request #728 from acemod/error 
Show error message and quit mission if a dll isn't present
 2015-04-20 19:41:38 +02:00
esteldunedain
66af69def8 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-20 13:55:42 -03:00
esteldunedain
9295393dd6 Allow cursor for interactions 2015-04-20 13:54:51 -03:00
commy2
ea368511b7 ace extensions class for modularity 2015-04-20 18:48:58 +02:00
commy2
14214090dc manual merge 2015-04-20 18:22:17 +02:00
commy2
16c6a3ee78 tweaking recoil 2015-04-20 17:38:45 +02:00
Grzegorz Sikora
222aceaf56 PL fix 2015-04-20 17:11:22 +02:00
ulteq
ac74e6c611 More WIP 2015-04-20 16:33:36 +02:00
commy2
6c00aef6e8 coeficients for recoil configs 2015-04-20 16:02:36 +02:00
ulteq
8aa69663d6 More WIP 2015-04-20 16:01:13 +02:00
KoffeinFlummi
06a4f3d10e Remove tabler comments. 2015-04-20 15:48:50 +02:00
KoffeinFlummi
e8cd918b90 Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-20 15:46:36 +02:00
esteldunedain
7953919b89 Merge branch 'simpleDiagnosis' into streamlinedBasicDiagnosis 2015-04-20 10:24:59 -03:00
esteldunedain
1e3b44e32e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into streamlinedBasicDiagnosis 2015-04-20 10:24:24 -03:00
commy2
d8fbb49bbd Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into recoil 2015-04-20 15:14:57 +02:00
ulteq
9155056a50 Proof of concept wind code (custom debug output enabled) 2015-04-20 15:11:14 +02:00
ruPaladin
08caf0c695 Updated russian translation (medical) 
Перевел как смог, вероятно данная настройка будет в ACE3 Настройки. Нужно проверить влезет ли туда. Если влезет, то подкорректировать перевод. Правки строго приветствуются.
 2015-04-20 15:18:17 +03:00
ulteq
be378adfee Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-20 13:54:28 +02:00
ulteq
89e33dc177 Refactored the weather module: 
* No changes in functionality
 2015-04-20 13:54:22 +02:00
bux578
89f6b6bfd0 Merge pull request #766 from ruPaladin/patch-3 
Rus translation (nametags)
 2015-04-20 13:23:04 +02:00
bux578
13b11d7225 Merge pull request #768 from Tachii/patch-17 
Update stringtable.xml
 2015-04-20 13:02:38 +02:00
ulteq
6c2982548f Fixed incorrect function header 2015-04-20 12:35:08 +02:00
ulteq
0e08fd4457 Incremented the ATragMX profile namespace version 2015-04-20 11:09:12 +02:00
ulteq
de0414803e Fixed some more airFriction values in the ATragMX gun list 2015-04-20 11:08:28 +02:00
ulteq
c049ee5c08 Fixed incorrect .408 Chey Tac airFriction value 2015-04-20 11:02:28 +02:00
ulteq
2bf47ca0c4 Added two more asterix (*) meter indicator GUI elements 2015-04-20 10:36:20 +02:00
ulteq
8ff72e7fc8 Fixed another bug in the unit conversion code 2015-04-20 10:35:29 +02:00
PabstMirror
822bd22c97 gj git 2015-04-20 02:18:46 -05:00
PabstMirror
e747234443 Cleanup Spelling 2015-04-20 02:17:47 -05:00
PabstMirror
8c449a454b merge conflict 2015-04-19 23:57:15 -05:00
esteldunedain
f928f37e26 Eliminate interact_menu fps drops due to high nearby object counts. 
Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second.
The rest of the frames the action points from the last frame are rerendered..
Close #434
 2015-04-20 01:16:51 -03:00
Tachii
20293bd11b Update stringtable.xml 2015-04-20 00:26:20 +03:00
Grzegorz Sikora
8530684fa6 PL fix #2 2015-04-19 23:09:11 +02:00
Tachii
6c8b587890 Update stringtable.xml 2015-04-20 00:02:01 +03:00
ulteq
f7d35d5593 The ATragMX now also accounts for vertical coriolis drift (Eötvös effect) 2015-04-19 22:30:13 +02:00
Tachii
5038674aef Update stringtable.xml 2015-04-19 23:01:38 +03:00
Tachii
60cab963bf Update stringtable.xml 2015-04-19 23:00:51 +03:00
Glowbal
17899db086 added some missing privates 2015-04-19 19:49:56 +02:00
Glowbal
5e82c51926 Merge branch 'master' into medicalFixes 2015-04-19 18:45:07 +02:00
jaynus
aad8d6b785 Fixed: max litter scalar array, have internal values. 2015-04-19 09:04:42 -07:00
Tachii
a7d913b80e Update stringtable.xml 2015-04-19 18:54:47 +03:00
Tachii
596fadcba0 ru translations fixes 
Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches
 2015-04-19 18:51:35 +03:00
Tachii
a83925dd2d Update stringtable.xml 2015-04-19 18:43:05 +03:00
ulteq
20740679cc Fixed inconsistent 'workingMemory' initialization 2015-04-19 17:40:49 +02:00
Glowbal
f6bbeb6bd6 switched back to old init method 2015-04-19 17:28:47 +02:00
Glowbal
d1fabf9733 Merge branch 'master' into medicalFixes 2015-04-19 17:26:10 +02:00
Grzegorz Sikora
4283e07942 PL fix 2015-04-19 13:50:08 +02:00
Glowbal
8a7b3a1b33 Removed damage thresholds from basic medical 2015-04-19 13:08:28 +02:00
ulteq
a73c0bc429 Sord is now able to transmit the direction of fire 2015-04-19 12:40:13 +02:00
ulteq
2b5b89604e Removed unused RscControlsGroup 2015-04-19 12:29:26 +02:00
ulteq
f6263e9e8b Overworked the scope click feature: 
*TODO: Add the "Setting Up a Solution for Your Scope" screen
 2015-04-19 12:07:27 +02:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
ulteq
874858ebb4 Added a sanity check to the cycle gun list function 
*Top/Down buttons only cycle the gun list in the main/gun list menu
 2015-04-19 11:43:20 +02:00
ulteq
5195271894 Fixes: https://github.com/acemod/ACE3/commit/4235163 
*The asterix needs to be shown on distances shown in meters not yards
 2015-04-19 11:32:02 +02:00
ulteq
4430e8a0ee Increased the minimum barometric pressure value that is accepted 2015-04-19 11:18:37 +02:00
ulteq
4235163801 Added asterix (*) prefix to distances in yards on the main page 2015-04-19 11:14:18 +02:00
ulteq
de5c5139c0 Moved a private declaration out of the hot path 2015-04-19 11:02:25 +02:00
ulteq
8f20303a08 Fixed a bug in the atmosphere unit conversion 2015-04-19 11:02:06 +02:00
ulteq
336a192302 The range card setup data is now also restored on mission start 2015-04-19 10:57:55 +02:00
ulteq
51590d39ad Cleaned up the ATragMX postInit routine 2015-04-19 10:47:43 +02:00
ruPaladin
d8b96066e6 Rus translation (nametags) 2015-04-19 11:01:41 +03:00
ruPaladin
45fd90c6e0 Rus translation (medical) 2015-04-19 10:49:06 +03:00
commy2
c9a2505031 Merge pull request #755 from acemod/fixoptics2 
Fix for PIP scopes, fix #547
 2015-04-19 07:46:41 +02:00
bux578
2dfbd0a5cd Merge pull request #761 from Tachii/patch-16 
Update stringtable.xml
 2015-04-19 07:11:39 +02:00
bux578
daf2fbb906 Merge pull request #760 from Tachii/patch-15 
Update stringtable.xml
 2015-04-19 07:11:27 +02:00
bux578
25ac90ef8b Merge pull request #759 from Tachii/patch-14 
Update stringtable.xml
 2015-04-19 07:11:06 +02:00
bux578
5ed0dfe463 Merge pull request #758 from Tachii/patch-13 
Update stringtable.xml
 2015-04-19 07:10:55 +02:00
bux578
fa8e954d27 Merge pull request #757 from Tachii/patch-12 
Update stringtable.xml
 2015-04-19 07:10:45 +02:00
commy2
275da6f40a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-19 07:09:21 +02:00
commy2
9cb27c8fb2 fix: error when getting killed with FF-messages module, fix #745 2015-04-19 07:08:57 +02:00
bux578
0d86374bee Merge pull request #754 from gienkov/master 
PL translation
 2015-04-19 07:08:54 +02:00
PabstMirror
54c5070569 isNull 2015-04-18 22:23:19 -05:00
jaynus
dccc869a6a Merge pull request #753 from acemod/fixSettingsLocalization 
Fix settings localization is done by the server instead of client
 2015-04-18 20:09:56 -07:00
KoffeinFlummi
65fd6b0937 Merge https://github.com/EpMAK/ACE3 into russian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
 2015-04-19 01:04:32 +02:00
KoffeinFlummi
46bd51ffdf Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-19 00:51:33 +02:00
KoffeinFlummi
592e0d2dd3 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-19 00:51:09 +02:00
jaynus
14faabb677 Merge branch 'master' of github.com:acemod/ACE3 2015-04-18 15:44:25 -07:00
jaynus
2fe7122b3e Disable handoff until completed. 2015-04-18 15:44:07 -07:00
commy2
5558a6491d remove weapon select in favor of the new controls from bi 2015-04-19 00:40:29 +02:00
KoffeinFlummi
8015aca0c3 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-19 00:40:18 +02:00
KoffeinFlummi
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-19 00:39:44 +02:00
Tachii
e62a476a90 Update stringtable.xml 2015-04-19 01:37:08 +03:00
Tachii
dc2c3e246e Update stringtable.xml 2015-04-19 01:25:30 +03:00
Tachii
8f9796f488 Update stringtable.xml 2015-04-19 01:23:37 +03:00
Tachii
a9d38f5970 Update stringtable.xml 2015-04-19 01:19:32 +03:00
Tachii
560646e1e1 Update stringtable.xml 2015-04-19 01:18:53 +03:00
commy2
ae80da7492 fix cameras breaking pip scope camera r2t texture, reenable PIP scopes in arsenal 2015-04-19 00:05:54 +02:00
esteldunedain
8b389949bc Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-18 18:42:11 -03:00
esteldunedain
bce0d84989 Fix interact menu object ordering 2015-04-18 18:41:36 -03:00
jaynus
9618fefa67 Merge pull request #384 from acemod/fixmass 
fix falling over static weapons
 2015-04-18 14:36:20 -07:00
ulteq
21c772aa8d Fixed scope adjustment conflicting with vehicle weapon zeroing 2015-04-18 23:14:40 +02:00
ulteq
454c6dfbfe Added more GUI elements to structure the ATragMX main page 2015-04-18 22:58:23 +02:00
ulteq
ae3dad4f36 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 22:12:45 +02:00
ulteq
283388eb7c Fixed a small calculation error in the wind speed output 2015-04-18 22:12:37 +02:00
commy2
7ac7bc3f29 eventhandler for creating and deleting cameras 2015-04-18 22:06:42 +02:00
Grzegorz
8dac6d3f3d Update stringtable.xml 2015-04-18 22:03:36 +02:00
Grzegorz Sikora
0629b59184 Merge branch 'master' of https://github.com/gienkov/ACE3 
Conflicts:
	addons/optionsmenu/stringtable.xml
 2015-04-18 22:02:44 +02:00
Grzegorz Sikora
c08125e0f3 PL translation 2015-04-18 22:00:37 +02:00
Glowbal
9825d030e3 Merge pull request #714 from acemod/localMedicalGarbage 
ACE JIP data and event synchronization (Tested with Litter change)
 2015-04-18 21:25:53 +02:00
ulteq
c950324c75 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 21:18:18 +02:00
ulteq
d8b461db91 Enabled wind deflection for grenades and vehicle gunners: 
*Added a new module option to disable WD for vehicle gunners
*Fixed enabled setting not being initialized
 2015-04-18 21:17:37 +02:00
bux578
0f2e4c22b7 Merge pull request #749 from FreeZbe/master 
French: updates / fixes stringtable
 2015-04-18 21:16:07 +02:00
bux578
1cbd854412 Merge pull request #748 from gienkov/patch-6 
PL translation fix
 2015-04-18 21:15:30 +02:00
jaynus
f5705a91e6 oops. 2015-04-18 12:04:48 -07:00
jaynus
ca74ce721d Use cleanup settings, and force server TTL on the events. 2015-04-18 11:48:44 -07:00
jaynus
e54c68f7f9 handle cleanup 2015-04-18 11:37:06 -07:00
jaynus
852b4df61d Settings changes. createVehicleLocal derp. 2015-04-18 11:16:18 -07:00
jaynus
c438d9e790 Merge remote-tracking branch 'origin/master' into localMedicalGarbage 2015-04-18 11:12:22 -07:00
Glowbal
54a70f26b1 Moved to own function. 2015-04-18 20:06:01 +02:00
Glowbal
85e5293c37 Fix settings localization is done by the server instead of client #744 2015-04-18 19:59:41 +02:00
jaynus
dea95f7947 ace_laser_selfdesignate 2015-04-18 10:57:35 -07:00
jaynus
8361ec3812 ace_lasers 2015-04-18 10:57:11 -07:00
jaynus
953faf3d4b ace_missileguidance privates. 2015-04-18 10:53:21 -07:00
jaynus
87337bcb7a ace_javelin privates 2015-04-18 10:50:22 -07:00
Glowbal
22456a4301 use pain instead 2015-04-18 19:49:29 +02:00
jaynus
11336cdade Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-18 10:37:16 -07:00
jaynus
26e2917f79 Merge remote-tracking branch 'origin/master' into laserCodes 
Conflicts:
	addons/javelin/CfgWeapons.hpp
 2015-04-18 10:36:07 -07:00
jaynus
1d908c2f70 Merge pull request #677 from acemod/titanCompat 
Titan static & variant compatability with missile guidance
 2015-04-18 10:32:57 -07:00
ulteq
c1ee623808 Added a few static gui elements 2015-04-18 19:22:24 +02:00
jaynus
9c076364ec Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff. 2015-04-18 10:18:33 -07:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
Grzegorz
34cf11e022 PL translation fix 
Did not saw that one
 2015-04-18 18:48:56 +02:00
jaynus
d1e03d8e7a Slight tweaks. 2015-04-18 09:40:46 -07:00
jaynus
e14ee45249 debug checking. 2015-04-18 09:29:58 -07:00