Commit Graph
1174 Commits
Author SHA1 Message Date
Ziggeh 8afa97ff05 Merge pull request #405 from DAK-/patch-1
Swapped correct Dantooine travel point names.
2014-04-10 13:47:09 +02:00
DAK- e4b07bd51b Swapped correct Dantooine travel point names.
Imperial / Mining Outpost(s) travel point names on Dantooine were swapped - now correct.
2014-04-10 06:39:52 -05:00
Treeku e91362a12f Fixed most warnings 2014-04-10 11:52:09 +01:00
Treeku 62fea5c7cc Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-10 10:22:07 +01:00
Treeku 351910c04a Various command bugfixes 2014-04-10 10:18:20 +01:00
Treeku ce8bb06629 Removed options.cfg from gitignore
If this is removed, then people don't download it on their first clone of the core.

The best option is to either not modify it, uncheck it before committing things or add to the local ignore.
2014-04-10 09:16:55 +01:00
Seefo 38283f3351 Added house radials and fixed a lot calculation mistake 2014-04-09 21:23:12 -04:00
Seefo 68d5acb687 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-09 19:53:24 -04:00
Seefo 70b7507bb0 Added /movefurniture & /rotatefurniture, see ext.
The permission system thing I'm doing needs to be adjusted to the
Container permission system in the Engine.

To Light:  Please contact me in regards to this
2014-04-09 19:53:11 -04:00
Waverunner 931404bf3f Organized chat packets, disabled chat channels temporarily 2014-04-09 18:50:14 -04:00
Seefo 399cf7a535 Fixed combat commands and added a better check for combat commands 2014-04-09 16:32:15 -04:00
Seefo bf24229235 Added no-build checks when placing structures 2014-04-09 13:05:36 -04:00
Seefo 8025bc7ad0 Changes to housing, added real player lot count to character sheet 2014-04-09 11:56:56 -04:00
Seefo 46c2c1bf2c Preliminary housing 2014-04-08 23:47:59 -04:00
Waverunner 6e84d13341 Able to create a chat room now
Work still needs to be done on joining the rooms. However, you can
create custom rooms.
2014-04-08 19:42:38 -04:00
Waverunner 2c4356188a Fixed #396: Environmental Purge not granting. 2014-04-08 16:30:19 -04:00
Seefo f60583dff2 Temporary fix for certain commands being registered as combat commands even though the are not combat commands 2014-04-08 10:30:16 -04:00
Treeku 7eaed057c7 Fixed null exception 2014-04-08 06:16:33 +01:00
Treeku c7ea253620 Equipment cmd checks 2014-04-08 05:58:04 +01:00
Treeku 10e8c40507 checkLOS checks if obj1 is container of obj2 2014-04-08 05:53:01 +01:00
Treeku caca57b9b0 checkLineOfSight now checks if obj is in inventory 2014-04-08 05:42:19 +01:00
Treeku 74af0d5244 Forgot safety check 2014-04-08 05:09:18 +01:00
Treeku 9a18eb1eaa Few command improvements 2014-04-08 05:06:03 +01:00
Waverunner d5c9d226e3 Fixed #255: Evasion not exiting combat 2014-04-07 16:22:36 -04:00
Light2 ff8c22df7b command class cast fix 2014-04-07 20:44:20 +02:00
Light2 f2d42d750a fixed another command crash 2014-04-07 20:08:04 +02:00
Light2 ac39628b29 fixed command crash 2014-04-07 19:57:21 +02:00
Treeku 3928d58448 cmdSvc now accounts for different cmdTable struct 2014-04-07 18:43:31 +01:00
Treeku 69da7a4abd Commands now account for different cmdTable struct 2014-04-07 18:31:13 +01:00
Treeku 5dbabe6982 CommandSvc reads all command tables (in priority) 2014-04-07 16:42:19 +01:00
Treeku 0bbf98e209 All command tables now get read 2014-04-07 16:31:23 +01:00
Seefo f3e2498e62 Fixed some errors in the Command Service 2014-04-07 10:32:25 -04:00
Treeku 615a998384 Made cooldowns more efficient
Isn't really necessary for them to have their own thread each.

There's an old trick from a time before thread pools were possible: System.currentTimeMillis().
2014-04-07 14:47:56 +01:00
Levarrishawk 7216987f13 More unnecessary distractive Content Development 2014-04-07 05:50:42 -04:00
Treeku 3e69dedfff Merge pull request #399 from Ziggeh/master
Commands - Fixed getters and setter for targetType
2014-04-07 10:37:57 +01:00
Treeku 2a9988847f Script syntax error 2014-04-07 10:37:11 +01:00
Ziggeh c1486c27fe Commands - Fixed getters and setter for targetType 2014-04-07 11:29:19 +02:00
Treeku e4d676f43d Added example conversation script
Made a simpler script that uses less code, so it's easier to grasp.

In most cases there will only be one ProsePackage.

Copy-paste friendly.
2014-04-07 10:08:41 +01:00
Treeku fbbd59b0ec Merge pull request #398 from Ziggeh/master
Fixed variable name in CommandService
2014-04-07 10:00:19 +01:00
Ziggeh 75df58038c Revert "Jedi - Fixed Force Throw and Spark"
This reverts commit e05a5b4bf5.
2014-04-07 10:48:33 +02:00
Treeku c8aeff3d1d Add OutOfBand constructor for simpler conv scripts 2014-04-07 09:46:12 +01:00
Ziggeh f221f02b59 Commands - Fixed minor variable naming error 2014-04-07 10:33:12 +02:00
Treeku b6045f85dc Added alias "afk" for "toggleawayfromkeyboard" 2014-04-07 09:29:19 +01:00
Treeku 127b5083af Merge pull request #395 from CharonInferar/SurveyFix
Fix at suspicion of concurrency problem in surveyingservice
2014-04-07 08:54:31 +01:00
Ziggeh 40e35e1bdf Merge remote-tracking branch 'upstream/master' 2014-04-07 08:38:59 +02:00
Treeku d7b51621a1 Commands check LOS & distance if correct type 2014-04-07 07:19:31 +01:00
Treeku 577bbdb23b More command service improvements 2014-04-07 06:41:32 +01:00
Treeku 3eeb1bb7d5 Fixed unreachable code 2014-04-07 06:06:39 +01:00
Treeku 7008b1fd9e Few command improvements 2014-04-07 05:54:20 +01:00
Treeku 44c4d8632c Fixed issue with returning combat commands 2014-04-07 05:22:44 +01:00