Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,363 Commits 8 Branches 78 Tags 202 MiB
88b8c43200
Commit Graph

1363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vbawol
88b8c43200 merge PR from master 
from https://github.com/EpochModTeam/Epoch/pull/783
 2017-07-27 10:09:42 -05:00
vbawol
c38766286d b815 2017-07-27 09:51:19 -05:00
vbawol
aaef107e3e Merge pull request #795 from ravmustang/Vector-Building-and-Snapping-#1 
Fix snapping with Vector Tilt
 2017-07-27 08:16:49 -05:00
vbawol
1df663247b Merge pull request #794 from Ignatz-HeMan/patch-8 
Clear Veh Cargo after upgrade
 2017-07-27 08:16:41 -05:00
DESKTOP-UH65DCE\MusTanG
f8461d247e Fix snapping with Vector Tilt 
I feel crazy after this one.
 2017-07-26 21:38:33 -05:00
He-Man
f70d2f7a4a Clear Veh Cargo after upgrade 2017-07-26 22:40:34 +02:00
vbawol
f2b0aab6e6 disable fuel after player is already in the server 2017-07-25 12:19:23 -05:00
vbawol
45a02c7b91 for #340 disable refuel client side 2017-07-25 12:02:17 -05:00
vbawol
ce5312930c b813 2017-07-25 11:41:54 -05:00
vbawol
5f213be94b Merge pull request #793 from ravmustang/Crafting-Menu-#1 
crafting menu load fix
 2017-07-25 11:19:32 -05:00
DESKTOP-UH65DCE\MusTanG
05655d0cb2 crafting menu load fix 
Change incoming variables from params to _this.
 2017-07-25 09:59:55 -05:00
vbawol
3808c2c95a b812 2017-07-25 07:58:55 -05:00
Raymix
86c875f7e4 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 
Conflicts:
	Sources/epoch_config/Configs/cfgCrafting.hpp
 2017-07-25 03:21:24 +01:00
Raymix
014f094f04 Fixes #790 2017-07-25 03:19:40 +01:00
vbawol
8bb21f50a9 Merge pull request #791 from ravmustang/CfgCrafting-Fix 
CfgCrafting Classname Change
 2017-07-24 21:01:38 -05:00
DESKTOP-UH65DCE\MusTanG
949e0e0b37 CfgCrafting Classname Change 
ItemPipes change to ItemPipe
 2017-07-24 19:16:23 -05:00
vbawol
ec262e59f0 b810 2017-07-24 16:20:15 -05:00
vbawol
f7a1ef393d Merge pull request #789 from Ignatz-HeMan/patch-7 
Fixed msg "Not all Items sold"
 2017-07-24 15:53:31 -05:00
Raymix
c9e382c1b4 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-07-24 21:26:10 +01:00
Raymix
9ebfe6765d cfgCrafting.hpp Maintenance + Fixes #785 2017-07-24 21:25:25 +01:00
He-Man
4982b1ec03 Fixed msg "Not all Items sold" 2017-07-24 20:05:26 +02:00
vbawol
10a762b541 Merge pull request #788 from ravmustang/Dynamic-Simulation-#3 
DynSim #3 Configs
 2017-07-24 12:50:38 -05:00
DESKTOP-UH65DCE\MusTanG
e52fc1ee25 DynSim #3 Configs 
Added cfgDynamicSimulation.
Toggle entire system.
Toggle individual sections player/bases/vehicles
Set mulitpliers and distances.
Will continue to add to these configs as BIS adds more scripting
commands for us to use.
 2017-07-24 12:34:58 -05:00
vbawol
97e1b5d328 Merge pull request #787 from ravmustang/non-Epoch-Teleporter-UserAction 
Action change
 2017-07-24 12:31:25 -05:00
DESKTOP-UH65DCE\MusTanG
f68f616fea Action change 
Change selection in array to "" as the current selection is not built
into these non-epoch objects.
 2017-07-24 12:26:14 -05:00
vbawol
6ff599a578 use same array for worldpos 2017-07-24 11:20:32 -05:00
vbawol
5fe2d99731 fix error line 110 2017-07-24 10:05:07 -05:00
vbawol
77ae1625a6 allow direction and force addactions on other objects 2017-07-24 09:31:27 -05:00
vbawol
9d9ea54612 b809 2017-07-20 22:32:50 -05:00
vbawol
691c9d0a86 Merge pull request #784 from ravmustang/Barrel-Bomb-#2 
Barrel Bomb crafting kit
 2017-07-20 20:07:50 -05:00
vbawol
4d66562459 b808 2017-07-20 18:08:16 -05:00
vbawol
63e8a887c9 rem old simulation code, recount arr after upgrade 2017-07-20 18:06:33 -05:00
vbawol
3ef5fa1fe3 b807 2017-07-20 14:10:06 -05:00
vbawol
292108715b fixed minor typo in vars 2017-07-20 11:07:24 -05:00
DESKTOP-UH65DCE\MusTanG
d90d8cf079 Barrel Bomb crafting kit 
Add crafting recipe for barrel bombs
 2017-07-19 22:39:16 -05:00
vbawol
54af60ccc2 credits bump 2 2017-07-17 10:30:11 -05:00
vbawol
60e5aa1378 credits bump 2017-07-17 10:29:56 -05:00
vbawol
e45e3d0abe b806 2017-07-17 05:58:51 -05:00
vbawol
015dd1f37c Merge pull request #781 from ravmustang/Missing-;- 
This little ; went to the market..... lol
 2017-07-17 04:47:05 -05:00
vbawol
312868bc70 Merge pull request #780 from ravmustang/Dynamic-Simulation-System-#1 
Dynamic Simulation #1
 2017-07-17 04:46:35 -05:00
DESKTOP-UH65DCE\MusTanG
98e8bcb6ab This little ; went to the market..... 
This silly guy went home. ROFL
 2017-07-16 23:15:51 -05:00
DESKTOP-UH65DCE\MusTanG
44a7b78980 Dynamic Simulation #1 
Init dynSim for server and client.
Load configured settings.
Enable dynSim for Buildings, Vehicles, Clients.
 2017-07-16 15:26:19 -05:00
vbawol
7ccf6d85c4 b805 2017-07-12 11:19:53 -05:00
vbawol
4fa13b7a91 corrected comments 2017-07-12 09:54:03 -05:00
vbawol
07e9e1ac5c add private 2017-07-12 09:53:53 -05:00
vbawol
fd5f4cb1f9 maxBuildingHeight now var as it is used oneachframe 2017-07-12 09:53:39 -05:00
vbawol
078014cd72 Merge pull request #777 from Ignatz-HeMan/patch-6 
Fixed flip storage, added building height check
 2017-07-12 09:25:28 -05:00
vbawol
7d332779af BE fixes take 2 2017-07-10 17:06:52 -05:00
vbawol
d310d8921a Revert "BE fixes" 
This reverts commit 734dc5d200.
 2017-07-10 16:10:23 -05:00
vbawol
734dc5d200 BE fixes 2017-07-09 17:10:08 -05:00