W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-03 18:51:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,770 Commits 20 Branches 18 Tags
a10472270a7caf2c8f5b6a63f85b1baaebc29137
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
HARLAN b9be34f287 Merge pull request #884 from dayz10k/master 
#883 radar/optics on GAZ VODNIKs
 2013-12-09 08:56:34 -08:00
HARLAN 8dc921e7ad #883 radar/optics on GAZ VODNIKs 2013-12-09 11:56:04 -05:00
HARLAN e111199614 Update ROLLING CHANGE LOG 1.0.3.1.txt 2013-12-09 11:30:32 -05:00
HARLAN 67d3886e2d Merge pull request #882 from dayz10k/master 
#879 remind players to remove lock if they want to delete modular door
 2013-12-09 08:27:43 -08:00
HARLAN d853908063 #879 remind players to remove lock if they want to delete modular door 2013-12-09 11:27:05 -05:00
HARLAN ac9bf30172 Merge pull request #881 from dayz10k/master 
#869 area maintenance tweaks
 2013-12-09 07:43:55 -08:00
HARLAN cab3788c57 Area Maintenance 2013-12-09 10:41:02 -05:00
HARLAN ffc4675ae2 area maintenance tweaks 2013-12-09 10:40:19 -05:00
HARLAN 3fd4105ef5 Update ROLLING CHANGE LOG 1.0.3.1.txt 2013-12-06 13:36:18 -05:00
HARLAN 0514c210fc Update ROLLING CHANGE LOG 1.0.3.1.txt 2013-12-06 13:35:03 -05:00
HARLAN c79af3a8da Merge pull request #866 from dayz10k/master 
melee mags for skinchanges, actions after skinchanges
 2013-12-06 08:40:28 -08:00
HARLAN 688422a22e #848 remember melee mags after skinchange 
from dayz CE

https://github.com/dayz10k/DayzMod-Private/blob/4e1239bbdadac7dda5aa6badb7d2c6a7230cd206/SQF/dayz_code/system/player_spawn_2.sqf
 2013-12-06 11:38:29 -05:00
HARLAN 434cea2555 #848 remember melee mags after skinchange 2013-12-06 11:36:04 -05:00
HARLAN a27ce9a5a4 #848 remember melee mags after skinchange 
merged from DayZ CE

https://github.com/dayz10k/DayzMod-Private/blob/4e1239bbdadac7dda5aa6badb7d2c6a7230cd206/SQF/dayz_code/compile/player_switchModel.sqf

tagging chainsaw as Melee so this works
 2013-12-06 11:34:37 -05:00
HARLAN c008ff2832 #848 remember melee mags after skinchange and reveal objects 
pulled from DayZ CE

https://github.com/dayz10k/DayzMod-Private/commit/657688a439fcc375853a3ec91d9ca6138583d5f5#diff-037f2fbb6c571dc6054b7fa36f624fdc

and 

https://github.com/dayz10k/DayzMod-Private/commit/4e1239bbdadac7dda5aa6badb7d2c6a7230cd206#diff-037f2fbb6c571dc6054b7fa36f624fdc
 2013-12-06 11:29:20 -05:00
HARLAN efae6d186a #848 remember melee mags after skinchange 
pulled from DayZ CE
 2013-12-06 11:24:19 -05:00
HARLAN ee326a623f Merge pull request #863 from dayz10k/master 
fix skinbase crafting localization
 2013-12-06 08:10:28 -08:00
HARLAN a7222dd9f5 #860 canvas/bandage stringtable 2013-12-06 11:06:57 -05:00
HARLAN b2e3b3fba5 #860 canvas/bandage stringtable 2013-12-06 11:06:39 -05:00
HARLAN 295a5e114f Merge pull request #840 from dayz10k/master 
#835 adding success message to good upgrade
 2013-12-03 11:20:45 -08:00
HARLAN 17fa72be96 #835 adding success message to good upgrade 2013-12-03 14:19:54 -05:00
HARLAN 7c311d3c33 #835 adding success message to good upgrade 2013-12-03 14:19:40 -05:00
HARLAN 1c10f00f05 Merge pull request #839 from dayz10k/master 
#835 vehicle upgrade wipes cargo
 2013-12-03 11:12:32 -08:00
HARLAN 7287d03539 #835 vehicle upgrade wipes cargo 2013-12-03 14:11:56 -05:00
HARLAN 4a3e3833bc Merge pull request #838 from dayz10k/master 
#837 missing UAZ texture
 2013-12-03 10:32:58 -08:00
HARLAN c3ed3c7085 #837 missing UAZ texture 2013-12-03 13:31:31 -05:00
HARLAN b653f07625 Merge pull request #836 from dayz10k/master 
reduce armor on armored SUV/HMMWV
 2013-12-03 09:49:30 -08:00
HARLAN 31c41189cd reduce armor on armored SUV/HMMWV 2013-12-03 12:39:16 -05:00
HARLAN a8510ec153 reduce armor on armored SUV/HMMWV 2013-12-03 12:38:14 -05:00
HARLAN 0016b4a8d9 Merge pull request #1 from vbawol/master 
update my fork
 2013-12-03 09:21:36 -08:00
HARLAN 0491e7ffa8 Merge pull request #830 from dayz10k/master 
#762 fix round bag fence
 2013-12-02 07:02:58 -08:00
HARLAN 133a26e818 #762 add more fortifications 
fixed round bag
 2013-12-02 10:02:38 -05:00
HARLAN 430716bb98 #808 downgrade doors CharID 2013-11-27 11:52:05 -05:00
HARLAN 270655304f Merge pull request #811 from dayz10k/master 
reset charID on downgrade doors, lower loot at hangars
 2013-11-27 08:47:45 -08:00
HARLAN 0090f7ee58 Merge pull request #810 from Torndeco/patch-2 
Minor Debug Typo
 2013-11-27 08:47:34 -08:00
HARLAN fdcc6b376b #808 downgrading door does not reset CharID 2013-11-27 11:38:16 -05:00
HARLAN 30611114bb #808 downgrade doors CharID 2013-11-27 11:35:22 -05:00
HARLAN 11a9c711ab #806 lower weapon loot on MilitaryIndustrial 2013-11-27 11:19:09 -05:00
HARLAN 8a14a33ff2 Merge pull request #807 from dayz10k/master 
#762
 2013-11-26 22:20:52 -08:00
HARLAN 4e940a21cc #762 2013-11-27 01:20:33 -05:00
HARLAN 6be6e6b546 Merge pull request #805 from dayz10k/master 
#761 owner remove modular
 2013-11-26 21:13:24 -08:00
HARLAN 733f82a028 #761 owner remove modular 2013-11-27 00:12:39 -05:00
HARLAN ff41e022e1 #761 owner remove modular 2013-11-27 00:07:22 -05:00
HARLAN effda8e95b fix kick for 5x HESCO 2013-11-26 23:13:04 -05:00
HARLAN c7fb7e427b Merge pull request #804 from dayz10k/master 
#762 fixing displaynames
 2013-11-26 19:33:52 -08:00
HARLAN a432110587 Update stringtable.xml 2013-11-26 22:32:07 -05:00
HARLAN 155c842b89 fix more craftable stuff #762 2013-11-26 22:27:56 -05:00
HARLAN 9f78dda37d Merge pull request #803 from dayz10k/master 
fix display name of craftables
 2013-11-26 19:22:26 -08:00
HARLAN 5b1c20e06c fix for 5x Hesco 2013-11-26 22:22:11 -05:00
HARLAN 1d69403fb3 Update CfgMagazines.hpp 2013-11-26 22:00:46 -05:00
HARLAN 0d210b3b70 Update CfgMagazines.hpp 2013-11-26 22:00:34 -05:00
HARLAN ce9a5f2f43 Merge pull request #802 from dayz10k/master 
Update stringtable.xml
 2013-11-26 18:55:51 -08:00
HARLAN 3c75449981 Update stringtable.xml 2013-11-26 21:55:35 -05:00
HARLAN 770cfce7af Merge pull request #801 from dayz10k/master 
More spacing, typos, 'missing compile preprocessFileLineNumbers'? on the BIS Effects
 2013-11-26 15:33:10 -08:00
HARLAN ed08c76345 missing compile preprocessFileLineNumbers? 2013-11-26 18:32:10 -05:00
HARLAN 509b5ffd65 spacing 2013-11-26 18:29:12 -05:00
HARLAN c4927a3bfa spacing 2013-11-26 18:27:39 -05:00
HARLAN 34c40e2919 spacing 2013-11-26 18:25:11 -05:00
HARLAN 9936b4645b spacing 2013-11-26 18:25:00 -05:00
HARLAN 5d374fa928 spacing 2013-11-26 18:23:52 -05:00
HARLAN 8a5c9d51dc Update README.md 2013-11-26 17:38:31 -05:00
HARLAN 4c61f59b6b Update ROLLING CHANGE LOG 1.0.3.txt 2013-11-26 17:37:36 -05:00
dayz10k 6625cb96c1 Update README.md 2013-11-26 17:26:37 -05:00
dayz10k 80f65f8ae8 Update ROLLING CHANGE LOG 1.0.3.txt 2013-11-26 16:58:01 -05:00
dayz10k 46444f43ec Merge pull request #798 from dayz10k/master 
#796 error in BIS killed more spelling/cap/spacing
 2013-11-26 12:53:36 -08:00
dayz10k b34727d1a1 #796 error in BIS killed 2013-11-26 15:53:18 -05:00
dayz10k e9e1164dc6 Merge pull request #797 from dayz10k/master 
Area Maintenance, BIS killed, SQL
 2013-11-26 12:05:50 -08:00
dayz10k f94da47546 #796 error in BIS killed 2013-11-26 15:05:26 -05:00
dayz10k bae1e2d2c9 #794 Add Cinder/Wood packs to Wholesalers 2013-11-26 14:05:43 -05:00
dayz10k 98079d0142 Area Maintenance 2013-11-26 14:02:48 -05:00
dayz10k de265ec1a4 Area Maintenance 2013-11-26 14:00:33 -05:00
dayz10k 7f4db46478 Area Maintenance 2013-11-26 13:59:48 -05:00
dayz10k cbc024bc44 Area Maintenance 2013-11-26 13:57:12 -05:00
dayz10k 9931e6958b Area Maintenance 2013-11-26 13:55:24 -05:00
dayz10k 72830fa738 Merge pull request #791 from VeryBigBro/patch-7 
Update stringtable.xml
 2013-11-26 10:30:23 -08:00
dayz10k 18b5bd308b Merge pull request #795 from dayz10k/master 
#794, #696 update SQL for Wholesaler(building supplies)/Blackmarket (new weaps)
 2013-11-26 10:28:57 -08:00
dayz10k 854b7329b2 Add Cinder/Wood to Wholesaler, Update Blackmarket list for new weapons/ammo 2013-11-26 13:27:57 -05:00
dayz10k ea6b8aebf4 #794 Add Cinder/Wood packs to Wholesalers 2013-11-26 11:30:18 -05:00
dayz10k 2a1024ac31 Update ROLLING CHANGE LOG 1.0.3.txt 2013-11-26 09:59:42 -05:00
dayz10k 0dd0f71859 Update ROLLING CHANGE LOG 1.0.3.txt 2013-11-26 09:49:48 -05:00
dayz10k 421c0d0361 Update ROLLING CHANGE LOG 1.0.3.txt 2013-11-26 09:44:31 -05:00
dayz10k 571a7532d3 Merge pull request #785 from dayz10k/master 
Vehicle upgrade localization
 2013-11-25 14:48:28 -08:00
dayz10k 65c0073633 #735 localize more (match stringtable naming to CfgMagazine naming) [ORP,AVE,LRK,TNK] 2013-11-25 17:47:18 -05:00
dayz10k a48906d03c #735 localize more (new vehicle upgrade recipes from documents) 2013-11-25 17:45:39 -05:00
dayz10k 2d3f481979 #735 localize more (new vehicle upgrade recipes from documents) 2013-11-25 17:40:58 -05:00
dayz10k f1c989b03b Merge pull request #784 from dayz10k/master 
localize vehicle options
 2013-11-25 14:28:27 -08:00
dayz10k bb4d075180 #735 localize more (vehicle repair/salvage, etc) 2013-11-25 17:27:56 -05:00
dayz10k 7bd1cf2a86 #735 localize more (vehicle repair/salvage, etc) 2013-11-25 17:26:14 -05:00
dayz10k 02104614d8 #735 localize more (vehicle repair/salvage, etc) 2013-11-25 17:23:57 -05:00
dayz10k 673ed11dc0 #735 localize more (vehicle repair/salvage, etc) 2013-11-25 17:21:47 -05:00
dayz10k 2f7ccd784a Update stringtable.xml 2013-11-25 17:18:16 -05:00
dayz10k 20b4a12740 #735 localize more (vehicle repair/salvage, etc) 2013-11-25 17:15:01 -05:00
dayz10k 8a761134c6 #735 localize more (vehicle repair/salvage, etc) 2013-11-25 17:14:54 -05:00
dayz10k 14b72311d8 Merge pull request #783 from dayz10k/master 
Add more fortifications
 2013-11-25 13:53:15 -08:00
dayz10k ca89d8d590 #762 add more fortifications 2013-11-25 16:52:38 -05:00
dayz10k b9aee21b84 #762 add more fortifications 2013-11-25 16:37:14 -05:00
dayz10k 6e823ca827 #762 add more fortifications 2013-11-25 16:34:00 -05:00
dayz10k 8f029744ec #762 add more fortifications 2013-11-25 16:27:29 -05:00
dayz10k a4b3497c66 Update stringtable.xml 2013-11-25 16:15:56 -05:00
dayz10k a60ddf867a #762 add more fortifications 2013-11-25 16:15:29 -05:00