6689 Commits

Author SHA1 Message Date
Glowbal
9a0aa2b14c Merge pull request #2152 from jokoho48/codeCleanupKestrel4500
Code cleanup of Kestrel 4500 module
2015-10-18 12:16:44 +02:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList
Parse List Common Function
2015-10-18 12:14:18 +02:00
Glowbal
ebe2bf96cd Merge pull request #2277 from jokoho48/codeCleanUpConcertina_wire
Code cleanup of Concertina_wire Module
2015-10-18 12:13:44 +02:00
Glowbal
3682a1710b Merge pull request #2527 from alef/issues/titan_miss
Fix: Titan hitting ground instead of vehicle
2015-10-18 12:11:09 +02:00
PabstMirror
da2d140a39 Cleanup unnecessary statement 2015-10-17 14:30:59 -05:00
jokoho48
bfcf057dab extract Gestures to own Module and Port THS to ACE 2015-10-17 21:17:37 +02:00
SilentSpike
b6dd7b941f Reduce overhead of spectator map icons
Fixes #2514 by only rendering individual unit icons when zoomed in and only rendering the units currently within the screen bounds.

Behaves as expected, but whether or not it has a significant performance increase under scaled up testing conditions remains to be seen.
2015-10-17 13:23:51 +01:00
PabstMirror
fa7299ba1b Add array info to header 2015-10-16 08:28:54 -05:00
PabstMirror
94e3cd1f79 Replace old use of showHud 2015-10-15 22:45:35 -05:00
PabstMirror
bec884e581 showHud handler 2015-10-15 22:33:05 -05:00
PabstMirror
6ffde8150f Simplify Map Light Interactions 2015-10-14 14:36:40 -05:00
jokoho48
2dcdd224bd fix privates in Map module 2015-10-14 19:56:54 +02:00
PabstMirror
f7fe0c08e0 #2391 - Use AGL for sitting setPos 2015-10-14 11:15:44 -05:00
PabstMirror
680f52cd27 Handle Distance when mounted 2015-10-13 13:40:16 -05:00
PabstMirror
8ffe1b4e01 #2528 (2) - Integrate Dragging 2015-10-13 02:20:19 -05:00
PabstMirror
ad1191cdd5 #2528 - Medical Menu Work
(1) Verify target is valid and in reasonable range
2015-10-13 02:01:59 -05:00
PabstMirror
5d76395914 #2734 - Map effects / flashlights for TrippleHead 2015-10-12 11:27:38 -05:00
PabstMirror
7062f60f0a Fix UBC from #2726 2015-10-12 01:07:20 -05:00
Glowbal
1e26fee3ba Merge pull request #2683 from acemod/commonCleanupX
Common cleanup x
2015-10-11 12:15:27 +02:00
Glowbal
8db8e87c53 Merge pull request #2560 from acemod/lockingMissles
#2349 - Don't disable locking for base RocketPods
2015-10-11 12:06:11 +02:00
Glowbal
94ed78a173 Merge pull request #2578 from alganthe/strings_fix
PAK and Surgical Kit strings normalized inside modules.
2015-10-11 12:05:11 +02:00
PabstMirror
4ba0d72bfd #2580 (1) - Fix bandages always created at terrain level. 2015-10-10 23:09:52 -05:00
IngoKauffmann
b5568ca0db Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
Conflicts:
	optionals/compat_bwa3/config.cpp
2015-10-10 13:13:30 +02:00
PabstMirror
53f833b68c #2702 - Cargo: Make "Supply Box" pallets heavy 2015-10-10 00:19:09 -05:00
PabstMirror
f2c66240ca #2717 - Cleanup Coax Weapon Mempoints 2015-10-08 22:32:07 -05:00
PabstMirror
f8ca3693fd #2709 - Fix AB handleFired _muzzleVelocityShift 2015-10-08 21:22:00 -05:00
PabstMirror
326d549510 #2696 - Rangecard check bounds before select 2015-10-08 20:32:14 -05:00
BaerMitUmlaut
2fe53431c7 Split event handlers 2015-10-08 19:29:30 +02:00
BaerMitUmlaut
e50a28874f Fix for BI bug, FFV support 2015-10-08 11:31:29 +02:00
PabstMirror
f3c4ff66ca #2701 - Fix gun smoke on AMV 2015-10-08 02:51:54 -05:00
jonpas
e6a5d8c990 Remove enable optics in adjusted prone stances 2015-10-07 23:00:35 +02:00
BaerMitUmlaut
edb76ffae4 Initial commit 2015-10-07 20:11:07 +02:00
PabstMirror
39b838c7ab Merge pull request #2681 from acemod/vehDetachLocalfix
Attach getIn/Out run on local unit
2015-10-06 13:49:58 -05:00
commy2
9c22052871 Merge pull request #2685 from acemod/340removeactionsondead
remove check ammo action on destroyed static weapons
2015-10-06 19:36:19 +02:00
BaerMitUmlaut
1effe61aa9 Removed parent condition 2015-10-06 19:09:51 +02:00
BaerMitUmlaut
090384c014 Fixed canPassMagazine header 2015-10-06 17:56:32 +02:00
BaerMitUmlaut
d6dcd4112e Resolved merge conflicts 2015-10-06 17:50:55 +02:00
SilentSpike
e5b29727a5 Merge pull request #2617 from jonpas/zeusSpareparts
Add Zeus Modules for Adding Spare Parts
2015-10-05 19:01:50 +01:00
SilentSpike
780e0aa270 Add vision mode support to spectator external cam
Since external view is actually another camera, vision modes should also apply to it too.
2015-10-04 19:26:53 +01:00
SilentSpike
4079ca354e Update spectator function headers 2015-10-04 18:30:07 +01:00
SilentSpike
c1dc8a6493 Fix spectator 3D icons not rendering
Fixes #2676 as per voiperr's suggestion (working with camera can be really strange, I swear this worked before)
2015-10-04 18:17:07 +01:00
SilentSpike
52d703c2eb Improve spectator seagull handling
Previously they were only hidden, but this didn't account for the annoying audio they play so now they're entirely staged like a spectator unit would be.
2015-10-04 18:17:02 +01:00
SilentSpike
f0f822b4bc Decrease default spectator camera speed 2015-10-04 18:17:01 +01:00
SilentSpike
b1dda86cb2 End spectator interface when the mission ends
Fixes #2592 (in theory) by forcing spectator closed on mission end
2015-10-04 18:17:01 +01:00
PabstMirror
616bc9f8a0 local-private waitAndXX PFEH 2015-10-04 11:38:31 -05:00
PabstMirror
f3e61e2136 Merge branch 'master' into commonCleanupX 2015-10-04 11:31:05 -05:00
SilentSpike
0beaa40fbc Add API parameter to allow for unforced spectator
Adds an optional boolean paremeter to the setSpectator function for forcing the interface. It is forced by default, so if `false` is passed as the value the spectator will be able to close the interface with the escape button.
2015-10-04 13:52:54 +01:00
gienkov
b6d2cdee69 Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-04 12:25:55 +02:00
commy2
d9595b6176 fix fnc_binocularMagazine on remote and dead units 2015-10-04 12:10:08 +02:00
commy2
92ed7eeac2 remove check ammo action on destroyed static weapons, fix #2671 2015-10-04 11:58:26 +02:00