ulteq
f84a936d95
Merge pull request #1504 from acemod/concertina_wire
...
Ported the ACE2 Concertina Wire
2015-06-12 13:42:32 +02:00
ulteq
2e0b837190
Merge pull request #1534 from acemod/dagr
...
Initial draft of the ACE2 DAGR port
2015-06-12 13:42:25 +02:00
Glowbal
0aaabfde7c
Merge pull request #1591 from acemod/medicalFallingFix
...
Fixes _projectile not being updated
2015-06-12 11:54:34 +02:00
ulteq
6ac2ca9208
Fixes _projectile not being updated
2015-06-12 11:48:49 +02:00
ulteq
d8877d0dbd
Fixed 'spotterscope' typo; Moved m_m1070.paa into \data folder
2015-06-11 21:28:44 +02:00
ulteq
ab85a9ceb6
Merge pull request #1582 from acemod/destroyableHuntIR
...
Made the HuntIR camera destroyable:
2015-06-11 19:40:00 +02:00
ulteq
f7a76480f9
Made the HuntIR camera destroyable:
...
* Shooting the parachute will increase its damage
* The falling speed now increases with damage
* Damaged cameras won't be able to transmit video
* The HuntIR spawn positions now really depends on the grenade trajectory
2015-06-11 19:37:51 +02:00
Nicolás Badano
0981a8dc3e
Merge pull request #1581 from acemod/execNextFramePFEH
...
One PFEH for execNextFrame and waitAndExec
2015-06-11 13:53:08 -03:00
ulteq
6273775c1f
Merge pull request #1580 from acemod/aplRvmatFixes
...
Fixed two RVMAT files
2015-06-11 17:57:11 +02:00
ulteq
35e2047dca
Fixed two RVMAT files
2015-06-11 17:56:25 +02:00
ulteq
0ec729ccd8
Allow configuring the DAGR while the map is opened.
2015-06-11 12:43:42 +02:00
ulteq
292e24e414
Merge pull request #1576 from acemod/keybindExceptions
...
Allowed using the ATrag, Kestrel and Rangecards inside of vehicles.
2015-06-11 12:06:01 +02:00
ulteq
ba15db7d6a
Allowed using the ATrag, Kestrel and Rangecards inside of vehicles.
2015-06-11 12:05:46 +02:00
ulteq
b3538c972f
Finished the DAGR port:
...
* Added keybinds
* Shortened the function names
* Made use of the GVAR macro for all global variable names
2015-06-11 11:56:25 +02:00
Glowbal
9d82b9a1f3
Merge pull request #1550 from acemod/medicalVanillaDamageFix
...
Attempt to fix #1465 and #1354
2015-06-11 10:25:50 +02:00
Glowbal
b6ed944123
Merge pull request #1563 from acemod/medicalCleanup
...
Cleanup
2015-06-11 10:25:28 +02:00
PabstMirror
3e396b416a
One PFEH for execNextFrame and waitAndExec
2015-06-11 02:45:42 -05:00
ulteq
eb7a38e137
Merge pull request #1567 from acemod/rangecardMenu
...
Reordered the rangecard menu entries:
2015-06-10 22:57:16 +02:00
ulteq
3c753d74ec
Reordered the rangecard menu entries:
...
* Also added the ability to copy your own rangecards
* Reference: https://github.com/acemod/ACE3/pull/1118
2015-06-10 22:56:35 +02:00
ulteq
3e25a8b4a9
Finished ACE2 port:
...
* The concertina wire can now be placed in the editor
* Added handleDamage EH to avoid wire destruction with bullets/grenades
* Added proper detection routine of what killed the wire
2015-06-10 22:29:33 +02:00
ulteq
58bb496ac2
Merge pull request #1564 from acemod/stringtableFixHuntIR
...
Fixed incorrect CSTRING
2015-06-10 18:12:04 +02:00
ulteq
f0f36ea9b2
Fixed incorrect CSTRING
2015-06-10 18:10:12 +02:00
ulteq
249a55d041
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into dagr
2015-06-10 17:44:01 +02:00
ulteq
8a7d3e9ede
handleDamage_advanced cleanup
2015-06-10 17:10:09 +02:00
ulteq
91ce327580
Newline
2015-06-10 17:07:35 +02:00
ulteq
caae62b2af
Reverted handleDamage_advanced
2015-06-10 17:07:00 +02:00
ulteq
245151d8c2
Removed spaces
2015-06-10 17:03:09 +02:00
ulteq
1c2c7ef8d7
Fixed empty selectionNames in vehicle crashes
2015-06-10 17:02:14 +02:00
ulteq
9336e7c9e1
[WIP] Various handleDamage_caching fixes
2015-06-10 16:51:46 +02:00
ulteq
772a1e508b
Cleanup
2015-06-10 16:07:09 +02:00
ulteq
0661d25ae3
Removed debug output
2015-06-10 16:06:46 +02:00
ulteq
3d744be2a8
Fixes the map grid calculation for negative stepY values:
...
* On maps like Utes, Chernarus, ...
2015-06-10 15:54:50 +02:00
ulteq
d2ad0255e9
Fixed DAGR icon size
2015-06-10 13:48:39 +02:00
ulteq
c617372612
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into concertina_wire
2015-06-10 13:40:34 +02:00
ulteq
0f6c93852c
Fixed handling of falling damage
2015-06-10 12:59:55 +02:00
ulteq
8bb3dbbaf6
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix
2015-06-10 12:59:11 +02:00
ulteq
ca633fef16
Merge pull request #1562 from acemod/fixHandleDamage_caching_returnValue
...
Fix handleDamage caching return value
2015-06-10 12:48:33 +02:00
ulteq
7318aae629
Cleanup
2015-06-10 12:47:22 +02:00
Glowbal
efa9cf4709
Fix handleDamage caching return value
...
Should never return nil. Instead, return a 0 as it's expecting new damage. this may fix the random vanilla damage kicking in.
2015-06-10 12:21:06 +02:00
Glowbal
b8d473cdf7
Merge pull request #1559 from acemod/fixMedicalLogLocalization
...
#1473 - Fix Medical Log Localization
2015-06-10 10:11:16 +02:00
PabstMirror
e2890b0699
#1473 - Fix Medical Log Localization
...
also swap some common EFUNCs
2015-06-09 17:30:02 -05:00
ulteq
9d0c034b72
Merge pull request #1556 from acemod/kestrel_rvmat
...
Increased specular of the Kestrel texture
2015-06-09 23:02:23 +02:00
ulteq
b16d341c0d
Increased specular of the Kestrel texture
2015-06-09 23:01:48 +02:00
ulteq
2a929c4c6b
Replaced all spawn, sleep, and fsm code.
2015-06-09 22:46:04 +02:00
ulteq
06b2da432c
Merge pull request #1551 from jonpas/isNotInsideCPfix
...
Removed isNotInside from Sandbag, SpottingScope and Tripod placement
2015-06-09 16:22:25 +02:00
jonpas
3510d43a17
Removed isNotInside from Sandbag, SpottingScope and Tripod placement
2015-06-09 16:20:43 +02:00
ulteq
d454a2ccfc
Attempt to fix #1465 and #1354
2015-06-09 15:46:00 +02:00
PabstMirror
b61bd1fb75
1.46 New RscInfoType (fix UBC)
2015-06-08 13:26:18 -05:00
Nicolás Badano
1def1ee7e4
Merge pull request #1546 from SilentSpike/zeusUpdate
...
Update ace_zeus with 1.46 changes
2015-06-08 14:44:12 -03:00
SilentSpike
f9d1a39adf
Updated edited BI functions with 1.46 changes
2015-06-08 18:18:40 +01:00
