Commit Graph

5429 Commits

Author SHA1 Message Date
ulteq
eacd8e5a49 Removed debug output 2015-06-13 17:22:45 +02:00
ulteq
833634f010 Ported the ACE2 ear ringing logic 2015-06-13 17:16:18 +02:00
ulteq
86d7143890 Merge pull request #1600 from acemod/tacticalladderStringtable
Made use of the new stringtable macros
2015-06-13 09:52:02 +02:00
ulteq
6eeeb22fcd Made use of the new stringtable macros 2015-06-13 09:51:49 +02:00
ulteq
b4e0504747 Merge pull request #1588 from acemod/rhs38_us_compat
Update RHS compat for 0.3.8
2015-06-13 09:38:07 +02:00
ulteq
b86e6b6043 Merge pull request #1493 from acemod/tacticalladder
Initial draft of the ACE2 tactical ladder port.
2015-06-13 09:37:41 +02:00
ulteq
42f2d88ab7 Merge pull request #1257 from LKS90/modifiedSetup
Added steps I had to do for windows to make ace3
2015-06-13 09:29:22 +02:00
PabstMirror
affe323435 Fix bodybag string macro 2015-06-12 23:19:17 -05:00
ulteq
4160c7668c Workaround to prevent accidentally canceling the ladder deployment 2015-06-13 00:01:48 +02:00
ulteq
8336f1d192 Complete overhaul of the ladder interaction routine 2015-06-12 23:54:51 +02:00
ulteq
9499592322 Cleanup 2015-06-12 22:45:41 +02:00
ulteq
fd40c3a947 New backpack model from raspu:
* Fixes incorrect positioning
2015-06-12 22:14:19 +02:00
ulteq
1cbe972999 Merge pull request #1585 from acemod/huntirParachuteSpeed
HuntIR parachute falling speed experiment
2015-06-12 21:41:46 +02:00
ulteq
62fc0a90e6 Removed the model.cfg 2015-06-12 21:41:17 +02:00
ulteq
6fe7b15832 Removed debug output 2015-06-12 21:40:44 +02:00
Nicolás Badano
c45b443bbc Merge pull request #1597 from SzwedzikPL/interact_passengers_icons
slot icons in passengers menu
2015-06-12 15:38:45 -03:00
SzwedzikPL
ac87a28daa role icon for passengers 2015-06-12 20:32:10 +02:00
ulteq
1393b79a82 Reduced the descending speed of the parachute:
* Adjusted the geometry LOD mass in the huntir.p3d
* Fixed the calculating of the recording time
2015-06-12 20:22:09 +02:00
ulteq
c51000e8a4 Merge pull request #1595 from acemod/dagrGunnerView
DAGR overlay auto hide
2015-06-12 18:44:19 +02:00
ulteq
9130546c8c DAGR overlay auto hide 2015-06-12 18:23:01 +02:00
ulteq
4b0c4b9dd6 handleDamage EH for the HuntIR 2015-06-12 18:01:53 +02:00
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
PabstMirror
13602262cf Update RHS compat for 0.3.8 2015-06-11 21:04:34 -05:00
ulteq
eff31db128 HuntIR parachute falling speed experiment 2015-06-11 21:50:43 +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
5394131fd1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into tacticalladder 2015-06-11 12:44:15 +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