Commit Graph

7029 Commits

Author SHA1 Message Date
jonpas
a8412361bd Use setting init delay function for addSpareParts 2015-09-05 19:33:25 +02:00
Glowbal
41db78b52b Merge pull request #2341 from acemod/323tracers
better scaling for tracer sizes, fix #1008
2015-09-05 13:47:37 +02:00
commy2
46d741281b Merge pull request #2358 from acemod/322flashbangexplosive
sort flashbang under explosive grenades, not misc grenades
2015-09-05 13:40:24 +02:00
Glowbal
a4b4c5d2a3 Merge pull request #2187 from jonpas/trackToTrackedVehicles
Added Spare Parts module handling
2015-09-05 13:36:42 +02:00
Glowbal
f0a074072f Merge pull request #2329 from acemod/323medicalstrcturaldamage
setStructuralDamage function
2015-09-05 13:16:13 +02:00
Glowbal
446f367f8b Merge pull request #2359 from acemod/fixRestoreGear
fix restore gear
2015-09-05 13:09:21 +02:00
Glowbal
9c7f7429d1 Merge pull request #2350 from jonpas/cargoHideActionOnLocked
Prevent Cargo opening if vehicle is locked
2015-09-05 13:09:14 +02:00
Glowbal
a02f95ae06 Merge pull request #2355 from acemod/settingInitDelayFunctions
Setting init delay functions
2015-09-05 11:01:44 +02:00
bux578
9e1ae58f4f fix restore gear 2015-09-03 18:17:53 +02:00
PabstMirror
f63e652636 Merge pull request #2334 from acemod/mapToolsAspectRatio
MapTools - Handle Bad Aspect Ratio
2015-09-03 10:44:34 -05:00
commy2
736be74c2b Merge pull request #2344 from acemod/322hideclock
hide clock on map if no watch in inventory, #414
2015-09-03 13:44:20 +02:00
commy2
36b42f2780 Merge pull request #2343 from acemod/322flares
scripted approach to hand flares, fix #1079
2015-09-03 13:44:04 +02:00
commy2
529c85df58 Merge pull request #2338 from acemod/322sit
Sitting improvements
2015-09-03 13:43:53 +02:00
commy2
6b7f84b297 add missing ; 2015-09-03 13:39:17 +02:00
commy2
76bb2bd2b8 replace function with FUNC macro 2015-09-03 13:37:36 +02:00
commy2
a187be7255 sort flashbang under explosive grenades 2015-09-03 13:23:15 +02:00
PabstMirror
024dc3effe Cleanup 2015-09-03 00:16:48 -05:00
PabstMirror
789de9d111 runAfterSettingsInit helper func 2015-09-03 00:11:49 -05:00
PabstMirror
cbccd898ea Run functions after setting init 2015-09-02 23:58:24 -05:00
commy2
fbf00b9aa5 correct comment 2015-09-03 02:55:40 +02:00
PabstMirror
c213c0e05a Merge pull request #2352 from jonpas/slideshowPrivates
Cleaned up Slideshow privates
2015-09-02 16:10:31 -05:00
jonpas
def2d29501 Cleaned up slideshow privates 2015-09-02 22:51:31 +02:00
jonpas
0bbf4d4128 Prevent Cargo opening if vehicle is locked 2015-09-02 22:24:46 +02:00
SilentSpike
6aa191b788 Merge pull request #2327 from acemod/fixGunnerGoggles
Fix gunner goggles
2015-09-02 13:31:50 +01:00
commy2
07ab7d1c35 correct comment 2015-09-02 02:00:53 +02:00
commy2
29efc13556 hide clock, use eventhandler 2015-09-02 01:59:07 +02:00
commy2
43c54d51e8 hide clock on map if no watch in inventory, #414 2015-09-02 01:40:38 +02:00
commy2
83424cdcab header for fnc_flare 2015-09-02 00:03:16 +02:00
commy2
7ce606740c make flares work in mp 2015-09-01 23:56:25 +02:00
commy2
be56fd7d46 scripted approach to hand flares, fix #1079 2015-09-01 23:19:49 +02:00
commy2
471d54f674 better saling for tracer sizes, fix #1008 2015-09-01 21:48:40 +02:00
commy2
237d5b6536 stand up action (uses get out shortcut) and less awkward standing animaton 2015-09-01 21:03:28 +02:00
commy2
acfc48efc2 animate head when surrendered and handcuffed 2015-09-01 20:00:28 +02:00
commy2
405d85eaaa fix leaning back through chair while sitting, fix #1795 2015-09-01 19:06:20 +02:00
PabstMirror
264091957a #1917 - Pointing Update Circle Icon 2015-09-01 10:09:14 -05:00
commy2
fb9ad6075f Merge pull request #2337 from acemod/322bouncym84
bouncing flashbangs, fix #1907
2015-09-01 17:05:36 +02:00
commy2
c0defe9204 Merge pull request #2336 from acemod/322hcmodule
high command module breaks ace, fix #2134
2015-09-01 17:05:24 +02:00
commy2
dd788342fe remove commented debug messages 2015-09-01 16:37:46 +02:00
bux578
de66c2be7b add commy's newest issue 2015-09-01 13:16:58 +02:00
commy2
b1fbbcc49f bouncing flashbangs, fix #1907 2015-09-01 12:46:15 +02:00
commy2
5e68486233 high command module breaks ace, fix #2134 2015-09-01 10:06:01 +02:00
commy2
73911f701d add debug messages for #2134 2015-09-01 08:53:11 +02:00
PabstMirror
c97e0eb500 MapTools - Handle Bad Aspect Ratio 2015-08-31 22:50:01 -05:00
commy2
3362bbf0bf fix protection 1.50 ubc issues 2015-09-01 00:01:42 +02:00
commy2
87cf7ded83 Merge pull request #2311 from acemod/322backpack
objectParent command replacing fnc_getBackpackAssignedUnit
2015-08-31 21:32:42 +02:00
commy2
e7d9e8c0dc Merge pull request #2312 from acemod/322opendoor3rdperson
increase reach in 3rd person for opening doors, fix #2301
2015-08-31 21:32:34 +02:00
commy2
aa1ad1bc2a Merge pull request #2313 from acemod/322ffvweaponselect
fix weapon select in ffv slots not working
2015-08-31 21:32:26 +02:00
commy2
9b6bc73c1a Merge pull request #2314 from acemod/322spottingscope
better animation for spotting scope, fix #1638
2015-08-31 21:32:17 +02:00
commy2
591327aaf3 Merge pull request #2315 from acemod/3220xgrenadebug
fix autoriflemen spawning with 0x frag grenade bug
2015-08-31 21:32:09 +02:00
commy2
80a0c93bdc Merge pull request #2316 from acemod/322customcamera
fix custom cameras (for intros) being broken with ACE, fix #2248
2015-08-31 21:32:02 +02:00