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
2,188 Commits 73 Branches 88 Tags 752 MiB
ae064359f6
Commit Graph

1985 Commits

Author SHA1 Message Date
PabstMirror
26d282c224 Explosives: Fix cursor interaction menu breaking 2015-04-09 22:46:19 -05:00
Nicolás Badano
357fd1969b Merge pull request #406 from Legolasindar/patch-4 
Spanish: Update stringtable.xml
 2015-04-09 21:24:19 -03:00
Nicolás Badano
7e6e0d0ecd Merge pull request #402 from Legolasindar/patch-2 
Update stringtable.xml
 2015-04-09 21:24:00 -03:00
jaynus
c1089dfffa Working save, distance shots are off. 2015-04-09 16:43:05 -07:00
Legolasindar
2a5e416dfc Update stringtable.xml 
fixed spanish terms
 2015-04-10 01:40:22 +02:00
Legolasindar
e63b9c7aa9 Update stringtable.xml 
added spanish translation
 2015-04-10 01:38:31 +02:00
Legolasindar
2456660867 Update stringtable.xml 2015-04-10 01:36:42 +02:00
Legolasindar
5a849fe8a4 Update stringtable.xml 
added spanish translation
 2015-04-10 01:33:08 +02:00
jaynus
2e9f6a7058 Better projected up/down. 2015-04-09 16:31:14 -07:00
Legolasindar
2542f994d6 Update stringtable.xml 
added spanish translation
 2015-04-10 01:29:52 +02:00
Legolasindar
5f5ce47bec Update stringtable.xml 
fixed one term in spanish
 2015-04-10 01:26:06 +02:00
Legolasindar
65b3566d41 Update stringtable.xml 
fixed spanish terms.
 2015-04-10 01:24:37 +02:00
Legolasindar
b8b151e62e Update stringtable.xml 
added spanish terms
 2015-04-10 01:20:39 +02:00
Legolasindar
df31442599 Update stringtable.xml 
added spanish terms
 2015-04-10 01:13:33 +02:00
Legolasindar
dc44b73a36 Update stringtable.xml 
updated spanish terms
 2015-04-10 01:12:31 +02:00
Legolasindar
ed87e53c80 Update stringtable.xml 
Updated spanish terms.
 2015-04-10 00:48:51 +02:00
Legolasindar
cef9a6454a Update stringtable.xml 
Updated spanish terms, on moved english to first raws.
 2015-04-10 00:38:24 +02:00
jaynus
1eadcade72 Linear work javelin. 2015-04-09 15:34:42 -07:00
PabstMirror
c511431e61 Fix encoding problem 
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
 2015-04-09 17:17:33 -05:00
Legolasindar
1dcbebc04c Update stringtable.xml 
Updated spanish terms
 2015-04-10 00:10:47 +02:00
Felix Wiegand
309eb7b3bf Merge pull request #399 from licht-im-Norden87/patch-1 
Stringtable: German additions
 2015-04-10 00:06:43 +02:00
Legolasindar
7b4d62c46c Update stringtable.xml 
Fixed spanish terms
 2015-04-10 00:05:47 +02:00
jaynus
8fe11c36ee Linear altitude comparison. 2015-04-09 14:11:15 -07:00
licht-im-Norden87
2c7df9da6a Stringtable: German additions 2015-04-09 23:02:28 +02:00
Glowbal
84c8e02328 Merge pull request #396 from KoffeinFlummi/medicalCleanup 
Medical cleanup
 2015-04-09 22:13:31 +02:00
jaynus
198d4f3540 Fixed private variable overrides and timing failure. 2015-04-09 13:03:28 -07:00
PabstMirror
253614d442 Explosives: cancel placement when opening interact 
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel.  It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
 2015-04-09 14:48:27 -05:00
jaynus
01535c7f5c Merge remote-tracking branch 'origin/master' into allTheMissiles 
Conflicts:
	addons/wep_javelin/config.cpp
 2015-04-09 12:41:09 -07:00
Glowbal
d94943a9ff getting hitpoint damage on non existing hitpoint returns type instead of bool 2015-04-09 21:38:35 +02:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs 
Added unload and load of unconscious units
 2015-04-09 21:23:10 +02:00
Glowbal
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
jaynus
fe147c4986 Config expansion. 2015-04-09 09:39:23 -07:00
commy2
2d265ec6c2 prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
commy2
b41c6280ba prvent falling ai from being stcuk, fix #290 2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c Merge pull request #392 from KoffeinFlummi/requiredaddons 
sorting out required addons for modularity
 2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7 Merge remote-tracking branch 'origin/removeRecoil' 
Conflicts:
	addons/recoil/config.cpp
 2015-04-09 10:05:14 -03:00
Nicolás Badano
c57044fd4a Merge pull request #390 from KoffeinFlummi/betterMapColors 
Improve map colors by taking them from A2
 2015-04-09 09:52:06 -03:00
esteldunedain
6447b39d1a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/scopes/XEH_postInit.sqf
 2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c Allow holding scope adjustment keys 2015-04-09 09:31:18 -03:00
KoffeinFlummi
3a871eed58 Merge branch 'master' into tools-cleanup 2015-04-09 13:37:19 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561 Improve map colors taking them from A2 2015-04-09 01:28:36 -03:00
jaynus
bbfd28586b Apply ace_missileguidance to Titan. (Direct only) This is testing the extensible framework for mod makers. 2015-04-08 19:51:21 -07:00
PabstMirror
2033676e81 another undef to Make PBO-Project Happy 2015-04-08 18:20:00 -05:00
jaynus
5a9a8d239c Remove test parameters, timing correct. Attack profile selection working. 2015-04-08 15:52:58 -07:00
jaynus
0a1aae8553 Work save, timing correction. 2015-04-08 15:41:26 -07:00
jaynus
97230c2252 compensate for FPS lag. 2015-04-08 15:34:59 -07:00
jaynus
c89df1b04f Dir arc created. 2015-04-08 14:51:19 -07:00
jaynus
97febd6207 Disable debug, wtf math 2015-04-08 14:31:44 -07:00
jaynus
04b0efb22b Safer calling, build out attack profiles. 2015-04-08 13:57:08 -07:00
jaynus
cf876116a9 Working configuration based guidance framework. 2015-04-08 13:45:43 -07:00
commy2
3e3390750d manual merge 2015-04-08 22:01:41 +02:00
commy2
c5b38c8942 manual merge 2015-04-08 21:51:42 +02:00
commy2
1ae69d56ff Merge pull request #377 from KoffeinFlummi/142light 
142 directional light for map effects
 2015-04-08 21:46:48 +02:00
commy2
7346c194f4 Merge pull request #306 from KoffeinFlummi/optics 
Taosenai's Animated Optics req 1.42
 2015-04-08 21:41:12 +02:00
PabstMirror
c3564ee883 undef to Make PBO-Project Happy 2015-04-08 14:38:29 -05:00
jaynus
6f9203262a tweak default deflection values for testing 2015-04-08 12:32:33 -07:00
Glowbal
3702679ee4 fixed wrong value for radio disabled on waking up 2015-04-08 21:31:59 +02:00
jaynus
d2e3ea347a Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-08 12:17:46 -07:00
PabstMirror
a4af1fcb30 Fix Marker Placement on UAV Map 2015-04-08 13:55:29 -05:00
jaynus
3946ee32d2 Fixes left/right issue. 2015-04-08 11:27:30 -07:00
commy2
3de3432664 Merge pull request #271 from KoffeinFlummi/142resting 
1.42 - Remove scripted weapon resting
 2015-04-08 20:26:13 +02:00
PabstMirror
2bc0976979 Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy 
Revert "Revert "1.42 - cursor mode when bipod deployed""
 2015-04-08 13:26:05 -05:00
PabstMirror
023a2d2202 Merge pull request #267 from KoffeinFlummi/142Markers 
1.42 Marker Placement
 2015-04-08 13:24:55 -05:00
PabstMirror
176a39e86c Merge pull request #265 from KoffeinFlummi/142InventoryConfig 
1.42 Inventory Config
 2015-04-08 13:22:12 -05:00
PabstMirror
007e4fc234 Merge pull request #274 from KoffeinFlummi/142requiredaddons 
1.42 ensure ace is loaded after marksmen configs
 2015-04-08 13:21:33 -05:00
jaynus
bc7943d729 added todo 2015-04-08 09:18:11 -07:00
jaynus
87dac2c2ad Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-08 08:55:14 -07:00
jaynus
177be598d7 Fixes: Laser designator now uses strongest ray result. 2015-04-08 08:48:08 -07:00
jaynus
64724737cd Code passing cleanup. 2015-04-08 08:35:24 -07:00
PabstMirror
af3d6a5113 #386 - Ace Options Menu on main menu 
Same limitations as CBA controls, needs a intro or mission loaded
Doesn't work with -skipintro command line.
 2015-04-08 10:33:12 -05:00
jaynus
61f5324d29 ACE_Settings entry for guidance. 2015-04-08 08:19:19 -07:00
jaynus
104dd2258e Guidance framework working. 2015-04-08 08:01:39 -07:00
commy2
01a9374a26 Merge pull request #382 from KoffeinFlummi/disablebs 
disable cursor showing map position
 2015-04-08 10:48:31 +02:00
commy2
deece11689 remove debug 2015-04-08 10:47:56 +02:00
commy2
a47cdb9738 disable map cursor coordinates in mp 2015-04-08 10:45:57 +02:00
esteldunedain
b18bcf8835 Add option to turn on/off cursor coordinates 2015-04-08 01:49:56 -03:00
commy2
691ab012b4 fix map loaded on preInit 2015-04-08 00:44:14 +02:00
commy2
4834facccf moving it to map 2015-04-08 00:30:36 +02:00
KoffeinFlummi
ce45237989 Report full version number in RPT for debugging 2015-04-08 00:27:00 +02:00
commy2
50dbbda8eb disable cursor showing map position 2015-04-08 00:20:43 +02:00
esteldunedain
ed3ac637d2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 19:19:46 -03:00
PabstMirror
2f4335d3c2 #344 - Ignore missing ace_serverconfig on client 2015-04-07 17:14:27 -05:00
commy2
949c5d4333 manual merge 2015-04-07 23:26:16 +02:00
commy2
518c704db6 manual merge 2015-04-07 23:18:31 +02:00
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
commy2
d1b8595c0e light intensity from object: handle campfires 2015-04-07 23:02:54 +02:00
PabstMirror
d060b13bbe #86 - Stretch gps info box to support 8 digits 2015-04-07 15:47:12 -05:00
commy2
b6c278e7d3 fix using efunc vs func 2015-04-07 22:33:35 +02:00
commy2
96268b6407 directional light for map effects 2015-04-07 22:19:03 +02:00
PabstMirror
6b0fb84f65 Cleanup / Headers 2015-04-07 15:01:44 -05:00
jaynus
bf70a9ba77 Tracers and colors 2015-04-07 12:59:35 -07:00
jaynus
fa9cf0280c script error 2015-04-07 12:44:15 -07:00
commy2
88a5519465 cache the frames 2015-04-07 21:42:08 +02:00
PabstMirror
2ad9193475 Use DrawIcon for map tools 2015-04-07 14:38:35 -05:00
jaynus
d3d5554c49 Laser designation information localized to vehicle. 2015-04-07 12:35:34 -07:00
commy2
14718eb5b4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 21:22:21 +02:00
commy2
d825505aa0 cache light config properties 2015-04-07 21:22:00 +02:00