Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,690 Commits 73 Branches 88 Tags 752 MiB
c89163316c
Commit Graph

9690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glowbal
843eb16837 Merge pull request #2650 from acemod/setDefaultChannel 
Set Default Channel at mission start
 2015-10-18 12:28:13 +02:00
Glowbal
f57eb08ce5 Merge pull request #2620 from jonpas/sittingFramework 
Sitting Framework
 2015-10-18 12:26:53 +02:00
Glowbal
8e4bc264cc Merge branch 'master' into map_gestures 
Conflicts:
	AUTHORS.txt
 2015-10-18 12:20:54 +02:00
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
Joko
1365aebe2a Merge pull request #2748 from acemod/simpleMapLightActions 
Simplify Map Light Interactions
 2015-10-17 23:19:27 +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
bux578
b3032da51c reorder badges, social networks 2015-10-17 11:48:12 +02:00
KoffeinFlummi
38be666b37 Use "flat-square" badge style 2015-10-16 18:34:31 +02: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
SzwedzikPL
98f6bb3589 Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps 
Conflicts:
	addons/cargo/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/interaction/XEH_preInit.sqf
	addons/interaction/stringtable.xml
 2015-10-15 11:49:08 +02:00
PabstMirror
6ffde8150f Simplify Map Light Interactions 2015-10-14 14:36:40 -05:00
PabstMirror
cb65a67a3e Merge pull request #2745 from acemod/fixChairsOverWater 
Use AGL for sitting setPos
 2015-10-14 13:19:54 -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
733c695c41 Merge pull request #2736 from acemod/mapEffectsTrippleHead 
Map effects / flashlights for TrippleHead
 2015-10-14 10:46:38 -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
d091fcbdbc #2706 - Local privates to search_privates.py 2015-10-12 16:14:35 -05:00
Glowbal
1242cc8349 Merge pull request #2737 from acemod/revert-backslash 
Revert the backslash in sqf validator
 2015-10-12 21:31:31 +02:00
Glowbal
3e4906fa7e Revert the backslash in sqf validator 
- Use a forward slash in path for travis to work properly
 2015-10-12 21:29:50 +02: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
acd9cc33d7 Merge pull request #2714 from jonpas/updateReadme 
Update README.md files
 2015-10-11 23:26:33 +02:00
Glowbal
ecafbb0242 Merge pull request #2733 from jonpas/fixSQFvalidatorWithoutPythonArg 
Add shebang line to specify python version to SQF validator
 2015-10-11 23:24:49 +02:00
jonpas
d926a4a52a Add shebang line to specify python version to SQF validator and replace slash with backslash 2015-10-11 23:20:56 +02:00
Glowbal
2856cee261 Merge pull request #2732 from acemod/improve-sqf-validator 
Improve sqf validator
 2015-10-11 20:49:54 +02:00
Glowbal
b524c28d53 Improved output text 
- Capitalized SQF everywhere
- Break checked files and errors into multiple lines
- Add a break by line between reported errors and result
- Fix incorrect report message for semi-columns
- Change excessive usage of # prints on start
 2015-10-11 18:31:39 +02:00
Glowbal
d6ab43d77e Possible fix for travis build failure 2015-10-11 17:35:55 +02:00
Glowbal
afb28d01ea Improve sqf validator 
- fix not all string cases were caught
- add basic semi column validation after code blocks
- Improve print output
- Fix a dot in file path when reporting an error
 2015-10-11 17:25:53 +02:00
Glowbal
dba074ab7d Merge pull request #2731 from acemod/ci-slack-notfications 
Add slack notification for ace3public dev channel
 2015-10-11 15:27:46 +02:00
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