Commit Graph
1387 Commits
Author SHA1 Message Date
CharonInferar 9526eee9d6 Object-orientated approach to storing the loot info 2014-04-08 02:12:36 +02:00
CharonInferar 0eedd5cc5f Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-08 00:00:57 +02:00
CharonInferar ce183ad337 merge conflict resolve 2014-04-07 23:59:42 +02:00
CharonInferar c78b3b553e Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/services/command/BaseSWGCommand.java
	src/services/command/CommandService.java
2014-04-07 23:57:34 +02:00
CharonInferar 06fe72e647 Implementation of LootService
First steps
2014-04-07 23:49:51 +02: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
TreekuandCharonInferar f70811f6b7 CommandSvc reads all command tables (in priority) 2014-04-07 18:56:35 +02:00
TreekuandCharonInferar 7d4291b16e All command tables now get read 2014-04-07 18:56:34 +02:00
SeefoandCharonInferar fa90012d5c Fixed some errors in the Command Service 2014-04-07 18:56:34 +02:00
TreekuandCharonInferar 9a8975dcbc 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 18:56:33 +02:00
LevarrishawkandCharonInferar f7bcd6416d More unnecessary distractive Content Development 2014-04-07 18:56:33 +02:00
TreekuandCharonInferar 9a141802b9 Script syntax error 2014-04-07 18:56:32 +02:00
ZiggehandCharonInferar b03a2d7051 Commands - Fixed getters and setter for targetType 2014-04-07 18:56:32 +02:00
TreekuandCharonInferar 4b11146f78 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 18:56:31 +02:00
ZiggehandCharonInferar c99e7c4bff Revert "Jedi - Fixed Force Throw and Spark"
This reverts commit e05a5b4bf5.
2014-04-07 18:56:31 +02:00
TreekuandCharonInferar 7fae180c9d Add OutOfBand constructor for simpler conv scripts 2014-04-07 18:56:30 +02:00
ZiggehandCharonInferar e9f4f39fd0 Commands - Fixed minor variable naming error 2014-04-07 18:56:30 +02:00
TreekuandCharonInferar 3bff39bd2e Added alias "afk" for "toggleawayfromkeyboard" 2014-04-07 18:56:29 +02:00
TreekuandCharonInferar 9b87eb0f59 Commands check LOS & distance if correct type 2014-04-07 18:56:29 +02:00
TreekuandCharonInferar 51f89dced7 More command service improvements 2014-04-07 18:56:28 +02:00
TreekuandCharonInferar 4de1120376 Fixed unreachable code 2014-04-07 18:56:28 +02:00
TreekuandCharonInferar 144e483769 Few command improvements 2014-04-07 18:56:28 +02:00
TreekuandCharonInferar 3ff8d7b940 Fixed issue with returning combat commands 2014-04-07 18:56:27 +02:00
TreekuandCharonInferar 78d0f90ee7 Fixed invalid postures/states problem 2014-04-07 18:56:27 +02:00
TreekuandCharonInferar e3cf93fbb1 Fixed float error properly 2014-04-07 18:56:26 +02:00
TreekuandCharonInferar 78b6b52740 Fixed cast exception (maxRangeToTarget is a float) 2014-04-07 18:56:26 +02:00
TreekuandCharonInferar 8cbf80b2ce Fixed a few more errors 2014-04-07 18:56:25 +02:00
TreekuandCharonInferar 4aa3b7058a Fixed byte adding error in command reading 2014-04-07 18:56:25 +02:00
TreekuandCharonInferar b7eef0cf35 Fixed duplicate maxRangeToTargets 2014-04-07 18:56:24 +02:00
TreekuandCharonInferar 9dded09432 Fixed a few more things 2014-04-07 18:56:24 +02:00
TreekuandCharonInferar 131841520b Fixed a few things 2014-04-07 18:56:23 +02:00
TreekuandCharonInferar 8398a2dc56 Cooldowns only added if they are more than a 1 sec
It's probably not worth it otherwise.
2014-04-07 18:56:23 +02:00
TreekuandCharonInferar 0bf30444fc Fixed null errors 2014-04-07 18:56:22 +02:00
Bronco69andCharonInferar 5516a55762 fix in Medic expertise
realized that the health buff is linked to the stamina box in expertise
http://i.imgur.com/hW0L0zp.jpg
ive chosen CL48 for mark 2 because you get initially mark 1 at CL48 too.
2014-04-07 18:56:22 +02:00
Bronco69andCharonInferar 01fedd5cdb fixes in Jedi expertise
multi expertise commands fixed
2014-04-07 18:56:21 +02:00
CharonInferar bc8172a008 Fix at suspicion of concurrency problem in surveyingservice 2014-04-07 18:56:21 +02:00
ZiggehandCharonInferar 29b6738852 Jedi - Fixed Force Throw and Spark 2014-04-07 18:56:20 +02: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