Commit Graph

1199 Commits

Author SHA1 Message Date
vbawol
45b58a3ea6 debug location of player and new player object 2017-05-23 08:22:12 -05:00
vbawol
cec303ef6b fix BE kick # 49 since 1.70 2017-05-21 22:18:46 -05:00
vbawol
7351081b1b Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-05-21 16:24:44 -05:00
vbawol
db030763bd move this workaround to onDisconnect.
should handle removing any doppelgangers if the player did not log in
correctly.
2017-05-21 16:24:41 -05:00
vbawol
7471d44842 Merge pull request #754 from Ignatz-HeMan/experimental
Added Custom KeyMap
2017-05-21 15:45:02 -05:00
vbawol
759daa7ee5 remove unused functions 2017-05-20 22:51:28 -05:00
He-Man
d3c937ec8c Added Custom KeyMap 2017-05-19 22:46:28 +02:00
He-Man
220a728cd4 Added Custom KeyMap 2017-05-19 22:44:55 +02:00
He-Man
4123718a50 Added Custom KeyMaps 2017-05-19 22:44:02 +02:00
vbawol
f55b305a3e add exta debug to login fsm 2017-05-16 11:12:09 -05:00
vbawol
b036ed080c Merge pull request #752 from Ignatz-HeMan/patch-1
Force Save Player after Spawnpoint set
2017-05-12 07:03:09 -07:00
vbawol
92f6838c9d Merge pull request #753 from Ignatz-HeMan/patch-2
Added Start Leadout (with examples)
2017-05-12 07:02:38 -07:00
He-Man
e3fb007cf4 Added Start Leadout (with examples) 2017-05-12 15:57:36 +02:00
He-Man
0d0ee71dc4 Force Save Player after Spawnpoint set
If not force save, sometimes the Spawnpoint is not saved after death (if to close after set)
2017-05-11 21:59:59 +02:00
vbawol
e3335b411c changelog 2017-05-09 11:00:39 -05:00
vbawol
b6f91bd7cb Updated Jenkinsfile 2017-05-07 16:20:43 -07:00
vbawol
52d0c845e0 Updated Jenkinsfile 2017-05-07 15:48:09 -07:00
vbawol
3902d63b4f 0.5 b757 2017-05-02 12:48:48 -05:00
vbawol
9a7bc7b455 more cleanup and privates 2017-05-02 08:28:52 -05:00
vbawol
e8d136a293 fixed missing _display variable 2017-05-02 08:28:28 -05:00
vbawol
52db132ca9 more privates, cleanup and fixes. 2017-05-02 07:35:38 -05:00
vbawol
f101f66281 0.5 b756 2017-05-01 21:30:15 -05:00
vbawol
3f462d43ba more private updates 2017-05-01 19:23:00 -05:00
vbawol
0c035ae07c minor fixes and cleanup 2017-05-01 15:26:18 -05:00
vbawol
c1cfc3d297 fixed invaild format for missionComms params
Thanks to @LordGolias and his awesomeparser for catching it:
https://www.reddit.com/r/armadev/comments/681236/released_static_analyzer_for_sqf_and_integration/
2017-05-01 14:36:51 -05:00
vbawol
06fc5e3006 cleanup and bulk private array updates 2017-05-01 09:07:41 -05:00
vbawol
3f45e6fa81 fix deleteVehicle BE kick with sharks 2017-04-24 16:35:45 -05:00
vbawol
4dc6d45c8a Merge pull request #749 from Ignatz-HeMan/experimental
Fix for Weaponholder disappear to fast
2017-04-24 14:32:37 -07:00
He-Man
c6a1da84d0 Fix for Weaponholder disappear to fast
Empty WH disappear after 1 second.
If filling of WH takes longer than 1s, the WH disappears. This fix let
the Server create the WH, if objnull
2017-04-23 18:52:36 +02:00
vbawol
46a5d37026 0.5 b755 2017-04-22 10:25:14 -05:00
vbawol
c76e8bdb36 update private array 2017-04-22 09:29:59 -05:00
vbawol
5f08b41d0e Merge pull request #748 from Ignatz-HeMan/experimental
Fixed / updated and added Trader Missions
2017-04-22 07:24:52 -07:00
He-Man
eede62bd38 Fixed / updated and added Trader Missions
Ported to run it on Events instead fsm
2017-04-21 19:03:58 +02:00
vbawol
e098a78b4f move be folder back to fix case 2017-04-20 07:47:42 -05:00
vbawol
10f127fc27 move be folder to fix case 2017-04-20 07:47:13 -05:00
vbawol
b5584ffbfe fixed #747 2017-04-18 15:35:41 -05:00
vbawol
3317b8f25d 0.5 b754 2017-04-18 14:27:04 -05:00
vbawol
fe3c464472 fixed missing semicolons 2017-04-18 14:21:25 -05:00
vbawol
a5ec2fd78f Merge pull request #745 from Ignatz-HeMan/patch-7
Added "MeleeRod" (Fishing Rod) to Crafting Menu
2017-04-18 08:24:36 -07:00
He-Man
de4f703e23 Added "MeleeRod" (Fishing Rod) to Crafting Menu
1x Rope
1x Stick
1x Metal Scraps
2017-04-18 17:07:13 +02:00
vbawol
bb30ff9d63 Updated Jenkinsfile 2017-04-18 07:29:43 -07:00
vbawol
21c797c39b 0.5 b753 2017-04-17 12:07:29 -05:00
vbawol
c7c6342cd4 fixed BE kick from CBA 2017-04-17 12:07:08 -05:00
vbawol
0ed023c89d fixes for towing tractor from CUP 2017-04-17 11:48:21 -05:00
vbawol
4382aef326 Merge pull request #744 from EpochModTeam/release
sync changes from release to experimental
2017-04-17 09:21:44 -07:00
vbawol
2cdcf1c418 Merge pull request #740 from morgoth0/patch-3
Force enablesimulation on gates
2017-04-17 09:19:15 -07:00
vbawol
d77fb154ed Merge pull request #741 from morgoth0/patch-4
Force enablesimulation on gates
2017-04-17 09:19:09 -07:00
vbawol
586b6018f1 Merge pull request #742 from morgoth0/patch-5
Force enablesimulation on gates
2017-04-17 09:19:01 -07:00
vbawol
f88ab84b30 Merge pull request #743 from Ignatz-HeMan/patch-6
Fix if only HitPointDamage > 0
2017-04-17 09:18:44 -07:00
vbawol
662c401d84 Merge pull request #739 from morgoth0/patch-2
Force enablesimulation on bargates
2017-04-17 09:17:22 -07:00