Commit Graph

2401 Commits

Author SHA1 Message Date
e3373e9a97 remove extra ,0 in array EQ1 2017-10-25 17:06:01 -05:00
9a69b5d618 Update EQ1,EQ2 snapping points 2017-10-25 16:58:39 -05:00
41bf387be4 update server install pack Build: 1063 2017-10-25 16:52:35 -05:00
2b0119f574 Consume uses message_stack, trader chat colored in orange now 2017-10-25 22:27:17 +01:00
529078dbc2 fix missing data from merge 2017-10-25 16:14:58 -05:00
e77fcec023 add message_stack to consume items script 2017-10-25 21:57:29 +01:00
ca60602095 remove comment 2017-10-25 15:42:25 -05:00
14026115e6 Merge remote-tracking branch 'origin/experimental' into experimental
# Conflicts:
#	Sources/epoch_config/Configs/CfgBaseBuilding.hpp
2017-10-25 15:41:19 -05:00
8f9227e5be config merge cleanup 2017-10-25 15:33:39 -05:00
93bdf4500a remove github lines 2017-10-25 15:28:25 -05:00
78352726bd New message system - multi line support, fix for feedback #945. 2017-10-25 21:04:18 +01:00
520819ddea remove backup 2017-10-25 14:53:38 -05:00
d45603eecc add quarter floor snapping points
clean up config with inherits for snapping points
2017-10-25 14:53:08 -05:00
6a76705a68 remove legacy files 2017-10-25 14:41:01 -05:00
20be0805f4 dynamic server events usage example 2017-10-25 14:40:36 -05:00
765bf01eb9 Snap Fix 2017-10-25 21:38:49 +02:00
74b2f5660e update install pack b1059 2017-10-25 14:28:19 -05:00
2e14b752d7 Metal + Cinder Upgrades / Crafting 2017-10-25 21:12:55 +02:00
ba7285ee78 Remove quotes from messages 2017-10-25 17:55:27 +01:00
1c3ef76e1d metal - cinder full floors snapPointsPara update 2017-10-24 16:15:44 -05:00
d3b0a6f871 update metal and cinder snapping points 2017-10-24 15:48:30 -05:00
169a655551 metal / cinder full - half - quarter mission configs 3 2017-10-24 15:05:53 -05:00
cc1c4f8896 metal / cinder full - half - quarter mission configs 2 2017-10-24 15:05:31 -05:00
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
0f31efd467 hmmm 2017-10-24 14:57:50 -05:00
fb5345f8c5 shipwreck update and max config 2017-10-24 14:47:56 -05:00
6821e1895d isNil check needed for nearestTerrainObjects? 2017-10-24 14:15:50 -05:00
68e33cf4f0 use only SHIPWRECK type 2017-10-24 13:36:12 -05:00
8986729467 Fixes low energy issue #945 + new low battery sounds (below 5) 2017-10-24 19:29:56 +01:00
c198fd69e0 remove second rng 2017-10-24 12:02:07 -05:00
e6852a4f5e limit Shipwreck spawns to 12 2017-10-24 12:00:20 -05:00
06464c3266 separate restart and events
make events timer 1 second
2017-10-24 11:49:00 -05:00
b21e394b7d EPOCH_dynamicEvents 2017-10-24 11:25:38 -05:00
17fae05e4e some weird git bug, won't let me discard these. No changes 2017-10-24 17:23:13 +01:00
533a141dc7 remove scratch file 2017-10-24 11:19:24 -05:00
67b8d6711f add call and spawn support
also added append usage to inject events into the scheduler
2017-10-24 11:18:54 -05:00
10530e04e2 add linked items options in comments 2017-10-24 10:50:08 -05:00
7eb50281cf another duplicate 2017-10-24 10:15:45 -05:00
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
acd7a749ea remove duplicate entries 2017-10-24 10:11:08 -05:00
f076f5bff5 use nearestTerrainObjects for Shipwreck loot 2017-10-24 09:58:39 -05:00
24d059f0c9 malden underwater shipwrecks 2017-10-24 09:22:39 -05:00
04e922d544 correct inherit and malden wreck 2017-10-24 09:11:13 -05:00
70df6a8038 add malden blue barrel 2017-10-24 09:03:46 -05:00
029fa396be also add models for baked in map items 2017-10-24 08:58:52 -05:00
28042eb84a add large and small pipes to salvage 2017-10-24 08:53:09 -05:00
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
b71b86c4a7 move mod checks server side 2017-10-23 15:12:00 -05:00
d3d1e98310 missed something 2017-10-23 14:38:02 -05:00
0adc494b75 revert animation state test 2017-10-23 14:32:06 -05:00