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
9,739 Commits 73 Branches 88 Tags 752 MiB
2cc1252f81
Commit Graph

141 Commits

Author SHA1 Message Date
Glowbal
41196c15aa Merge pull request #1686 from acemod/fixFrag 
Fix frag
 2015-07-26 23:42:16 +02:00
KoffeinFlummi
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02:00
PabstMirror
bca5fa1f4a Spall - execNextFrame instead of addPerFrameHandler 2015-07-25 03:20:03 -05:00
PabstMirror
e29fb477f9 Merge branch 'master' into fixFrag 2015-07-25 02:38:10 -05:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR) 
Made all remaining translations, including new ones like the sitting
module, for example.
 2015-06-27 15:48:39 -03:00
PabstMirror
6c7ba7b5ae Zeus module on dedicated server 2015-06-18 22:43:49 -05:00
PabstMirror
375c81d9b0 Connect Zeus module to Frag 2015-06-18 22:13:06 -05:00
PabstMirror
9c0478ddfd Cleanup 2015-06-18 22:04:48 -05:00
PabstMirror
e235ebcc15 Fix frag always killing thrower 2015-06-18 21:48:23 -05:00
PabstMirror
ccb30e0a47 use master pfh for frag 2015-06-16 22:39:37 -05:00
Macusercom
24cea18ae5 Revert "Revert "Added German translations"" 
This reverts commit 4403e3c665.
 2015-06-16 03:21:25 +02:00
Macusercom
4403e3c665 Revert "Added German translations" 
This reverts commit 0adc07d284.
 2015-06-16 03:06:23 +02:00
Macusercom
0adc07d284 Added German translations 2015-06-16 03:06:13 +02:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
Ivan Navarro Cabello
d15bae105d Updated spanish translation 
Updated spanish translation
 2015-06-08 12:43:07 +02:00
gienkov
c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1 
Conflicts:
	addons/interact_menu/stringtable.xml
 2015-06-05 09:40:50 +02:00
gienkov
b5eb39291c Merge remote-tracking branch 'origin' into pl-translation-1 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
 2015-06-04 00:52:35 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
gienkov
212862a401 Merge remote-tracking branch 'origin' into pl-translation-1 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
 2015-05-31 22:45:09 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
jonpas
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736 added spansih translate 
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).

I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
 2015-05-27 15:27:04 +02:00
Grzegorz
d96873b8a0 Fix line ending 2015-05-23 21:16:36 +02:00
gienkov
8ef41b7523 Translate missing frag and adv. ball. strings to PL 2015-05-23 21:16:34 +02:00
jaynus
582ea318d4 Merge remote-tracking branch 'origin/superTime' 
Conflicts:
	addons/frag/functions/fnc_fired.sqf
	addons/frag/functions/fnc_trackFragRound.sqf
 2015-05-22 07:24:55 -07:00
jaynus
46751fd912 Merge pull request #1163 from acemod/fragSpallOptimization 
Frag spall optimization
 2015-05-21 15:08:07 -07:00
jaynus
3cb4094429 Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization 2015-05-21 15:07:12 -07:00
jaynus
c297257421 Disable frag by default. Add @pabstmirror fix closes #1339 closes #820 2015-05-21 15:06:55 -07:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
jaynus
92799719b6 Spall off by default. 2015-05-14 08:30:06 -07:00
jaynus
035277aafc removed illegal character 2015-05-14 08:11:08 -07:00
jaynus
58a55313cd Changed: Entire frag system re-optimized to a single tracking/GC index-based PFH. 
Changed: Spalling calculations now throttled across frames and limited; accurate but performant
Changed: All lookups are now index-based on a global projectiles array. This reduced runtime dramatically for all fragmentation.
 2015-05-13 17:06:10 -07:00
jaynus
aef896cc21 Merge remote-tracking branch 'origin/explosive_reflection' into fragSpallOptimization 
Conflicts:
	addons/frag/XEH_preInit.sqf
 2015-05-13 15:52:18 -07:00
jaynus
553942bbc7 Initial commit of frag/spalling optimization rewrite. Now tracks in single PFH, with index-based referencing instead of searches. TODO: Break spall calculation up to multiple frames. Needs testing. 2015-05-13 14:33:14 -07:00
PabstMirror
4185874a9a Frag Privates 2015-05-12 23:19:31 -05:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
jaynus
b7b6cb6086 Fixed: Adds an enabler config to ace_frag, disabling the PFH for any round not enabled. 2015-05-08 11:27:17 -07:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
commy2
a97c934688 fix ubc, fix #938 2015-05-01 11:01:07 +02:00
ulteq
50a8a89b28 Added missing privates 2015-04-30 10:50:49 +02:00
ulteq
d2aa28715d Merge pull request #874 from acemod/fragCleanup 
Frag cleanup
 2015-04-30 10:35:25 +02:00
ulteq
e77ddcf837 Added Sh_105mm_HEAT_MP frag config 2015-04-30 10:35:06 +02:00
ulteq
59017ed79d Added more frag configs: 
* R_Hydra_HE
* Sh_120mm_HE
* Sh_125mm_HE
* Missile_AGM_02_F
* M_Hellfire_AT
 2015-04-30 10:26:00 +02:00
ulteq
00dc0ef01e Added frag classes array for 82mm shell 2015-04-29 17:48:19 +02:00
ulteq
989332831f Added frag configs for 82mm and 155mm shells 2015-04-29 17:42:37 +02:00
ulteq
2068eaea75 Added G_40mm_HE config, changed 40mm gurney_k values 2015-04-29 13:53:38 +02:00
ulteq
a8f37a4c72 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup 2015-04-29 13:33:07 +02:00
KoffeinFlummi
a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 
Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-29 12:52:55 +02:00
ulteq
416a914253 More vector math replacements 2015-04-27 22:14:08 +02:00
ulteq
0d6d96e76c Cleanup++: 
* Added missing privates
* Removed unused privates
* Replaced some old vector calculations with new vector commands
 2015-04-27 22:04:35 +02:00
ulteq
3c92cab7af Reverted the addBlackList function 2015-04-27 14:02:59 +02:00
ulteq
f54f0cd1fa Renamed init functions 2015-04-27 13:58:18 +02:00
ulteq
1fc044dfa9 Cleanup++: 
*Moved GVAR(enabled) into ACE_Settings.hpp
*Replaced BIS_fnc_magnitude with vectorMagnitude
*Renamed Nou_GBU12
*Added G_40mm_HE config data
 2015-04-26 23:14:54 +02:00
ulteq
6170ef0d50 Code cleanup 2015-04-26 23:05:58 +02:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things. 
Also fixed a typo the english key for STR_ACE_microdagr_configure.
 2015-04-26 03:09:16 -03:00
KoffeinFlummi
9ac662ea7c Lowercase curator ammo frag entries 2015-04-26 00:01:48 +02:00
KoffeinFlummi
59bdc23a95 Merge branch 'master' into curatorFragmentation 2015-04-25 23:55:29 +02:00
KoffeinFlummi
24efbf731d Convert frag config entry names to lowercase 2015-04-23 15:46:50 +02:00
Brisse89
c975213579 Update CfgAmmo.hpp 
Added missing data to 40mm grenades.
 2015-04-23 11:11:38 +02:00
Glowbal
fb93e9e9bc wrapped track in debug define 2015-04-20 23:38:50 +02:00
Glowbal
24c32d8e3f added configuration 2015-04-20 23:18:53 +02:00
Glowbal
7b790ffb1a staged work 2015-04-20 22:48:11 +02:00
KoffeinFlummi
1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/disposable/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
 2015-04-15 22:20:47 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
Marco
eceb759523 Update stringtable.xml 
Italian
 2015-04-15 10:53:35 +02:00
Nou
15ac5ec7b8 Two explosions processed per-frame. 2015-04-14 16:33:47 -07:00
Nou
114d66af7e Do it every frame, no need for delay. 2015-04-14 13:00:57 -07:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
Nou
14579fb90e Explosive reflection, enabled on all frag rounds. 2015-04-14 00:41:19 -07:00
Harakhti
3c3f6ba4c3 Translation: A to I 
Some parts filled out, other parts corrected or stylized.
 2015-04-13 19:28:58 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
FreeZbe
45ff6c7ce9 French: (Nearly) Complete French translations 
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
 2015-04-12 14:15:45 +02:00
bux578
0e3d971274 Fix translations error 2015-04-12 07:46:43 +02:00
KoffeinFlummi
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02: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
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations 
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 09:01:24 +02:00
Grzegorz
022e17417f frag PL translation 2015-04-10 03:37:30 +02:00
Grzegorz
2925100ec6 frag PL translation 2015-04-10 03:36:32 +02:00
Legolasindar
dc44b73a36 Update stringtable.xml 
updated spanish terms
 2015-04-10 01:12:31 +02:00
licht-im-Norden87
0986eb427d Update stringtable.xml 2015-04-09 23:41:10 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
bux578
92da20ce62 translations 
#367
 2015-04-07 10:02:33 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
Nou
12cadc603f Fragmentation enabled. 2015-03-21 21:22:16 -07:00
Felix Wiegand
7c1703ae11 Create README.md 2015-01-26 13:46:21 +01:00
PabstMirror
6e8c394903 Standardize Config Version Stuff 2015-01-18 01:32:07 -06:00
jaynus
3fb2a8e245 big code clean up 2015-01-12 21:14:27 -08:00
jaynus
1e29509b45 Dragon, lasers, air_hud and javelin code. 2015-01-11 10:24:19 -08:00