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
2,137 Commits 8 Branches 78 Tags 202 MiB
f28812abe1
Commit Graph

1452 Commits

Author SHA1 Message Date
vbawol
2f59263638 fix inherits for metal and cinder floor 2017-10-27 09:17:34 -05:00
He-Man
592290f69e Added missing prices / Itemsorts 2017-10-27 15:55:43 +02:00
vbawol
2acaff9650 add pistol flash light attachment 2017-10-26 14:57:21 -05:00
vbawol
47b733d1e3 loot table additions 2017-10-26 14:00:35 -05:00
vbawol
eae477ef22 loot pos fixes and additions 2017-10-26 12:26:30 -05:00
DESKTOP-UH65DCE\MusTanG
f41c4c19cf change lost snap point names 
these are for clarity. They were lost during yesterdays hiccups with my
repo
 2017-10-26 10:55:35 -05:00
DirtySanchez
8c33d3e7ea 8 percent not 80... 2017-10-26 08:34:42 -05:00
vbawol
f579588c00 trigger trap to destroy base object 
should fix issue reported in #945
 2017-10-25 20:53:11 -05:00
vbawol
5c3d7a1a74 remove low value loot from Shipwreck loot 2017-10-25 20:25:52 -05:00
vbawol
5c3d589443 exit loop if _shipwrecks array is empty 
ref https://github.com/EpochModTeam/Epoch/issues/947
 2017-10-25 19:43:13 -05:00
DESKTOP-UH65DCE\MusTanG
e3373e9a97 remove extra ,0 in array EQ1 2017-10-25 17:06:01 -05:00
DESKTOP-UH65DCE\MusTanG
9a69b5d618 Update EQ1,EQ2 snapping points 2017-10-25 16:58:39 -05:00
Raymix
2b0119f574 Consume uses message_stack, trader chat colored in orange now 2017-10-25 22:27:17 +01:00
DESKTOP-UH65DCE\MusTanG
529078dbc2 fix missing data from merge 2017-10-25 16:14:58 -05:00
Raymix
e77fcec023 add message_stack to consume items script 2017-10-25 21:57:29 +01:00
vbawol
ca60602095 remove comment 2017-10-25 15:42:25 -05:00
vbawol
14026115e6 Merge remote-tracking branch 'origin/experimental' into experimental 
# Conflicts:
#	Sources/epoch_config/Configs/CfgBaseBuilding.hpp
 2017-10-25 15:41:19 -05:00
vbawol
8f9227e5be config merge cleanup 2017-10-25 15:33:39 -05:00
DESKTOP-UH65DCE\MusTanG
93bdf4500a remove github lines 2017-10-25 15:28:25 -05:00
Raymix
78352726bd New message system - multi line support, fix for feedback #945. 2017-10-25 21:04:18 +01:00
DESKTOP-UH65DCE\MusTanG
520819ddea remove backup 2017-10-25 14:53:38 -05:00
DESKTOP-UH65DCE\MusTanG
d45603eecc add quarter floor snapping points 
clean up config with inherits for snapping points
 2017-10-25 14:53:08 -05:00
He-Man
765bf01eb9 Snap Fix 2017-10-25 21:38:49 +02:00
He-Man
2e14b752d7 Metal + Cinder Upgrades / Crafting 2017-10-25 21:12:55 +02:00
Raymix
ba7285ee78 Remove quotes from messages 2017-10-25 17:55:27 +01:00
DESKTOP-UH65DCE\MusTanG
1c3ef76e1d metal - cinder full floors snapPointsPara update 2017-10-24 16:15:44 -05:00
DESKTOP-UH65DCE\MusTanG
d3b0a6f871 update metal and cinder snapping points 2017-10-24 15:48:30 -05:00
DESKTOP-UH65DCE\MusTanG
169a655551 metal / cinder full - half - quarter mission configs 3 2017-10-24 15:05:53 -05:00
DESKTOP-UH65DCE\MusTanG
cc1c4f8896 metal / cinder full - half - quarter mission configs 2 2017-10-24 15:05:31 -05:00
DESKTOP-UH65DCE\MusTanG
021fc1dfdc metal / cinder full - half - quarter mission configs 
Add pricing and change full cinder price
Add itemsort and add missing Wood half and quarter
 2017-10-24 15:04:21 -05:00
DESKTOP-UH65DCE\MusTanG
0f31efd467 hmmm 2017-10-24 14:57:50 -05:00
DESKTOP-UH65DCE\MusTanG
fb5345f8c5 shipwreck update and max config 2017-10-24 14:47:56 -05:00
vbawol
6821e1895d isNil check needed for nearestTerrainObjects? 2017-10-24 14:15:50 -05:00
vbawol
68e33cf4f0 use only SHIPWRECK type 2017-10-24 13:36:12 -05:00
Raymix
8986729467 Fixes low energy issue #945 + new low battery sounds (below 5) 2017-10-24 19:29:56 +01:00
vbawol
c198fd69e0 remove second rng 2017-10-24 12:02:07 -05:00
vbawol
e6852a4f5e limit Shipwreck spawns to 12 2017-10-24 12:00:20 -05:00
vbawol
06464c3266 separate restart and events 
make events timer 1 second
 2017-10-24 11:49:00 -05:00
vbawol
b21e394b7d EPOCH_dynamicEvents 2017-10-24 11:25:38 -05:00
Raymix
17fae05e4e some weird git bug, won't let me discard these. No changes 2017-10-24 17:23:13 +01:00
vbawol
67b8d6711f add call and spawn support 
also added append usage to inject events into the scheduler
 2017-10-24 11:18:54 -05:00
DESKTOP-UH65DCE\MusTanG
7eb50281cf another duplicate 2017-10-24 10:15:45 -05:00
vbawol
b668130984 removed containerPos array from CfgEpoch 
added shipwreckLootEnabled = 1 by default, set to 0 to disable for maps
with no water.
 2017-10-24 10:14:10 -05:00
DESKTOP-UH65DCE\MusTanG
acd7a749ea remove duplicate entries 2017-10-24 10:11:08 -05:00
vbawol
f076f5bff5 use nearestTerrainObjects for Shipwreck loot 2017-10-24 09:58:39 -05:00
DESKTOP-UH65DCE\MusTanG
24d059f0c9 malden underwater shipwrecks 2017-10-24 09:22:39 -05:00
DESKTOP-UH65DCE\MusTanG
04e922d544 correct inherit and malden wreck 2017-10-24 09:11:13 -05:00
DESKTOP-UH65DCE\MusTanG
70df6a8038 add malden blue barrel 2017-10-24 09:03:46 -05:00
vbawol
029fa396be also add models for baked in map items 2017-10-24 08:58:52 -05:00
DESKTOP-UH65DCE\MusTanG
28042eb84a add large and small pipes to salvage 2017-10-24 08:53:09 -05:00
DESKTOP-UH65DCE\MusTanG
f8a7a569ce mapOnZoomSetMarkerSize upgrade 
Add exitWith to remove wasted resizing during scrolling
Add config entry for custom adjustments
Change how adjustment calculation is made.
Added new min calculation.
Adjust cfg marker sets sizing to fit new setup

🤘
 2017-10-23 22:31:38 -05:00
vbawol
b71b86c4a7 move mod checks server side 2017-10-23 15:12:00 -05:00
vbawol
d3d1e98310 missed something 2017-10-23 14:38:02 -05:00
vbawol
0adc494b75 revert animation state test 2017-10-23 14:32:06 -05:00
vbawol
0861ab0b97 move params 2017-10-23 13:57:55 -05:00
vbawol
258d6c82d9 animation state 
added missing var init server side
moved playMoveNow to master loop init and after display checks.
added config switch setAnimStateEnabled to test this, set
setAnimStateEnabled = true in CfgEpochClient to enable. Disabled by
default.
 2017-10-23 13:43:27 -05:00
Raymix
31401b5b39 geiger: remove unused fnc, reduce tick volume by half. 2017-10-23 19:09:21 +01:00
Raymix
6826cd6ad9 dynamenu: anim jitter fix, zoom from center fix, increased icon size by 50% 2017-10-23 18:51:24 +01:00
vbawol
e90096c30c Revert "let server handle playMoveNow" 
This reverts commit 06d6a642d1.
 2017-10-23 11:29:01 -05:00
vbawol
06d6a642d1 let server handle playMoveNow 2017-10-23 11:07:01 -05:00
vbawol
0f6abe3b15 add playMoveNow 2017-10-23 11:01:44 -05:00
vbawol
178c844f66 add animation state tracking 
todo make use of animation state via login fsm
 2017-10-23 10:53:34 -05:00
DESKTOP-UH65DCE\MusTanG
f7c71e1d5a custom radioactive locations with radiated objects 2017-10-23 01:45:14 -05:00
DESKTOP-UH65DCE\MusTanG
103cf4610a add max range config 2017-10-23 01:31:39 -05:00
DESKTOP-UH65DCE\MusTanG
d0d7c9d765 remove unused code 2017-10-22 20:54:22 -05:00
DESKTOP-UH65DCE\MusTanG
02d042b186 remove "location" type fixing serialization error 2017-10-22 20:52:08 -05:00
DESKTOP-UH65DCE\MusTanG
a210dfa60a blacklist rework 2017-10-22 19:59:09 -05:00
DirtySanchez
858f0827ab formatting correction 2017-10-22 19:56:11 -05:00
DESKTOP-UH65DCE\MusTanG
434c3159b9 geiger counter energy consumption 2017-10-22 19:18:19 -05:00
DESKTOP-UH65DCE\MusTanG
431e10ee58 rad zone blacklist obj and distance 2017-10-22 18:55:12 -05:00
DESKTOP-UH65DCE\MusTanG
b113bd5209 config number -1 for true number of locations 2017-10-22 17:07:44 -05:00
DESKTOP-UH65DCE\MusTanG
ba339d518b fix trader brain array error 2017-10-22 17:06:10 -05:00
Raymix
cf34a30b57 geiger low energy warning 2017-10-22 19:45:38 +01:00
Raymix
da55cfafb9 spoke too soon, another logic issue fixed 2017-10-22 18:59:37 +01:00
Raymix
1b19df0cba another math issue, hopefully last 2017-10-22 18:49:47 +01:00
Raymix
25528b59c3 revert location changes + fix math in rads calc 2017-10-22 18:39:29 +01:00
Raymix
faa26dfe5a remove diag_log, oops 2017-10-22 17:39:18 +01:00
Raymix
a6aade38b9 disable geiger by default 2017-10-22 17:28:51 +01:00
Raymix
a3ff403d2c change back 2017-10-22 17:18:52 +01:00
Raymix
a7f5f1ea8f Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-22 17:16:30 +01:00
Raymix
e996d78695 Radioactive sickness calc 2017-10-22 17:15:58 +01:00
DESKTOP-UH65DCE\MusTanG
3e7a62560a cfglocations setVariable correction 2017-10-22 09:41:00 -05:00
Grahame
81855104e9 Fix path for geiger buttons 2017-10-22 10:15:30 -04:00
He-Man
bf4cd25dcd Readded lost changes 2017-10-22 16:05:57 +02:00
Raymix
02e4b822e4 conflicts 2017-10-22 00:10:45 +01:00
Raymix
8b5f896424 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-21 23:52:37 +01:00
Raymix
a893e7aa74 Geiger counter GUI release 2017-10-21 23:35:53 +01:00
He-Man
d3acc2683b Merge pull request #940 from morgoth0/patch-9 
Add code to handle enable/disable vehicle TIE
 2017-10-21 23:13:22 +02:00
Grahame
0ff57e294e Variable handling of accelerated HTA loss 2017-10-21 16:41:31 -04:00
Grahame
035ff7aa09 Added variable handling of accelerated HTA loss 2017-10-21 16:40:44 -04:00
Grahame
4fb7b9df98 Add variable to control accelerated HTA loss 2017-10-21 16:38:58 -04:00
Grahame
6851716f1b Add code to handle enable/disable vehicle TIE 2017-10-21 15:37:01 -04:00
Grahame
d896c57af9 Add code to handle enable/disable vehicle TIE 2017-10-21 15:35:28 -04:00
Grahame
e951b12fe7 Add code to handle enable/disable vehicle TIE 2017-10-21 15:34:41 -04:00
Grahame
867da0aa91 Add code to handle enable/disable vehicle TIE 2017-10-21 15:33:50 -04:00
Grahame
e4ec7b1d87 Add code to handle enable/disable vehicle TIE 2017-10-21 15:32:35 -04:00
vbawol
414013497c increase loot bias for bunkers 2017-10-21 06:08:39 -05:00
DirtySanchez
555e350b5d dynamic trader brain marker corrections 
old marker handlers removed and replaced with global marker sets
 2017-10-20 23:45:14 -05:00
vbawol
2ce47c3a3f comment 2017-10-20 17:05:01 -05:00
vbawol
ae581880a4 fix possible random var collisions 2017-10-20 17:04:32 -05:00