Commit Graph

1016 Commits

Author SHA1 Message Date
vbawol
30d8107d75 configClasses fixes thanks to @ravmustang 2017-08-26 07:12:50 -05:00
vbawol
fa3577473e Merge pull request #834 from ravmustang/Bool-spam-fix
Bool spam fix
2017-08-25 19:02:18 -05:00
DESKTOP-UH65DCE\MusTanG
b98f6e042a remove backup 2017-08-25 18:45:11 -05:00
DESKTOP-UH65DCE\MusTanG
e5fea7a53a correct configClasses usage 2017-08-25 18:44:26 -05:00
DESKTOP-UH65DCE\MusTanG
69acb31fd3 move icons to core 2017-08-25 16:36:27 -05:00
vbawol
901047eaef revert define test 2017-08-25 16:15:02 -05:00
vbawol
23b1710d7c test out of bounds checks
added _isOnFoot var to init that refreshes with event1 every second and
is reused in any events
2017-08-24 10:22:13 -05:00
vbawol
db18932055 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-08-24 09:29:01 -05:00
vbawol
5d044b3d9b proper use of copy operator
https://community.bistudio.com/wiki/Operators
2017-08-24 09:28:57 -05:00
He-Man
ecf904415b Remove forbidden Wpns / Ammo after upgrade 2017-08-22 23:40:41 +02:00
vbawol
383d67c28c Check to see if define true/false will fix bool conversion errors 2017-08-21 11:25:56 -05:00
He-Man
25e24b98e8 Fixed Ratio for DynaMenu Pics
Fix by @raymix
2017-08-21 17:05:08 +02:00
He-Man
2d0ef031c6 Moved Vehicle Upgrade to DynaMenu
- Vehicle Upgrade moved to DynaMenu
- Hitpoints now also will be given to Vehicles from other BaseClasses
(controlled by HitPointNames)
- Added a security Check that Players must have a bit distance to
upgrade
- Fixed some errors in Colorscript for upgraded Vehicles. If it is only
an upgrade, same color is used. If it is another Class, a new random
color will be taken.
- Removed Upgrade Vehicle from Inventory Click
- Changed DynaMenu to make it possible to call a script to get iconpath
(use "iconcode" instead of "icon" then)
2017-08-21 14:26:13 +02:00
vbawol
f7c3f748f7 add currentweapon to data new format 2017-08-18 15:00:30 -05:00
vbawol
94c5fee877 allow/setDamage and disableAI tweaks 2017-08-18 12:06:46 -05:00
vbawol
f0fbbe2cbb fixed spelling on Shipwreak 2017-08-18 11:12:47 -05:00
vbawol
35cd51d748 disable nite light by default 2017-08-18 11:09:14 -05:00
vbawol
065de1c165 make nitelight only work at night
https://community.bistudio.com/wiki/setLightDayLight
2017-08-18 11:07:02 -05:00
vbawol
763bc80e49 fixes 2017-08-18 09:45:27 -05:00
vbawol
b08e092cd4 Vehicle Damage On Spawn #824 2017-08-18 08:40:14 -05:00
vbawol
aea096ce68 add showHUD settings #822
Thanks to @Ghostrider-DbD-
2017-08-18 08:37:39 -05:00
vbawol
129d60b0b0 private update 2017-08-18 08:36:48 -05:00
vbawol
ab195d145b re-add hitpoints stats client side
removing it caused array index issues with other stats. Note: should be
able to repurpose the stat for something else instead of removing and
needing a workaround.
2017-08-18 08:25:07 -05:00
vbawol
1a211407b9 updates to login system and hitpoints
- No longer track hitpoints from client side, now saved server side only
and pushed to clients on login.
https://community.bistudio.com/wiki/getAllHitPointsDamage
- Changed use set / getUnitLoadout and should still have legacy player
data support that will upgrade automatically on first save.
- Default loadout can be controlled via new variables in epochconfig.hpp
- Made data validation check dynamic using isEqualTypeParams as it does
type checking and still fails if input is shorter than the default.
https://community.bistudio.com/wiki/isEqualTypeParams
- Added back server side damage protection for the new player body. If
the new unit dies before the player switch it could cause login issues
and should not cause issues with scripted setdamage or hitpoints as
first thought. https://community.bistudio.com/wiki/allowDamage
2017-08-15 14:19:03 -05:00
vbawol
ba3041ce8d Merge pull request #823 from Ignatz-HeMan/patch-5
Fixed wrong EPOCH_InteractedItem on crates
2017-08-13 23:46:22 -05:00
He-Man
8185d0dbf5 Fixed wrong EPOCH_InteractedItem on crates
This has no effect to Epoch, but if you are working with EPOCH_InteractedItem in custom scripts, the crate items are from the wrong wh (if a crate and a groundWH is in target.
2017-08-13 20:43:33 +02:00
He-Man
e9499d6b17 Missing config for upgrading Cinder Floor 2017-08-09 19:10:00 +02:00
Raimonds Virtoss
5420ce3dc5 Merge pull request #820 from Ignatz-HeMan/patch-3
Fix "throw items" from Fav-Bar
2017-08-08 17:42:40 +01:00
vbawol
f28cc43cd5 b826 2017-08-07 18:53:00 -05:00
He-Man
c1cbb626fb Fix "throw items" from Fav-Bar 2017-08-07 23:10:21 +02:00
He-Man
aff46f13f7 Fix "throw items" from Fav-Bar 2017-08-07 22:57:59 +02:00
He-Man
236da86acb Upgrade for CinderFloor 2017-08-06 19:22:49 +02:00
He-Man
370896c150 Update CfgLootTable_MADCUP.h 2017-08-06 02:37:48 +02:00
He-Man
e0a002f808 Update CfgLootTable_MAD.h 2017-08-06 02:37:27 +02:00
He-Man
4609b4e236 Update CfgLootTable_CUP.h 2017-08-06 02:37:02 +02:00
He-Man
7028ad8011 Update CfgLootTable.h 2017-08-06 02:36:36 +02:00
He-Man
497db196ad Added missing Loot / Pricing / ItemSort 2017-08-05 20:56:36 +02:00
vbawol
163d702271 b824 2017-08-04 15:16:51 -05:00
He-Man
5388ca2210 changes for Vehicle Repair + iteminteracts 2017-08-04 21:50:26 +02:00
vbawol
6e3dcd090a b823 2017-08-04 14:39:46 -05:00
DESKTOP-UH65DCE\MusTanG
c783e6854b update killed EH
if killer is unit exit handler
2017-08-04 13:44:03 -05:00
vbawol
02c6e96f0c b822 2017-08-03 19:19:27 -05:00
vbawol
6a78895879 Merge branch 'experimental' into Community-Stats-#1 2017-08-03 18:20:00 -05:00
DESKTOP-UH65DCE\MusTanG
c19847b156 updates
local antagonists killed by non-local entity needed to be handled.
Local and Non-Local stat changes are now sent to server first then back
to the appropriate client after pToken check is verified.
2017-08-03 18:11:10 -05:00
vbawol
0074d505a8 Merge pull request #810 from Ignatz-HeMan/experimental
Option to prevent selling damaged veh
2017-08-03 14:55:42 -05:00
He-Man
c7f467be77 Option to prevent selling damaged veh 2017-08-03 20:43:58 +02:00
Raymix
3abac17557 trade: calc damage %, return new cost 2017-08-03 19:32:55 +01:00
He-Man
ff4b401b5f Some Fav-Bar Tweaks
- Moved configs to cfgepochclient
- Changed Keydown-Check from EPOCH_Buildmode to EPOCH_Target
- Replaced "resetonLogin" to only remove "forbidden items"
2017-08-03 18:18:18 +02:00
DESKTOP-UH65DCE\MusTanG
a2a3b7e3bd Zombie Stat
addEventHandler in 2 places for same zombie _unit, removed from unit
spawn function.
2017-08-03 10:46:46 -05:00
DESKTOP-UH65DCE\MusTanG
c49ee69265 add some tidybowl 2017-08-03 09:42:49 -05:00
DESKTOP-UH65DCE\MusTanG
4f88928bd0 Missions simplified
Category changed to TraderMissions.
Removed CompletedMissions.
2017-08-03 09:37:08 -05:00
DESKTOP-UH65DCE\MusTanG
43958142b8 Community Stats System #1
Fully customizable system.
Base system laid out more so as an example.
Included:
-Murders
-Deaths
-Suicides
-Revives
-AIKills
-AntagonistKills
-ZombieKills
-MissionsAttempted
-CompletedMissions

Client side stat change with optional send to server.
Server side stat change with optional send to client.
Server is backed up with token check if sent from client.
2017-08-02 22:16:21 -05:00
Raymix
97cf50183e FavBar: build mode fix 2017-08-02 23:16:50 +01:00
Raymix
49e67d24d4 FavBar: perf optimization - new 5 sec event 2017-08-02 22:07:55 +01:00
Raymix
a09c53b723 favbar: return on void 2 2017-08-02 21:53:31 +01:00
Raymix
ec701873f7 favbar: returns on void 2017-08-02 21:53:04 +01:00
Raymix
a0e9ddbbef FavBar: performance optimization 2017-08-02 21:48:09 +01:00
Raymix
082036236a favbar: cleanup + private declares 2017-08-02 19:33:53 +01:00
vbawol
4cdc67cf9d Merge pull request #804 from Ignatz-HeMan/experimental
Advanced Vehicle Repair
2017-08-01 16:47:39 -05:00
Raymix
366068fd82 Customize HUD option removed from ESC menu #800 2017-08-01 22:42:06 +01:00
Raymix
2f5fe0f149 Favbar added: Banned items list and reset favbar on every login 2017-08-01 21:25:31 +01:00
Raymix
80329a9b16 Favbar: dupe fix (sorry lol, needs more field testing) 2017-08-01 21:09:50 +01:00
He-Man
826ddcc234 New item Classnames 2017-08-01 14:44:50 +02:00
vbawol
e022e6bfb3 b821 2017-07-31 23:19:08 -05:00
Raymix
45b6bf1fb2 Favorites bar - full release 2017-08-01 03:00:28 +01:00
vbawol
2c99640040 b820 2017-07-31 16:12:41 -05:00
He-Man
5dd672cb68 Advanced Vehicle Repair 2017-07-31 18:28:18 +02:00
vbawol
586261f587 b819 2017-07-28 11:57:10 -05:00
vbawol
29e530d62c AH updates
- change a few call compile + callExtension calls to parseSimpleArray +
callExtension as they return arrays.
- allow anti teleport check to be disabled with
antihack_antiTeleportCheck = "false" inside epochah.hpp
- optimized and made EPOCH_server_getRealTime command a normal server
function.
2017-07-28 11:56:30 -05:00
DESKTOP-UH65DCE\MusTanG
39d8f05029 add virtual obj for setDir 2017-07-27 15:16:16 -05:00
vbawol
1a806fbfec fixed type error on createTeleport 2017-07-27 14:15:30 -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
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
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
014f094f04 Fixes #790 2017-07-25 03:19:40 +01: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
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
He-Man
96b4a33677 Fixed flip storages, added height check 2017-07-09 21:34:32 +02:00
He-Man
3539a43734 Fixed flip Storages, added height-check 2017-07-09 21:08:00 +02:00
He-Man
b95b845b9a Fixed flip storages above Water 2017-07-09 20:57:08 +02:00
vbawol
043290d5d2 b804 2017-07-09 05:30:52 -05:00
vbawol
28498f3b89 update comment 2017-07-08 18:53:24 -05:00
vbawol
b2354dc5a6 enable dynamic simulation on vehicles 2017-07-08 18:52:42 -05:00
vbawol
0efc699370 b803 2017-07-08 18:51:32 -05:00
vbawol
2c7bf2e87c Merge pull request #774 from ravmustang/Vehicle-Upgrade-System-#1
Vehicle upgrade system 1
2017-07-08 11:55:05 -05:00
vbawol
cdf1e709ae update private array 2017-07-08 08:07:06 -05:00
He-Man
6820969989 Fix for SetSpawnPoint above Water not working 2017-07-07 20:43:11 +02:00
DESKTOP-UH65DCE\MusTanG
ff8c2a27cd Offroad 5th upgrade(Rare)
Remove unknown Document
Add recipe for Police Offroad
Adds police lights and siren to the offroad.
2017-07-06 19:53:00 -05:00
DESKTOP-UH65DCE\MusTanG
98f7e92e9f Rare Document Upgrades
new item was created Top Secret(Rare Document) for special vehicle
upgrades
2017-07-06 19:19:36 -05:00
DESKTOP-UH65DCE\MusTanG
3fd8a502f7 Zamak veh upg recipes 2017-07-06 14:20:29 -05:00
DESKTOP-UH65DCE\MusTanG
8445a328f4 Van veh upg
Van transport and van box vehicle upgrades 3 and 4 added to recipes.
transport can be upgraded into box with more materials
2017-07-06 14:01:41 -05:00
DESKTOP-UH65DCE\MusTanG
0817764cad Clean Up 2017-07-06 10:20:37 -05:00
DESKTOP-UH65DCE\MusTanG
43052e9ec7 More Vehicles Upgrades
Add in Hunter / Ifrit / Strider vehicle upgrades to configs
2017-07-06 10:14:12 -05:00
DESKTOP-UH65DCE\MusTanG
972328ac01 Update VehUpgKits recipes
The kits are already a crafted item of all required upgrade items, so
these should only require themselves when upgrading.
2017-07-05 17:25:20 -05:00
DESKTOP-UH65DCE\MusTanG
a151cd21c5 Fixes
Bad mistakes on my part :(
2017-07-05 16:19:19 -05:00
DESKTOP-UH65DCE\MusTanG
7db5f1c36d Fix config class array 2017-07-05 16:11:34 -05:00
DESKTOP-UH65DCE\MusTanG
aabcb3f069 Added new crafting
new kits crafting recipes and data
fix upgrade IV recipes
2017-07-04 14:30:48 -05:00
DESKTOP-UH65DCE\MusTanG
f0fdc9844d add new crafted veh upg kits
Added to Item Interactions for READ button on click
Added to Reading Documents for info on each kit
Added inherits from the respective ItemVehDoc so that it can be used for
upgrading.
2017-07-04 14:18:36 -05:00
DESKTOP-UH65DCE\MusTanG
657d4c7b29 Check and Correct Old Vehicle DB array
When hosts upgrade they will have vehicles saved in their DB with the
old dataFormat.
This check by @He-Man will do the trick to solve this issue moving
forward with vehicle upgrades
2017-07-04 10:25:23 -05:00
DESKTOP-UH65DCE\MusTanG
1e77e0a22b Add reading documents
Add configs for easy editing of readable documents messages
Array for multiple messages, even a story. lol
Default messages are a hoot!
2017-07-03 19:08:04 -05:00
DESKTOP-UH65DCE\MusTanG
9faac57e27 Add new Vehicles to CfgPricing 2017-07-03 17:39:37 -05:00
DESKTOP-UH65DCE\MusTanG
e906d29c9c More upgrades and new functions 2017-07-03 15:59:40 -05:00
DESKTOP-UH65DCE\MusTanG
44eb34445d Msg for missing item 2017-07-03 07:40:47 -05:00
DESKTOP-UH65DCE\MusTanG
711e7aba06 Update VUS#1
Change call to configFile to new missionConfigFile CfgVehicleUpgrades.
Add check for crypto client side before sent off to server for
completion
2017-07-03 07:35:42 -05:00
DESKTOP-UH65DCE\MusTanG
1dc4d147be VUS #1
ItemInteractions for VehDoc's set for UPGRADE
CfgVehicleUpgrade added for customizing materials needed
Server function for upgrading vehicle
CfgRemoteExec addition for server function above.
2017-07-03 07:22:20 -05:00
He-Man
0030953a71 Changed path for Drink Icon 2017-06-28 17:45:14 +02:00
He-Man
c53557ed1a Changed path for Drink Icon 2017-06-28 17:44:24 +02:00
vbawol
ae5458a775 b801 2017-06-26 08:08:13 -05:00
vbawol
21d762eaa7 Merge pull request #772 from Ignatz-HeMan/patch-4
Fixed Trader Count
2017-06-26 06:48:04 -05:00
vbawol
d3472d2638 Merge pull request #771 from ravmustang/Epoch-Assets-#2
Epoch Assets #2
2017-06-26 06:47:37 -05:00
He-Man
929760808a Fixed Trader Count 2017-06-26 00:46:51 +02:00
DESKTOP-UH65DCE\MusTanG
2a2c2d464e Epoch Assets #2
Wood Half Floor
Wood Quarter Floor

Create CfgMagazine for inventory kits
Create entries in the CfgItemInteractions/CfgBaseBuilding/CfgCrafting
Create CfgVehicles for built / SIM / Ghost models

Models in Object Builder
Fix penetration link to arma 2 ca folder, replaced with a3 wood_plate as
is on the full wood floor
create new memory points C, CB, CinE, CinW, CinS, CinN, E, EF, W, WF, S,
SF, N, NF
Tweak for proper snapping points in game

Assets:
Briefcase Silver (100oz)
Silver Bar (10oz)
Aluminum Bar (10oz)
Copper Bar (10oz)
Tin Bar (10oz)
KitWoodHalfFloor
KitWoodQuarterFloor
500Rnd_127x99_mag and tracer mags
200Rnd_127x99_mag and tracer mags
100Rnd_127x99_mag and tracer mags
2000Rnd_762x51_Belt
40mm_G_belt (200Rnd, 32, 64, 96)
30mm_G_belt (200Rnd, 40)
mas_50Rnd_127x107_DSHKM
mas_150Rnd_127x107_DSHKM
2017-06-24 23:28:12 -05:00
He-Man
394074c71d Updated missing ServiePoint Changes 2017-06-25 03:51:48 +02:00
He-Man
093e600ae2 Updated missing ServiePoint Changes 2017-06-25 03:21:31 +02:00
He-Man
94c8db8408 Updated missing ServiePoint Changes 2017-06-25 03:19:29 +02:00
vbawol
3813a76dce b800 2017-06-24 12:03:27 -05:00
vbawol
1f6dde98b1 Merge pull request #767 from ravmustang/Mosquito-Re-Arm
mosquito re-arm
2017-06-24 10:51:50 -05:00
vbawol
61700f5b41 fix from @Ignatz-HeMan
"otherwise he checks the aimpos of the Vehicle and this is mostly not
visible for the zombie"
2017-06-24 10:40:41 -05:00