Commit Graph

10915 Commits

Author SHA1 Message Date
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
BaerMitUmlaut
945adf8fef Fix makeJerryCan locality issues (#4600) 2016-10-27 22:19:51 +02:00
PabstMirror
8c700cfd17 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:55:08 +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
Ozan Eğitmen
029b68526f 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:28 +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
Glowbal
8afb3c7279 Update CBA required version 2016-10-15 11:44:26 +02:00
PabstMirror
6fce923783 Fix mortar changes for laser shootRay changes
Ref #4478
2016-10-15 11:42:09 +02:00
PabstMirror
fe35e64696 Reset animation speed when not swimming (#4546) 2016-10-15 11:41:03 +02:00
bux578
1f0f9f7ee1 Merge pull request #4549 from acemod/fix-jekyll-doc
fix spelling of ruby
2016-10-14 10:13:50 +02:00
bux578
99d910d6c9 fix spelling of ruby 2016-10-14 07:55:46 +02:00
bux578
4d31c8f148 add missing line in medical doc (#4545) 2016-10-11 21:42:16 -05:00
Glowbal
84cbd50582 Merged branch master into release 2016-10-11 19:04:14 +02:00
commy2
8822cb1b90 emulate frag grenade ai behaviour for incendiaries (#4534) 2016-10-11 19:04:08 +02:00
jonpas
b8cc10fecb Fix #4523 - fuel nozzle disconnect at maximum hose distance 2016-10-11 18:57:58 +02:00
PabstMirror
5d610cf148 Always create namespace at preInit 2016-10-11 18:57:34 +02:00
commy2
130265fd9f add function to disable dogtags for factions, and disable for civilians 2016-10-11 18:57:34 +02:00
Glowbal
a98013c36e Merge branch 'master' into release 2016-10-11 18:51:05 +02:00
PabstMirror
cd79ebe3ce Bump REQUIRED_VERSION to 1.64 2016-10-11 18:49:31 +02:00
BaerMitUmlaut
2ba0137a1e Fix going unconscious while fastroping (#4531) 2016-10-11 18:48:20 +02:00
commy2
c390b6c1fc increase red laser alpha, close #4535 2016-10-11 18:47:52 +02:00
commy2
4fb5d230ac remove civilian rank icons from nametags (#4538) 2016-10-11 18:44:27 +02:00