Commit Graph
1808 Commits
Author SHA1 Message Date
CharonInferar ffe4dd4aaf Fix of Devservice error insertion 2014-05-04 02:20:38 +02:00
CharonInferar 8173272296 upstream merge 2014-05-04 01:46:37 +02:00
CharonInferar d4ae4a4fbb ngepublic difference 2014-05-04 01:37:16 +02:00
Levarrishawk 3f2a525636 Reorganized Static scripts
Static Spawn scripts now branched out in their planet's subfolder.
2014-05-03 19:36:48 -04:00
Waverunner 44678d8c18 Merge 2014-05-03 18:10:55 -04:00
Waverunner 7860a8b668 Added Tracking Droids, refined Bounty Missions
A few things need to be done like the stacks for the droids. Right now
they won't be destroyed from inventory until this is implemented.
2014-05-03 18:03:00 -04:00
Treeku e161871ee4 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 20:21:02 +01:00
Treeku 7e1e0bb4ec Corrected y to z, altered how chars disappear 2014-05-03 20:19:57 +01:00
Treeku 62bc6a5771 StaticService now reads from planetName folders
Put any scripts in there, named anything.

They could be separated into questlines, such as Jabbas Themepark, Rebel
Themepark, Imperial Themepark, lifeday, corellia themepark.  They can
also be names of planet areas.

This makes it easier for multiple people to work on different spawns on
the same planet and makes the spawns for a particular subject easy to
find.
2014-05-03 20:18:00 +01:00
Treeku 631be2ef30 Fixed pvpStatus on neutral factions 2014-05-03 19:59:14 +01:00
Light2 727bd79ecf Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 19:57:14 +02:00
Light2 815521c2fe Implemented agressive AI and assist behaviour, added health regen task to ai
Use the prima guide to get assist range of mobs
2014-05-03 19:57:02 +02:00
Treeku 464c10ddd7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 17:37:43 +01:00
Light2 ba6d2652b9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 18:12:47 +02:00
Light2 f05da881ab Fixed odb bugs, fixed some null pointers 2014-05-03 18:12:27 +02:00
Treeku 0c7b11068a Fixed some vehicles issues 2014-05-03 17:12:24 +01:00
CharonInferar 4eac2608e0 Merge pull request #583 from CharonInferar/DynamicWorldSpawnUpdate
Experiments with dynamic world spawns, force sensitive spawns added
2014-05-03 16:51:38 +02:00
CharonInferar e73ecac963 Merge remote-tracking branch 'origin/master' into DynamicWorldSpawnUpdate 2014-05-03 16:34:14 +02:00
Treeku dba74a6ebc Fixed calculatePvpStatus 2014-05-03 15:32:07 +01:00
CharonInferar 05034b4d83 group spawn distances added
Force sensitive groups now spawn at a distance to each other in random
group member numbers.
Loot added to FSs
2014-05-03 16:31:04 +02:00
Treeku 883163768d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 06:31:23 +01:00
Treeku 87da836146 Fixed tangibles in weapon-slot issue 2014-05-03 06:17:34 +01:00
CharonInferar 488e669290 More work on parameters of group members 2014-05-03 04:52:52 +02:00
Treeku 807fd829c0 Merge pull request #578 from Mesagoppinmypants/patch-46
Bad Odds Abilities Now Grant at Correct Levels
2014-05-03 03:08:13 +01:00
Treeku 5156951755 Merge pull request #579 from Mesagoppinmypants/patch-47
Shoot First Abilities Now Grant at Correct Levels
2014-05-03 03:07:48 +01:00
Treeku d0988c687f Merge pull request #580 from Mesagoppinmypants/patch-48
Supply Drop Abilities Now Grant at Correct Levels
2014-05-03 03:07:28 +01:00
Mesagoppinmypants 5a012f28b7 Supply Drop Abilities Now Grant at Correct Levels 2014-05-02 22:05:38 -04:00
Mesagoppinmypants 818bce44fc Shoot First Abilities Now Grants at Correct Levels
These are now the correct levels. (checked from game client)
2014-05-02 21:56:45 -04:00
Mesagoppinmypants e7084fcd0f Bad Odds Ability Now Grants at Correct Levels
These are now the correct levels. (checked from game client)
2014-05-02 21:50:56 -04:00
CharonInferar 4752de7e74 fix 2014-05-03 00:58:56 +02:00
CharonInferar 1833f821fa Taking into account fixed member groups 2014-05-03 00:42:25 +02:00
Treeku 9cb7b38aac Fixed strength_modified.py 2014-05-02 22:52:19 +01:00
Treeku e7dcca5c14 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 22:08:54 +01:00
Treeku ff827a2902 Fixed null error 2014-05-02 22:08:13 +01:00
Treeku cae4b958a9 Merge pull request #574 from Mesagoppinmypants/patch-45
Removed Reset Expertise From Frog
2014-05-02 22:01:42 +01:00
Treeku 0a4001d504 Merge pull request #571 from tacef/master
Added NPC scripts( No conversations yet)
2014-05-02 22:01:08 +01:00
Mesagoppinmypants 8b1f20cdce Removed Reset Expertise From Frog
This is no longer needed now that you can respec expertise properly from NPC.
2014-05-02 16:50:09 -04:00
CharonInferar 9c8220bb0c Merge remote-tracking branch 'origin/master' into DynamicWorldSpawnUpdate 2014-05-02 22:32:58 +02:00
tacef 47da295c00 Altered recruiters to fit faction changes 2014-05-02 22:27:40 +02:00
Treeku 57dcb72718 Additional null checks 2014-05-02 21:24:37 +01:00
CharonInferar b33062c67a Merge remote-tracking branch 'origin/master' into DynamicWorldSpawnUpdate 2014-05-02 22:21:10 +02:00
CharonInferar 081a30b7da dynamic spawn scripts added
Commit frequency caused by ongoing odb refactoring
2014-05-02 22:19:30 +02:00
Treeku 78569244b8 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 21:15:57 +01:00
Treeku cdbf244b27 Reset pvp bitmask on disconnect 2014-05-02 21:14:49 +01:00
Treeku 5e522cf03b Added getObjectByFirstName null checks 2014-05-02 21:12:45 +01:00
Treeku f7fc2dbb2e Add gmflag bypass, fix char delete on wiped odb
Put in nge.cfg: ADMIN=1
2014-05-02 21:04:52 +01:00
CharonInferar e1a87732a0 Merge remote-tracking branch 'origin/master' into DynamicWorldSpawnUpdate 2014-05-02 21:07:29 +02:00
CharonInferar c7eb10b5f2 city zoning fix 2014-05-02 21:05:32 +02:00
Light2 5d4bf6a0a2 odb fix 2014-05-02 20:51:44 +02:00
Treeku b4cb399bc1 Temp patchfix for creating chars issue
Will fix it properly soon, atm everyone needs to be able to create
chars.
2014-05-02 20:33:01 +02:00