KoffeinFlummi
|
9805a8270a
|
Merge branch 'master' into german-merge
|
2015-07-25 19:35:03 +02:00 |
|
PabstMirror
|
9e831d257d
|
Merge pull request #1768 from acemod/10digitGrids2
10 digit grids 2
|
2015-07-25 12:32:02 -05:00 |
|
Glowbal
|
9d7374c893
|
Merge pull request #1307 from jokoho48/master
Cut Parachute/Reserve parachute
|
2015-07-25 19:17:37 +02:00 |
|
SilentSpike
|
21ce877115
|
Handle unit icons and provide setting
|
2015-07-25 14:13:37 +01:00 |
|
SilentSpike
|
2f1639822c
|
Fix incorrect variable
|
2015-07-25 13:24:50 +01:00 |
|
SilentSpike
|
7107514b05
|
New function to precisely control spectatable sides
|
2015-07-25 13:24:49 +01:00 |
|
SzwedzikPL
|
6569fe1d62
|
macro_addbackpack
|
2015-07-25 13:13:31 +02:00 |
|
SilentSpike
|
69d1db2872
|
String updates
|
2015-07-25 11:41:31 +01:00 |
|
PabstMirror
|
bca5fa1f4a
|
Spall - execNextFrame instead of addPerFrameHandler
|
2015-07-25 03:20:03 -05:00 |
|
PabstMirror
|
e29fb477f9
|
Merge branch 'master' into fixFrag
|
2015-07-25 02:38:10 -05:00 |
|
Glowbal
|
0ce50d7b17
|
Merge pull request #1896 from acemod/medicalTreatmentEndAnim
Medical - Don't play *_medic anims at end
|
2015-07-25 09:27:18 +02:00 |
|
SilentSpike
|
5ac77fa996
|
Corrected default param value
|
2015-07-24 22:31:51 +01:00 |
|
SilentSpike
|
c9750919a4
|
PFHs only as needed
|
2015-07-24 20:29:43 +01:00 |
|
SilentSpike
|
e2e6091c1f
|
Close dialogs before open
|
2015-07-24 17:55:33 +01:00 |
|
SilentSpike
|
e4aee1da2c
|
Add categories to help splash
|
2015-07-24 17:50:33 +01:00 |
|
SilentSpike
|
bafb261c01
|
Adding icon toggle
|
2015-07-24 17:37:07 +01:00 |
|
SilentSpike
|
e413cb3d91
|
Cache unit information
|
2015-07-24 17:17:00 +01:00 |
|
SilentSpike
|
8ef6364b59
|
Use localized side strings
|
2015-07-24 16:40:29 +01:00 |
|
SilentSpike
|
eaeda2667c
|
Map icons
|
2015-07-24 16:40:28 +01:00 |
|
SilentSpike
|
fa306a0fb8
|
Further populate help splash
|
2015-07-24 11:39:41 +01:00 |
|
SilentSpike
|
9b3b5e9750
|
Prevent repeating key down events
|
2015-07-24 11:39:40 +01:00 |
|
PabstMirror
|
aa3b9e7b1c
|
#1871 - Don't do ctrlText(set) on RscControlsGroup
Throws `control[ACE_ScriptedDisplayControlsGroup]: Unexpected control
type [15]`
|
2015-07-23 16:46:30 -05:00 |
|
PabstMirror
|
1b590bf0f9
|
More nametag fixes / setSetting casting
|
2015-07-23 14:05:20 -05:00 |
|
jonpas
|
817dfe94e2
|
Added possible values
|
2015-07-23 20:29:51 +02:00 |
|
jonpas
|
964f32a721
|
Fixed NameTags Settings defaults
|
2015-07-23 20:26:31 +02:00 |
|
PabstMirror
|
cbd74d768b
|
Medical - Don't play *_medic anims at end
|
2015-07-23 02:43:19 -05:00 |
|
SilentSpike
|
53a0a9343b
|
Populating help splash
|
2015-07-22 15:21:36 +01:00 |
|
SilentSpike
|
3d290977e5
|
Preserve unit name in toolbar
|
2015-07-22 15:21:33 +01:00 |
|
SilentSpike
|
766b1e1dcd
|
Retain current settings when invalid settings given
|
2015-07-22 15:21:32 +01:00 |
|
SilentSpike
|
248cdf1f3f
|
Public function error messages
|
2015-07-22 15:21:30 +01:00 |
|
PabstMirror
|
4d7a2888eb
|
Remove Debug
|
2015-07-22 03:27:40 -05:00 |
|
PabstMirror
|
8f18fd7eaa
|
Single PFEH for wind deflection
|
2015-07-22 03:04:54 -05:00 |
|
PabstMirror
|
24cda6e37c
|
#1655 - Fix Kestrel Y position on large interface
|
2015-07-22 01:06:36 -05:00 |
|
SilentSpike
|
78ae59b223
|
Default value update
|
2015-07-21 22:56:47 +01:00 |
|
SilentSpike
|
aa67e296c0
|
User feedback when no units left
|
2015-07-21 22:54:46 +01:00 |
|
SilentSpike
|
9f0415b9fa
|
Safeguard against removal of all modes
|
2015-07-21 22:45:54 +01:00 |
|
SilentSpike
|
53dc519336
|
Improved side handling in unit tree
|
2015-07-21 21:23:11 +01:00 |
|
SilentSpike
|
ec58c0061a
|
Public functions to tweak available vision/camera modes
|
2015-07-21 20:19:54 +01:00 |
|
SilentSpike
|
43ecd308eb
|
Fix empty array error
|
2015-07-21 20:00:09 +01:00 |
|
SilentSpike
|
c8a7bbba3b
|
Improved mouse handling
|
2015-07-21 19:48:33 +01:00 |
|
SilentSpike
|
0d798264b0
|
Enforcing the speed limit
|
2015-07-21 19:43:03 +01:00 |
|
SilentSpike
|
341f3a253e
|
Stop dolly on mouse button release
|
2015-07-21 18:44:24 +01:00 |
|
SilentSpike
|
f65b18f558
|
Keyup events
|
2015-07-21 18:26:49 +01:00 |
|
SilentSpike
|
7234c928bc
|
setCameraAttributes should use ATL
|
2015-07-21 18:17:29 +01:00 |
|
SilentSpike
|
e81f9f5e59
|
Mouse dollying
|
2015-07-21 18:06:38 +01:00 |
|
SilentSpike
|
b6ff45e8bd
|
Add vision mode to toolbar
|
2015-07-21 17:48:32 +01:00 |
|
SilentSpike
|
1890bc1d59
|
Unit cycling
|
2015-07-21 16:06:51 +01:00 |
|
SilentSpike
|
dc19bff189
|
Improve handling of invalid modes
|
2015-07-21 15:53:20 +01:00 |
|
SilentSpike
|
dcea8f4929
|
Adding vision to setCameraAttributes
|
2015-07-21 15:44:11 +01:00 |
|
SilentSpike
|
c0fd26f706
|
Add new setting to module
|
2015-07-21 15:15:31 +01:00 |
|
SilentSpike
|
37ffdab2ca
|
Add camera cycling function
|
2015-07-21 15:15:21 +01:00 |
|
SilentSpike
|
2c1e346cca
|
Header cleanup
|
2015-07-21 13:31:00 +01:00 |
|
SilentSpike
|
40f32b604a
|
Camera vision modes
|
2015-07-21 12:46:34 +01:00 |
|
Glowbal
|
5508eae314
|
Merge pull request #1875 from jokoho48/3dModelUpdate2
3D Model Update 2.0
|
2015-07-21 12:22:28 +02:00 |
|
SilentSpike
|
21942eb5a1
|
Preserve z axis on map transport
|
2015-07-20 23:30:18 +01:00 |
|
SilentSpike
|
005b2ad406
|
camTilt should persist
|
2015-07-20 23:25:05 +01:00 |
|
SilentSpike
|
7a45c6543e
|
Truncate speed values to 2 DP
|
2015-07-20 23:17:22 +01:00 |
|
SilentSpike
|
c3329ca8fc
|
Set camera attributes
|
2015-07-20 23:17:03 +01:00 |
|
SilentSpike
|
34d2ec1d5a
|
Altered naming conventions
|
2015-07-20 23:15:52 +01:00 |
|
SilentSpike
|
186d4d0583
|
Fix for #1665
|
2015-07-20 21:14:30 +01:00 |
|
SilentSpike
|
0d94bfe8bd
|
Primative map interaction
|
2015-07-20 20:30:13 +01:00 |
|
ViperMaul
|
22d41797ac
|
Merge pull request #1804 from acemod/misGuideStuff
Missle Guidance / Javelin Fixes
|
2015-07-20 11:28:18 -07:00 |
|
SilentSpike
|
52244c1647
|
Rejiggling toolbar
|
2015-07-20 18:38:18 +01:00 |
|
SilentSpike
|
5af5284bee
|
Adding sides to unit tree
|
2015-07-20 18:37:17 +01:00 |
|
SilentSpike
|
8509646f88
|
Correct side usage
|
2015-07-20 18:37:07 +01:00 |
|
SilentSpike
|
841f939012
|
Improve toggling code and UX
|
2015-07-20 17:13:38 +01:00 |
|
SilentSpike
|
2ffa3c9a85
|
Prevent AI group chat
|
2015-07-20 00:09:52 +01:00 |
|
SilentSpike
|
77941c4f27
|
Remove help button
|
2015-07-20 00:09:51 +01:00 |
|
SilentSpike
|
08d5a8364f
|
Improve overhead reduction
|
2015-07-19 23:03:40 +01:00 |
|
SilentSpike
|
e09342b7ea
|
Improved toggle controls
|
2015-07-19 22:50:13 +01:00 |
|
SilentSpike
|
cc9283ed96
|
Minor UX tweaks
|
2015-07-19 22:47:21 +01:00 |
|
SilentSpike
|
e95186f550
|
Handle focus
|
2015-07-19 22:15:19 +01:00 |
|
SilentSpike
|
e406a794f2
|
Add hostile sides filter
|
2015-07-19 22:14:08 +01:00 |
|
SilentSpike
|
ac56702e33
|
Handle toolbar values
|
2015-07-19 20:02:52 +01:00 |
|
SilentSpike
|
0de56740c0
|
Improved camera mode transition
|
2015-07-19 16:50:59 +01:00 |
|
SilentSpike
|
d8cd1eeb1a
|
Minimising PFH overhead
|
2015-07-19 16:50:58 +01:00 |
|
SilentSpike
|
3b1afe930e
|
Handle the clock
|
2015-07-19 16:50:57 +01:00 |
|
Joko
|
9bdb192c8a
|
Add New LitterGloves
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
|
2015-07-19 15:31:15 +02:00 |
|
Glowbal
|
da5afde324
|
Merge pull request #1874 from jokoho48/TacticalLadderShootFix
Fix shoot through Tacticalladder
|
2015-07-19 15:08:12 +02:00 |
|
SilentSpike
|
619c2d780b
|
Removing debug message
|
2015-07-19 13:03:49 +01:00 |
|
SilentSpike
|
935430ea59
|
Interface tweaks
|
2015-07-19 13:03:40 +01:00 |
|
SilentSpike
|
123825a6fe
|
Updating zeus waypoint actions icon
|
2015-07-19 12:23:57 +01:00 |
|
SilentSpike
|
8d6f167d97
|
Safer unit updates
|
2015-07-19 12:09:57 +01:00 |
|
Joko
|
2615d99178
|
Fix shoot through Tacticalladder
|
2015-07-19 03:32:07 +02:00 |
|
SilentSpike
|
d680789d04
|
Enable compass, auto-refresh units, pass display to PFHs
|
2015-07-19 02:25:52 +01:00 |
|
SilentSpike
|
1ba0bcee95
|
Correct DIK code
|
2015-07-18 19:05:18 +01:00 |
|
SilentSpike
|
7091ac21e9
|
Function cleanup
|
2015-07-18 18:53:30 +01:00 |
|
SilentSpike
|
f7cf983e92
|
Corrected current unit updating
|
2015-07-18 18:53:28 +01:00 |
|
SilentSpike
|
e4ba5aaf1b
|
Camera mode cycling
|
2015-07-18 18:53:27 +01:00 |
|
SilentSpike
|
7b28214c80
|
More reliable freecam PFH termination
|
2015-07-18 17:06:13 +01:00 |
|
SilentSpike
|
fb2b2bc9e5
|
Improve freecam handling
|
2015-07-18 16:59:05 +01:00 |
|
SilentSpike
|
60b3c6c0f8
|
Improved camUnit handling
|
2015-07-18 16:50:11 +01:00 |
|
SilentSpike
|
bfd9be9ce1
|
Naming consistency
|
2015-07-18 16:20:31 +01:00 |
|
SilentSpike
|
382c9fbc35
|
Variable handling and consistency
|
2015-07-18 15:52:44 +01:00 |
|
SilentSpike
|
5d279e11ec
|
Interface toggles
|
2015-07-18 15:42:07 +01:00 |
|
SzwedzikPL
|
99e1b36712
|
AH6 gun fix, hearing protection change
|
2015-07-18 15:51:16 +02:00 |
|
SilentSpike
|
c6e71fbc36
|
Interface prettification
|
2015-07-18 13:12:34 +01:00 |
|
SilentSpike
|
359b81f2ef
|
Spectator position fix
|
2015-07-18 13:04:23 +01:00 |
|
SilentSpike
|
2f8432699b
|
Fix side filtering
|
2015-07-18 00:40:20 +01:00 |
|
PabstMirror
|
bf802f4f5d
|
Merge branch 'master' into virtualAttachObject
|
2015-07-17 17:56:22 -05:00 |
|
SilentSpike
|
13201866bd
|
Module icon
|
2015-07-17 23:31:31 +01:00 |
|
PabstMirror
|
ddc83e0889
|
#1639 - Apply damage where vehicle is local
|
2015-07-17 15:43:00 -05:00 |
|
SilentSpike
|
10c1c26c69
|
Improved unit switching
|
2015-07-17 20:51:06 +01:00 |
|
SilentSpike
|
832fa1e832
|
Side filter
|
2015-07-17 20:51:04 +01:00 |
|
SilentSpike
|
c48719a644
|
Attribution for F3 project devs
|
2015-07-17 16:45:16 +01:00 |
|
SilentSpike
|
cfcb9fedb6
|
Updating ace settings
|
2015-07-17 16:13:24 +01:00 |
|
SilentSpike
|
6de18416bc
|
Interface tweaks
|
2015-07-17 13:14:09 +01:00 |
|
SilentSpike
|
3b9a364a26
|
Expanding the unit tree
|
2015-07-17 12:57:34 +01:00 |
|
Glowbal
|
015fd1afb0
|
Merge pull request #1864 from jokoho48/TextureUpdate
Update IV Blood and Plasma Texture
|
2015-07-17 11:06:49 +02:00 |
|
Joko
|
1b9d02a8a5
|
Update IV Blood and Plasma Texture
|
2015-07-17 09:40:43 +02:00 |
|
Glowbal
|
0154dfc51e
|
Merge pull request #1799 from jokoho48/3DModelUpdate
Add and Update Some 3D Object and Textures
|
2015-07-17 08:17:42 +02:00 |
|
SilentSpike
|
6540971298
|
Tweaking a controls group
|
2015-07-17 02:58:31 +01:00 |
|
SilentSpike
|
27d85180f1
|
Improve handling of unit tree
|
2015-07-17 02:38:42 +01:00 |
|
SilentSpike
|
6cb1813527
|
Fix button y value
|
2015-07-17 02:16:35 +01:00 |
|
SilentSpike
|
81f87ee13c
|
params for public functions
|
2015-07-17 02:05:24 +01:00 |
|
SilentSpike
|
78a8149cc2
|
Viewpoint order UX
|
2015-07-17 01:52:08 +01:00 |
|
SilentSpike
|
e012fbc7f9
|
Unit tools control group
|
2015-07-17 01:47:21 +01:00 |
|
SilentSpike
|
840d766d83
|
Fixing typos, updating interface
|
2015-07-17 01:22:38 +01:00 |
|
PabstMirror
|
b6e124d340
|
#1856 - Close huntIR monitor if item removed
|
2015-07-16 19:12:11 -05:00 |
|
PabstMirror
|
f845d54290
|
#1634 - Integrate with DAGR
|
2015-07-16 18:35:38 -05:00 |
|
PabstMirror
|
f438c6d0c5
|
Revert "Use new worldSize command instead of whileLoop"
This reverts commit 7d26519b2e .
|
2015-07-16 18:10:10 -05:00 |
|
PabstMirror
|
7d26519b2e
|
Use new worldSize command instead of whileLoop
|
2015-07-16 17:47:39 -05:00 |
|
PabstMirror
|
b47a17230b
|
Merge branch 'master' into 10digitGrids2
|
2015-07-16 17:26:19 -05:00 |
|
Nicolás Badano
|
04e137090b
|
Merge pull request #1753 from jonpas/slideshow
Slideshow
|
2015-07-16 18:25:05 -03:00 |
|
Nicolás Badano
|
67d83d0d49
|
Merge pull request #1862 from acemod/disappearingActionsFix
Cache the objects actions for nearby objects and set the GVAR(objectA…
|
2015-07-16 18:24:55 -03:00 |
|
jonpas
|
77631eb61c
|
Only add ACE_MainActions if one doesn't exist yet, Cleaned comments
|
2015-07-16 23:16:09 +02:00 |
|
SilentSpike
|
e823ec681d
|
Toggle help key
|
2015-07-16 21:45:52 +01:00 |
|
jonpas
|
23e7e19100
|
Fixed macro, Added privates
|
2015-07-16 22:39:02 +02:00 |
|
SilentSpike
|
78e17c4bdc
|
Fix function calls with switch to params
|
2015-07-16 21:37:20 +01:00 |
|
SilentSpike
|
a7a87c40f0
|
Using control groups
|
2015-07-16 21:33:50 +01:00 |
|
esteldunedain
|
8da43d25c6
|
Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly.
|
2015-07-16 17:28:27 -03:00 |
|
jonpas
|
a136545b85
|
Merge branch 'master' into slideshow
|
2015-07-16 22:20:56 +02:00 |
|
SilentSpike
|
723a0f96f6
|
Improve view switching UX
|
2015-07-16 19:43:16 +01:00 |
|
SilentSpike
|
20f05d9906
|
Improve unit switching UX
|
2015-07-16 18:31:49 +01:00 |
|
SilentSpike
|
458fe363ff
|
Fixing typo
|
2015-07-16 17:56:50 +01:00 |
|
SilentSpike
|
3895a51f02
|
Correcting view transition
|
2015-07-16 17:48:32 +01:00 |
|
SilentSpike
|
e3c9e52fdd
|
Tree events to update camUnit
|
2015-07-16 17:29:10 +01:00 |
|
SilentSpike
|
549d53d919
|
Use RscPicture for compass
|
2015-07-16 15:51:32 +01:00 |
|
SilentSpike
|
d043a471b3
|
Improving unit list handling
|
2015-07-16 15:49:02 +01:00 |
|
Joko
|
d92e6af1c2
|
Add IRStrobe to CfgMagazines
|
2015-07-16 15:17:09 +02:00 |
|
Joko
|
0ba8a39dc5
|
Add LoD to Wirecutter
|
2015-07-16 14:46:08 +02:00 |
|
Joko
|
c9a47ec053
|
Add LoDs for IVBag 250/500/1000
Add LoDs for Kestrell
|
2015-07-16 14:41:42 +02:00 |
|
Joko
|
b2b7015b8e
|
Remove Unessesary Comments in RVMAT
|
2015-07-15 21:35:30 +02:00 |
|
Joko
|
9aa0285064
|
Revert LoD Changes
|
2015-07-15 21:13:05 +02:00 |
|
Joko
|
fd4d4abb73
|
Move UAV Battery form models to data
change LoD Distance
Fix IVBag names(my issue)
|
2015-07-15 20:51:06 +02:00 |
|
Joko
|
a72312738e
|
Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
|
2015-07-15 20:34:35 +02:00 |
|
SilentSpike
|
7f04164653
|
Handling the spectatable unit list
|
2015-07-15 14:58:38 +01:00 |
|
SilentSpike
|
147571c76f
|
Better method of updating camera view
|
2015-07-15 14:58:08 +01:00 |
|
SilentSpike
|
784865d634
|
Clear workspace
|
2015-07-15 13:50:10 +01:00 |
|
SilentSpike
|
5dc4dbeb88
|
Handle camera attributes
|
2015-07-15 12:34:44 +01:00 |
|