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
2,063 Commits 73 Branches 88 Tags 752 MiB
05228b147d
Commit Graph

2063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glowbal
bc082783c9 check if unit is in a vehicle before checking the vehicle 2015-03-21 10:55:27 +01:00
Glowbal
b5c6e52416 fixed #201 2015-03-21 10:54:52 +01:00
Nicolás Badano
e7d7fa8e6c Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 00:27:41 -03:00
Nicolás Badano
14566c783b Prevent canInteractWith from throwing errors if third parameter is not supplied 2015-03-21 00:27:19 -03:00
Nicolás Badano
4210b175c3 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu 
Conflicts:
	addons/interact_menu/functions/fnc_compileMenu.sqf
	addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
 2015-03-21 00:16:52 -03:00
Nicolás Badano
2d6fb7e148 Merge branch 'dynamicInteractMenu' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu 2015-03-20 22:45:51 -03:00
Nicolás Badano
3d6660b115 Debug stuff 2015-03-20 22:44:36 -03:00
Nicolás Badano
b3aa7c8970 Make collectActiveActionTree follow mounts correctly 2015-03-20 22:44:25 -03:00
KoffeinFlummi
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
PabstMirror
7e383dc10e #198 canInteractWith EGVAR -> EFUNC 2015-03-20 17:55:39 -05:00
KoffeinFlummi
6f8b5cc676 Fix missing dollar sign 2015-03-20 23:53:25 +01:00
KoffeinFlummi
fea63e597e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-basic 2015-03-20 23:48:42 +01:00
PabstMirror
8840284309 Fix progressBar 2015-03-20 17:46:21 -05:00
commy2
955506dbe8 stuff in to merge folder 2015-03-20 19:56:39 +01:00
PabstMirror
a146be57f2 Modifyed build tool for pboProject problems 
Should work on last release of mikero's tools
(because that version of rapify struggles with some CBA macros)
Runs config.cpp though cfgConvert twice to "demacro" config.cpp
Then restores backup when finished
 2015-03-20 13:04:54 -05:00
KoffeinFlummi
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7 Replace Original with English keys in stringtable 2015-03-20 17:54:26 +01:00
KoffeinFlummi
66078a047b Wut. 2015-03-20 07:52:41 +01:00
Nicolás Badano
3e69123454 Make collectActiveActionTree follow mounts correctly 2015-03-20 00:55:13 -03:00
Nicolás Badano
66731c9cdd First rough implementation of the passengers menu, with mounted main actions 2015-03-20 00:53:58 -03:00
Nicolás Badano
b854db0195 Updated interact_menu api calls on ace_dragging 2015-03-19 23:33:11 -03:00
Nicolás Badano
84bf44e026 Refactoring of interact_menu: 
- Reordering of action members
- Removed full path from actions, so they can be mounted under different paths if needed
- Added api for creating actions
- Api for adding actions for objects or classes
 2015-03-19 23:32:44 -03:00
PabstMirror
ad12904ca4 minor formating 2015-03-19 20:37:36 -05:00
PabstMirror
0c88b92eba Condense AI func, and drop attachements 2015-03-19 20:24:14 -05:00
PabstMirror
6e03bb6144 Merge branch 'master' into disposableCleanup 2015-03-19 19:37:10 -05:00
KoffeinFlummi
07570fccd4 Make isMedic even prettier 2015-03-19 22:34:12 +01:00
KoffeinFlummi
5589b80c70 Rewrite and fix isMedic 2015-03-19 22:27:12 +01:00
KoffeinFlummi
97082e4ce3 Simplify condition checking in canTreat. 2015-03-19 22:01:40 +01:00
KoffeinFlummi
69e0ebf107 Add injury texts 2015-03-19 21:31:56 +01:00
KoffeinFlummi
102d86d7d1 Merge remote-tracking branch 'origin/master' into medical-basic 2015-03-19 21:30:27 +01:00
Glowbal
3dda70a4af fixed variable name 2015-03-19 21:14:42 +01:00
Nicolás Badano
49cdf6512e Merge branch 'master' into dynamicInteractMenu 2015-03-19 15:09:31 -03:00
Nicolás Badano
b89e573005 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-19 15:08:53 -03:00
Nicolás Badano
b7c73f705c Interact menu usability improvements: 
- Submenu scale as a function of the number of children
- Added menu expansion animation to better communicate where the options come from
- Unused action point are faded as soon as the user hovers a certain action point
 2015-03-19 15:08:36 -03:00
Nicolás Badano
a3b913ad8b Interact menu usability improvements: 
- Submenu scale as a function of the number of children
- Added menu expansion animation to better communicate where the options come from
- Unused action point are faded as soon as the user hovers a certain action point
 2015-03-19 15:04:48 -03:00
Nicolás Badano
f96126153c Reenable hiding useless actions 2015-03-19 14:45:05 -03:00
Nicolás Badano
386fee4694 Replace place list menu by dynamically created actions 2015-03-19 13:31:45 -03:00
Nicolás Badano
acd3ca0d56 Interact menu: 
- Allow dynamically adding children actions just-in-time
- Added optional custom parameters for actions
 2015-03-19 13:00:10 -03:00
bux578
fed840a4f9 Update README.md 2015-03-19 13:09:56 +01:00
PabstMirror
81836d1bc1 semiColon 2015-03-19 03:10:33 -05:00
commy2
43defaee06 get compatible missiles fnc 2015-03-18 21:33:00 +01:00
PabstMirror
e57f007288 Match Ace_map's style 2015-03-18 14:39:04 -05:00
commy2
40eed0e12f reload event, some basic functions 2015-03-18 20:17:53 +01:00
PabstMirror
cd6a567ba3 Fix Icon 2015-03-18 13:50:27 -05:00
PabstMirror
7688384971 Merge branch 'master' into microDAGR 2015-03-18 13:46:57 -05:00
PabstMirror
396359ba67 Self Actions To Open (under equipment) 2015-03-18 13:46:39 -05:00
commy2
0be1959934 add reloadable launcher 2015-03-18 18:25:53 +01:00