Glowbal
51c4b2b895
Fix formatting of script
2015-10-11 15:26:06 +02:00
Glowbal
fe7f8e66f7
Add slack notification for ace3public dev channel
2015-10-11 15:23:22 +02:00
Glowbal
4b827e6b03
Merge pull request #2692 from acemod/deploy-master-only
...
Run the travis deploy on master only
2015-10-11 15:08:21 +02:00
Glowbal
8e9c2754fd
Change translation guide link in translations issue to markdown
...
- Change from @Jonpas
2015-10-11 15:01:31 +02:00
Glowbal
33be10126e
Improve travis yml
...
- Add slack integration
- Change the deploy.py to only run on pushes to the master branch
- Change email notifications to only mail once on failure
2015-10-11 15:01:02 +02:00
Glowbal
1e26fee3ba
Merge pull request #2683 from acemod/commonCleanupX
...
Common cleanup x
2015-10-11 12:15:27 +02:00
Glowbal
a91aad6bf4
Merge pull request #2398 from alganthe/contributing.md
...
contributing.md added
2015-10-11 12:08:33 +02:00
Glowbal
9c9eec4ce0
Merge pull request #2399 from alganthe/readme_update
...
updated readme.md
2015-10-11 12:08:16 +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
BaerMitUmlaut
b65deee3bb
Merge branch 'master' of https://github.com/acemod/ACE3
2015-10-11 02:30:24 +02:00
PabstMirror
60ef413050
Merge pull request #2726 from acemod/makePalletsBig
...
Cargo: Make "Supply Box" pallets heavy
2015-10-10 11:27:42 -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
af8b869c04
Merge pull request #2721 from jonpas/licenseSpellingFix
...
Fix spelling of separate in LICENSE
2015-10-09 13:58:51 -05:00
jonpas
15cba66b9b
Fix spelling of separate in LICENSE
2015-10-09 20:49:23 +02: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
jonpas
36895d2e30
Update more version numbers
2015-10-09 00:23:36 +02:00
jonpas
e5a7516ec1
Non-English as well
2015-10-08 23:54:44 +02:00
jonpas
01a39e7db5
Update badges
2015-10-08 23:53:21 +02:00
Glowbal
265eae14a0
Merge pull request #2713 from jonpas/deployLinkFix
...
Fix link in deploy tool
2015-10-08 23:16:53 +02:00
jonpas
fc7230359f
Remove redundant variables (left-over from deploy wiki to gh-pages)
2015-10-08 21:58:02 +02:00
jonpas
7c101bde87
Change build badge tooltip
2015-10-08 21:01:06 +02:00
jonpas
7efcc3b8d1
Update version and download size
2015-10-08 20:33:20 +02:00
jonpas
4b7f281eba
Fix slacking badge links, Add Travis CI build badge
2015-10-08 20:30:54 +02:00
licht-im-Norden87
8cbd573093
Update README_DE.md
2015-10-08 19:20:17 +02:00
jonpas
7258bc5efc
Fix link in deploy tool
2015-10-08 17:55:54 +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
f98c7dc285
Merge branch 'master' of https://github.com/acemod/ACE3
2015-10-07 14:20:57 +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
Glowbal
825b410ae8
Merge pull request #2684 from acemod/sqfValidatePython3
...
Validate sqf - python 3 compat
2015-10-05 20:33:31 +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
Glowbal
646907f77a
Merge pull request #2562 from gienkov/pl-strings
...
PL medical string
2015-10-05 17:07:36 +02: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
