Commit Graph

10830 Commits

Author SHA1 Message Date
ulteq
6a60770470 Minor corrections in the ballistics module
* Corrected AKS-U barrel length
* Corrected .338 250gr BC
* Corrected .338 API526 BC and muzzle velocity
* Slightly reduced 5.8x42mm muzzle velocity
2016-11-02 13:54:22 +01:00
jonpas
b5c967e504 Merge pull request #4622 from acemod/fixReleaseInfoWiki
Fix make.py documentation lists
2016-11-01 16:39:17 +01:00
jonpas
9e37dc1192 Fix make.py wiki lists 2016-11-01 13:50:00 +01:00
PabstMirror
e60df02758 Update CBA macros in tools (#4620) 2016-10-31 15:11:45 -05:00
ulteq
b91c4acca8 Merge pull request #4613 from acemod/realisticnames-apex-update
Adds realistic names for the QBZ-95 camo variants
2016-10-31 19:58:46 +01:00
ulteq
22ce12ec57 Merge pull request #4609 from acemod/kestrel4500-typo-fix
Fix Kestrel4500 wind speed calculation
2016-10-31 12:57:24 +01:00
ulteq
2e94c40a46 Merge pull request #4616 from acemod/apex-weapon-ballistics
Updates the ballistics module to support Apex
2016-10-31 12:57:02 +01:00
PabstMirror
ace24d0282 Fix ubc 2016-10-30 18:46:55 -05:00
PabstMirror
9f56ba50c1 Add semi-colon 2016-10-30 18:43:43 -05:00
jonpas
2222834c43 Allow checking dogtags inside vehicles and when sitting (#4619)
* Allow checking dogtag inside and when sitting

* Remove redundant format
2016-10-30 18:54:54 +01:00
commy2
18e5fa2849 remove scrollbars from javelin scope (#4618) 2016-10-30 14:46:31 +01:00
Rebel
e84cdef817 Blocks AI getting back into the vehicle on cookoff (#4587)
* no message

* Header.

* Typo.

* Less code.

* New getPos syntax.

* leaveVehicle seems to work.

* Removed the second waypoint.

* Clear previous waypoints.

* Run away waypoint before others.

* Use arr select code

* Revert select. Use doMove.
2016-10-30 13:33:28 +01:00
ulteq
c3f967e365 Updates the ATragMX gun list 2016-10-30 12:26:15 +01:00
ulteq
14af5577c6 Updates the ballistics module to support Apex
* Made the new ammo types ready for advanced ballistics
* Made the new weapons ready for advanced ballistics
* Recalculated all initSpeed coefficients
* Updated the airFrictionAnalysis report
2016-10-30 09:02:55 +01:00
ulteq
0e364b0d48 Adds realistic names for the QBZ-95 camo variants
Green Hex and Hex variants of:
* QBZ-95-1
* QBZ-95-1 GL
* QBZ-95-1 LSW
2016-10-29 13:49:24 +02:00
PabstMirror
6a7998d47d WebDoc Version to 3.8.1 (#4611)
Close #4610
2016-10-29 08:28:24 +02:00
ulteq
7b2d736ba3 Fix Kestrel4500 wind speed calculation
* Cosine was applied twice (on some screens)
2016-10-28 22:25:47 +02:00
PabstMirror
70439aaa9d Fix bleeding hit logic for enabledFor = 1 (#4585)
* Fix bleeding hit logic for enabledFor = 1

* Handle RC

* fix
2016-10-28 22:12:37 +02:00
commy2
eb38290aaf cookoff ammo selections default values (#4604)
* cookoff ammo selections default values

* Add missing subTurret cache for Wheeled APCs
2016-10-28 22:10:40 +02:00
PabstMirror
2df4a28145 Remove repair locization warning (#4607) 2016-10-28 12:16:23 -05:00
BaerMitUmlaut
60d98df5fc Fix makeJerryCan locality issues (#4600) 2016-10-27 22:19:55 +02:00
PabstMirror
aeb0614e7e Cleanup map gesture sync / color mapping (#4486)
* Cleanup map gesture sync / color mapping

- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping

* fix return
2016-10-27 19:54:58 +02:00
ace3mod
d44770a27e [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-10-27 19:35:23 +02:00
Ozan Eğitmen
fd1888be36 Add 'uniforms' Component (#4435) 2016-10-27 19:34:25 +02:00
Ozan Eğitmen
49b5a0ea86 Cleanup Frag Component (#4581)
* Cleanup frag component

* Optimize fnc_addTrack

* Add additional cleanup

* Please work?

* Add more cleanup

* Fix script errors

* Fix/optimize spalling

* Add missing changes
2016-10-27 00:16:31 +02:00
Glowbal
a13441fa85 Merge branch 'release'
Conflicts:
	addons/main/script_version.hpp
2016-10-25 20:33:25 +02:00
Glowbal
e1aa5b4292 Increment build 2016-10-25 20:27:34 +02:00
Glowbal
36085ebd9c Prep 3.8.1 release 2016-10-25 20:20:26 +02:00
Glowbal
27eb30bdd8 Prep 3.8.1 2016-10-25 20:16:16 +02:00
Glowbal
d2f485329f Update make.py to 0.8 (#4579) 2016-10-25 20:11:57 +02:00
jonpas
ffd1f0aff2 Update make.py to 0.8 (#4579)
* Update make.py to 0.8

* Remove redundant extras folder obsolete handling

* Fix version updating in files when version changes number of digits

* Satisfy bux
2016-10-25 20:11:05 +02:00
Rory
07068260fe Wiki update (#4589)
* Wiki update
- Updated class-names.md entries for chemlights, incendiary grenade and spraypaint.
Added chemlights feature with usage info.
Added spraypaint feature with usage info.

* correct version of spray paint in class-names.md

* Correction
removed spraypaint.md since tagging.md was already present
updated chemlights with removal of 1.1 (adding throw possibilities)

* Reworked chemlights.md
removed usage => already referred to advanced grenades
Changed description

* removed tagging addition from class-names.md

* added |
2016-10-24 08:45:21 +02:00
PabstMirror
eeb482eb7e #4557 - Fix warning about bad func type (#4582) 2016-10-22 10:57:49 +02:00
PabstMirror
fc15ab9cf0 #4557 - Fix warning about bad func type (#4582) 2016-10-22 10:56:26 +02:00
PabstMirror
23568609a6 Faster, non movment blocking gesture for tap shoulder (#4578)
Close #4577
2016-10-20 23:44:34 +02:00
Glowbal
1390b845d4 Prep 3.8.1 patch 2016-10-20 19:45:40 +02:00
PabstMirror
89d6fefff1 Sanatize damage value used for blood creation (#4574)
Fix #4571
2016-10-20 19:44:16 +02:00
PabstMirror
f2746891af Sanatize damage value used for blood creation (#4574)
Fix #4571
2016-10-20 19:43:52 +02:00
PabstMirror
e5c59b56fb Update wiki version to 3.8 (#4570) 2016-10-19 15:52:46 -05:00
Glowbal
bf5892aa2a Merged branch release into master 2016-10-18 22:59:44 +02:00
Glowbal
d5160b436f Fix build tools not working with two digit build numbers 2016-10-18 22:15:49 +02:00
Glowbal
b150f440e6 Prep 3.8.0 Release 2016-10-18 21:57:40 +02:00
Glowbal
d867805406 Prepare v3.8.0 RC3 2016-10-18 20:25:45 +02:00
jonpas
5922aad91c Fix 3rd party air and sea vehicle fuel capacity (#4554)
* Fix fuel capacity for air vehicles

* Sea vehicles as well, minor empty classes cleanup
2016-10-18 20:21:28 +02:00
jonpas
877944ddce Fix 3rd party air and sea vehicle fuel capacity (#4554)
* Fix fuel capacity for air vehicles

* Sea vehicles as well, minor empty classes cleanup
2016-10-18 20:21:27 +02:00
classicarma
19fe4016e5 Japanese translations (#4553) 2016-10-18 20:19:29 +02:00
classicarma
d33219b9ba Japanese translations (#4553) 2016-10-18 20:19:27 +02:00
PabstMirror
5ae8145234 Don't show dogtag ID in action menu (#4558)
#4476
2016-10-17 10:55:42 +02:00
bux578
846b7f26f7 Dockerfile (#4550)
* add init dockerfile

* add dockerfile documentation

* gitignore gemfile.lock

* improve Dockerfile

* add docker-compose file

* change readme to use docker-compose

* improve readme

* Fix readme - Debian != Windows

* Small wording improvement

* copy contents into dockerfile

To be able to run it without a volume (but with `docker-compose up` who
would do that :) )
2016-10-16 10:48:14 +02:00
Glowbal
d9a199b942 Increment build number 2016-10-15 11:44:43 +02:00