Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master #1

Open
wants to merge 350 commits into
base: master
Choose a base branch
from
Open

Master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
350 commits
Select commit Hold shift + click to select a range
63bd500
New update for Arma 3
Itsyuka Jul 14, 2014
f1598fe
Update fn_virt_buy.sqf
ohhnice Jul 14, 2014
d783fc6
Merge pull request #124 from ohhnice/patch-2
Jul 14, 2014
b8ff48b
Merge pull request #121 from Itsyuka/patch-11
Jul 14, 2014
9efd5e6
Stops the negative $$$ issue
midgetgrimm Jul 15, 2014
5113059
Merge pull request #126 from midgetgrimm/patch-6
Jul 15, 2014
1a681e6
Oh look... 33 file changes...
Jul 20, 2014
495477b
Revert "Oh look... 33 file changes..."
Jul 20, 2014
9231f97
Ugh fixes....
Jul 20, 2014
afaae50
Screw you git..
Jul 20, 2014
6608fda
Mah Fingers D:
Itsyuka Jul 22, 2014
749ca58
Dun goofed
Itsyuka Jul 22, 2014
3a85525
Hide some things while I'm at it
Itsyuka Jul 22, 2014
d983ccd
Missed a line or 2
Itsyuka Jul 22, 2014
fe6f819
Merge pull request #142 from Itsyuka/master
Jul 23, 2014
37a3d56
Hmm
Jul 23, 2014
5066d6d
Update fn_updateGang.sqf
erbsensuppe Jul 23, 2014
7dd11e9
Update fn_updateGang.sqf
erbsensuppe Jul 23, 2014
b60b3d2
Close the Gangmenu when the gang was disbanded
erbsensuppe Jul 23, 2014
2d944bd
house sell fix
erbsensuppe Jul 23, 2014
5918ba2
Some fixes and stuff
Itsyuka Jul 23, 2014
853f225
Lets add English too
Itsyuka Jul 23, 2014
c9a99eb
Why you no remove
Itsyuka Jul 23, 2014
b1a7192
Merge pull request #153 from Itsyuka/master
Jul 23, 2014
e69e027
Update stringtable.xml
paulribbecktk Jul 23, 2014
0613504
forgot
paulribbecktk Jul 23, 2014
a4d3dec
Merge pull request #1 from FIB-BAROD/master
Itsyuka Jul 23, 2014
a31dffb
Update client.fsm
ColinM9991 Jul 23, 2014
f658eb1
Merge pull request #2 from ColinM9991/patch-8
Itsyuka Jul 23, 2014
12de774
Update stringtable.xml
ColinM9991 Jul 23, 2014
2bc9d0a
Query Bloop
Jul 23, 2014
7277f86
Merge pull request #3 from ColinM9991/patch-9
Itsyuka Jul 23, 2014
d9b2998
dammit
paulribbecktk Jul 23, 2014
77ac706
Merge pull request #4 from FIB-BAROD/master
Itsyuka Jul 23, 2014
b6199ce
Fixes
Itsyuka Jul 24, 2014
b919af4
Update stringtable.xml
paulribbecktk Jul 24, 2014
47e0907
Update stringtable.xml
paulribbecktk Jul 24, 2014
4906c72
Update stringtable.xml
paulribbecktk Jul 24, 2014
71b5441
Update stringtable.xml
paulribbecktk Jul 24, 2014
9f1f99d
Update stringtable.xml
paulribbecktk Jul 24, 2014
df4d84f
Merge pull request #5 from FIB-BAROD/master
Itsyuka Jul 24, 2014
eaef9e3
Update fn_sellHouse.sqf
Jul 24, 2014
0e198f7
Merge pull request #154 from Itsyuka/master
Jul 24, 2014
26548d3
Merge pull request #151 from erbsensuppe/patch-4
Jul 24, 2014
cbfd309
Merge pull request #156 from Kekie0/master
Jul 24, 2014
ea96056
Merge pull request #149 from erbsensuppe/patch-3
Jul 24, 2014
c31bc29
Merge pull request #147 from erbsensuppe/patch-1
Jul 24, 2014
98ee8ed
Merge pull request #148 from erbsensuppe/patch-2
Jul 24, 2014
69157f5
Update stringtable.xml
paulribbecktk Jul 24, 2014
6c9676c
Merge pull request #1 from FIB-BAROD/patch-1
Itsyuka Jul 24, 2014
6677186
More Strings, GG
Itsyuka Jul 24, 2014
3d557d5
More fixes >.>
Itsyuka Jul 24, 2014
9d47033
More and more
Itsyuka Jul 24, 2014
e0f8722
Update French stringtable.xml
Eldayia Jul 24, 2014
8c2cb3d
Merge pull request #4 from Eldayia/patch-1
Itsyuka Jul 24, 2014
0cf9996
More fixes
Itsyuka Jul 24, 2014
9b3a0a8
Merge pull request #159 from Itsyuka/master
Jul 24, 2014
18b00f2
Update stringtable.xml
paulribbecktk Jul 24, 2014
2ca8b38
Update stringtable.xml
paulribbecktk Jul 24, 2014
fad6b18
Again, fixes
Itsyuka Jul 24, 2014
5a53e98
Merge pull request #5 from FIB-BAROD/master
Itsyuka Jul 24, 2014
88442e0
second Gang Disband fix
erbsensuppe Jul 24, 2014
bb17148
OMG Happy now?
Itsyuka Jul 25, 2014
0ef2a9f
Minor Mistake
Itsyuka Jul 25, 2014
f6c4316
And again
Itsyuka Jul 25, 2014
c162e82
French Translation stringtables.xml
Eldayia Jul 25, 2014
77ce215
Update stringtable.xml
Eldayia Jul 25, 2014
961fa52
Merge pull request #7 from Eldayia/patch-2
Itsyuka Jul 25, 2014
45e1363
Small fail on merge :)
Eldayia Jul 25, 2014
dfe8062
Merge pull request #8 from Eldayia/patch-3
Itsyuka Jul 25, 2014
9b76da9
Removed Bank Insurance
Itsyuka Jul 25, 2014
399b756
Update stringtable.xml
paulribbecktk Jul 26, 2014
b113041
Merge pull request #9 from FIB-BAROD/patch-4
Itsyuka Jul 26, 2014
570be2f
Merge pull request #161 from Itsyuka/master
Itsyuka Jul 26, 2014
4404b35
Linux Fix
Itsyuka Jul 26, 2014
1b7c2c5
Update stringtable.xml
paulribbecktk Jul 26, 2014
6f4c6df
Merge pull request #13 from FIB-BAROD/patch-5
Itsyuka Jul 26, 2014
4200629
Merge pull request #168 from Itsyuka/master
Itsyuka Jul 26, 2014
9de1a52
Italian Translation by Pojus
Itsyuka Jul 26, 2014
b1a0450
Update stringtable.xml
paulribbecktk Jul 27, 2014
fed1d7c
Merge pull request #170 from FIB-BAROD/master
Itsyuka Jul 27, 2014
d495171
Spyglass broke?
Itsyuka Jul 27, 2014
fa19e6f
uhh look
paulribbecktk Jul 27, 2014
a8c0523
Merge pull request #173 from FIB-BAROD/patch-1
Itsyuka Jul 27, 2014
b0536f1
Adding Portuguese (pt-br) to stringtable.xml
iamjabour Jul 27, 2014
910fc0c
Merge pull request #175 from iamjabour/master
Itsyuka Jul 27, 2014
b9ef578
Update stringtable.xml
danielstuart14 Jul 27, 2014
8b88b57
Merge pull request #177 from danielstuart14/patch-1
Itsyuka Jul 28, 2014
2bc5247
Update stringtable.xml
danielstuart14 Jul 28, 2014
1beef13
Merge pull request #179 from danielstuart14/patch-2
Itsyuka Jul 28, 2014
2054745
Disable repairing when vehicle is blown up
Itsyuka Jul 28, 2014
125b8db
Fixed Heroin Processing for Gang Hideout 3
Itsyuka Jul 28, 2014
73dd05c
Update fn_gangDeposit.sqf
ehno Jul 28, 2014
064d8bc
Update fn_bankDeposit.sqf
ehno Jul 28, 2014
6c040cb
Merge pull request #182 from ehno/patch-3
Itsyuka Jul 28, 2014
c7d6bf1
Merge pull request #181 from ehno/patch-2
Itsyuka Jul 28, 2014
4ecba44
Update Stringtable.xml (PT-BR Fixes)
danielstuart14 Jul 28, 2014
d5d8be7
Merge pull request #183 from danielstuart14/patch-3
Itsyuka Jul 28, 2014
e051c1f
Updated stringtable.xml with proper German translations
Jul 28, 2014
db61104
Added localisation to fn_useItem.sqf
Jul 28, 2014
94953fc
Added localisation to fn_setupActions.sqf
Jul 28, 2014
4a6f407
Merge pull request #184 from MorpheusXAUT/master
Itsyuka Jul 28, 2014
b39942d
Fixed two typos introduced to German translation in #184 (thanks to A…
Jul 28, 2014
77bf9c5
Merge pull request #186 from MorpheusXAUT/master
Itsyuka Jul 28, 2014
d659788
Update Stringtable.xml (PT-BR)
danielstuart14 Jul 28, 2014
abeb5a7
Merge pull request #188 from danielstuart14/patch-5
Itsyuka Jul 29, 2014
260e4f1
Fixed missing "<" in stringtable.xml for German translation
Jul 29, 2014
93b8874
Added additional localisation to fn_searchVehAction.sqf
Jul 29, 2014
5b77a1e
Added additional localisation to fn_searchAction.sqf
Jul 29, 2014
8878144
Added additional localisation to fn_repairTruck.sqf
Jul 29, 2014
6917b8f
Merge pull request #192 from MorpheusXAUT/master
Itsyuka Jul 29, 2014
3f358e2
look O.o
paulribbecktk Jul 30, 2014
331ea03
Merge pull request #198 from FIB-BAROD/patch-1
Itsyuka Jul 31, 2014
75ba2e2
Clothing UI fixes
Itsyuka Aug 2, 2014
7e74ff6
Merge pull request #163 from erbsensuppe/patch-1
Itsyuka Aug 2, 2014
9bad75b
Updated gathering (yay for 1 file)
Itsyuka Aug 2, 2014
bf79b29
Merge branch 'master' of https://github.com/TAWTonic/Altis-Life
Itsyuka Aug 2, 2014
5c7cefc
I was not here...
Aug 2, 2014
34a5fc5
Update fn_gather.sqf
ehno Aug 2, 2014
12d969a
Merge pull request #204 from ehno/patch-5
Itsyuka Aug 2, 2014
6911956
Yay mistakes
Itsyuka Aug 2, 2014
f4e86a7
Update fn_asyncCall.sqf
Torndeco Aug 8, 2014
792cffc
Merge pull request #212 from Torndeco/patch-1
Itsyuka Aug 8, 2014
c4701a4
Some fixes
Itsyuka Aug 8, 2014
2ada9c4
Merge branch 'master' of https://github.com/TAWTonic/Altis-Life
Itsyuka Aug 8, 2014
e4031b3
3.1.4.5 Update
Itsyuka Aug 8, 2014
2a89578
Spyglass patches
Itsyuka Aug 9, 2014
3c4d74d
Eh, spyglass
Itsyuka Aug 9, 2014
48289ca
Fuuu Spyglass
Itsyuka Aug 9, 2014
f68dc14
Bug fix for loading Y-Items
Itsyuka Aug 10, 2014
6e3c9da
Oh look, mistakes, I should really sleep
Itsyuka Aug 11, 2014
68cc16b
Maybe lets actually reset it back
Itsyuka Aug 11, 2014
a4ec3a9
No-Recoil Hack Check Fix
Itsyuka Aug 18, 2014
e206abb
peaches_4 doesn't exist in mission.sqm
midgetgrimm Aug 18, 2014
e3e7ae5
Merge pull request #226 from midgetgrimm/patch-8
Itsyuka Aug 18, 2014
56436e3
Bohemia for development studio of the year.
Aug 20, 2014
dc4f77f
Out with arma2net build and more changes.
Aug 20, 2014
e108329
blah
Aug 20, 2014
8ba4717
Tidbit of info
Itsyuka Aug 21, 2014
4ff8a3c
extDB startup changes if mission is reloaded
Torndeco Aug 23, 2014
d203bf4
Merge pull request #229 from Torndeco/patch-1
Itsyuka Aug 24, 2014
7d047a9
SpyGlass Variable Updates
Itsyuka Aug 26, 2014
a1ea62f
SpyGlass Variable Updates #2
Itsyuka Aug 26, 2014
1abb9f1
3.1.4.6 - Network Optimizations and other things
Aug 27, 2014
30b76d3
Part 2 for 3.1.4.6
Itsyuka Aug 27, 2014
dd21060
3.1.4.6 minor fixes/additions
Itsyuka Aug 27, 2014
aa89a13
3.1.4.6/2 - Fixed server functions for clients
Itsyuka Aug 27, 2014
8912661
Update functions.sqf
ehno Aug 27, 2014
dfce85b
Merge pull request #235 from ehno/patch-7
Itsyuka Aug 27, 2014
28ce50e
3.1.4.6 - Changed Medic Loadout
Itsyuka Aug 27, 2014
3199bf6
3.14.6 - Changed Medic Loadout #2
Itsyuka Aug 27, 2014
da31266
3.1.4.6 - Updated some information
Itsyuka Aug 29, 2014
aec9f14
SpyGlass Update: Script Executor Block
Itsyuka Aug 30, 2014
f75a4c0
Change: actionKeyHandler and scripts.txt
Itsyuka Aug 30, 2014
46dc3d4
Oops, I'm tired
Itsyuka Aug 30, 2014
e6e504b
I tested it 100%, I swear I am not BI
Itsyuka Aug 30, 2014
750fc72
Fixed: fn_gather.sqf
Itsyuka Aug 31, 2014
23cb84e
Not removed from wanted unless paid cash
midgetgrimm Sep 4, 2014
8fa1bca
Merge pull request #249 from midgetgrimm/patch-11
Itsyuka Sep 5, 2014
3f3fe01
3.1.4.7 Update
Itsyuka Sep 5, 2014
ccff0f4
Merge branch 'master' of https://github.com/TAWTonic/Altis-Life
Itsyuka Sep 5, 2014
eb7d802
More info!
Itsyuka Sep 5, 2014
aae1c87
Mistakes were made, more info
Itsyuka Sep 5, 2014
4014bdf
Forgot version number in description
Itsyuka Sep 5, 2014
ddefc93
Extra extDB checks
Torndeco Sep 7, 2014
b8b2e98
Merge pull request #255 from Torndeco/patch-1
Itsyuka Sep 7, 2014
678e66c
Nothing special.
Sep 7, 2014
f068119
Merge branch 'master' of https://github.com/TAWTonic/Altis-Life
Sep 7, 2014
2c5dda8
Update or die
Sep 9, 2014
bbe94a4
Die or update
Itsyuka Sep 9, 2014
faf6018
Fixed fn_wantedAdd
Itsyuka Sep 9, 2014
c9042d0
Fixed fn_wantedAdd again
Itsyuka Sep 9, 2014
6347d5f
Mistakes were made
Itsyuka Sep 9, 2014
e4acac3
SpyGlass Updated and wantedList fixed?
Itsyuka Sep 10, 2014
72723f0
Some fixes, possible 3.1.4.8 for release
Itsyuka Sep 12, 2014
789a2a7
Forgot to say this is a dev build
Itsyuka Sep 12, 2014
11b17aa
Update fn_clientDisconnect.sqf
ColinM9991 Sep 12, 2014
8aa92c2
Merge pull request #269 from ColinM9991/patch-1
Itsyuka Sep 12, 2014
0c54dcb
Fix for car not being sold at garage
Itsyuka Sep 12, 2014
82af01a
Vehicle Spawn Part 1 of 3
ColinM9991 Sep 12, 2014
222e589
Update fn_spawnVehicle.sqf
ColinM9991 Sep 12, 2014
edc39a9
Vehicle Spawn Part 3 of 3
ColinM9991 Sep 12, 2014
a32837b
Merge pull request #272 from ColinM9991/patch-2
Itsyuka Sep 12, 2014
8015f1a
Merge pull request #273 from ColinM9991/patch-3
Itsyuka Sep 12, 2014
7d1eb24
Merge pull request #274 from ColinM9991/patch-4
Itsyuka Sep 12, 2014
ff6a556
RC Build, should be at least 90% decent
Itsyuka Sep 12, 2014
6df6c65
Merge pull request #275 from TAWTonic/development
Itsyuka Sep 12, 2014
4644380
Revert for something I totally forgot to test
Itsyuka Sep 13, 2014
4cfdad5
Colin4developeroftheyear
Itsyuka Sep 13, 2014
005c13b
Revert "Colin4developeroftheyear"
Itsyuka Sep 13, 2014
a2dca7f
Revert "Vehicle Spawn Part 3 of 3"
Itsyuka Sep 13, 2014
bd783b7
Revert "Update fn_spawnVehicle.sqf"
Itsyuka Sep 13, 2014
fd5d579
Revert "Vehicle Spawn Part 1 of 3"
Itsyuka Sep 13, 2014
ca04338
syntax error
Sep 13, 2014
a88224c
Fix for Format String Max Length 8191
Torndeco Sep 14, 2014
9362426
New hack, new menu
Itsyuka Sep 14, 2014
e7c3656
Merge pull request #282 from zanven42/patch-2
Itsyuka Sep 14, 2014
3b1821a
Merge pull request #283 from Torndeco/patch-2
Itsyuka Sep 14, 2014
8866771
Update arma3life-3.1.4.8.sql
manzarek123 Sep 14, 2014
2c62249
Merge pull request #284 from manzarek123/patch-1
Itsyuka Sep 14, 2014
fc3d84e
Spyglass patch yet again
Itsyuka Sep 14, 2014
c9f3238
Licenses fix
Itsyuka Sep 15, 2014
d1b3655
Fixed speed gathering again
Itsyuka Sep 15, 2014
6637fb4
Fix for extDB Check @ Server Init
Torndeco Sep 15, 2014
122291e
Merge pull request #287 from Torndeco/patch-4
Itsyuka Sep 16, 2014
bef481d
General updates and rollback
Itsyuka Sep 17, 2014
cb418b6
Update init.sqf
Torndeco Sep 17, 2014
ad4361b
Merge pull request #292 from Torndeco/patch-5
Itsyuka Sep 17, 2014
83e9d18
Update init.sqf
Torndeco Sep 17, 2014
ba07764
Merge pull request #295 from Torndeco/patch-7
Itsyuka Sep 18, 2014
0f0bd15
Spyglass: Added code to scan all namespaces for variables.
JonBons Sep 23, 2014
a73f16c
Script.txt update
Itsyuka Sep 29, 2014
c36b397
Stop complaining update
Oct 2, 2014
e8e55fd
Cleaned up timeModule.fsm
WillWaywell Oct 4, 2014
df1f55c
timeModule.fsm - Exit if fastNight is false
WillWaywell Oct 4, 2014
ac4af21
Yuka made me push it.
Oct 13, 2014
2397b05
Some minor updates
Itsyuka Oct 13, 2014
88ca126
Modified fn_menuCheck.sqf
AgentRev Oct 13, 2014
14fe893
Update fn_initSpy.sqf
Oct 14, 2014
45801b0
Merge pull request #311 from snajdan/patch-1
Itsyuka Oct 14, 2014
5c8c68d
Patch 1.32 Fixes and additions
Oct 14, 2014
7bc6e5e
Federal reserve and stuff
Oct 14, 2014
7d37704
Misc fix for a mistake
Oct 19, 2014
0259091
Group Cleanup
Oct 22, 2014
61f92fd
Merge pull request #309 from AgentRev/master
Oct 22, 2014
98fa865
Merge pull request #306 from WillWaywell/master
Oct 22, 2014
4eb7184
BI Breaking stuff
Oct 25, 2014
ba122f3
Update fn_initSpy.sqf
Nov 4, 2014
461ffe3
Shouldn't this be forEach?
ColinM9991 Nov 5, 2014
c7b0134
Merge pull request #326 from snajdan/patch-1
Itsyuka Nov 5, 2014
742bb50
Merge pull request #328 from ColinM9991/patch-5
Itsyuka Nov 5, 2014
3be54b8
Stringtablessdasdfasgegdvsdgffg
Dec 14, 2014
f9e0a59
Newer entries needing localized
Dec 15, 2014
7fb383b
Opps, the correct stringtable
Dec 15, 2014
141e9e4
german translation
Dec 16, 2014
806aa77
Merge pull request #346 from schchr/patch5
Dec 16, 2014
27d1f6f
SpyGlass Update
Dec 18, 2014
cc67ddb
Typo in displays
Dec 18, 2014
9474df6
ERR! A magical , was missing.
Dec 18, 2014
451326c
Fixed stringtable & small-macro introduction
Dec 18, 2014
a35a3b8
French and Italian translations added
Dec 18, 2014
f8ee8f1
Here's a undetected display guys! nope not anymore.
Dec 22, 2014
f2dc3d3
Woops, unwanted change from local testing.
Dec 22, 2014
34768d9
Update fn_MPexec.sqf
Torndeco Jan 8, 2015
da00868
Update fn_clientDisconnect.sqf
ColinM9991 Jan 9, 2015
1dae765
Merge pull request #356 from Torndeco/patch-1
Itsyuka Jan 9, 2015
b7fa6ae
Merge pull request #357 from ColinM9991/patch-6
Itsyuka Jan 9, 2015
4e10084
Spyglass update
Itsyuka Jan 21, 2015
25c142f
Forgot 1 update
Itsyuka Jan 21, 2015
7c91719
-CheatTaser
Ragebone Feb 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 0 additions & 20 deletions Altis_Life.Altis/core/actions/fn_chemlightUse.sqf
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions Altis_Life.Altis/core/actions/fn_dropFishingNet.sqf
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions Altis_Life.Altis/core/actions/fn_gatherApples.sqf
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions Altis_Life.Altis/core/actions/fn_gatherCannabis.sqf
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions Altis_Life.Altis/core/actions/fn_gatherCocaine.sqf
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions Altis_Life.Altis/core/actions/fn_gatherHeroin.sqf
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions Altis_Life.Altis/core/actions/fn_gatherOil.sqf
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions Altis_Life.Altis/core/actions/fn_gatherPeaches.sqf
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions Altis_Life.Altis/core/actions/fn_heal.sqf
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions Altis_Life.Altis/core/actions/fn_healHospital.sqf
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions Altis_Life.Altis/core/actions/fn_robBankAction.sqf
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions Altis_Life.Altis/core/actions/fn_robFederal.sqf
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions Altis_Life.Altis/core/actions/fn_sellOil.sqf
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions Altis_Life.Altis/core/actions/fn_sellTurtle.sqf
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions Altis_Life.Altis/core/actions/fn_serviceTruck.sqf
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Altis_Life.Altis/core/actions/fn_suicideBomb.sqf
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions Altis_Life.Altis/core/admin/macro.h
View file
Open in desktop

This file was deleted.

Loading