DaddyAP
7b5895459d
Merged projectswg/holocore into quality_assurance
2017-07-22 10:43:27 -05:00
dennise1975
98fcbeb330
Fixed indention
2017-07-20 20:59:13 -05:00
Obique PSWG
b4cf9bf5be
Minor bugfixes to TradeService and TradeSession
2017-07-20 11:43:17 -05:00
Tacef Ine
47bc6296be
Merged in tacef/holocore (pull request #493 )
...
Changed session to tradeSession for continuity
2017-07-20 16:34:11 +00:00
Tacef Ine
09f2a389c6
Removed unused import and unused function
2017-07-20 18:33:18 +02:00
Tacef Ine
6508217b94
Removed trailing whitespace
2017-07-20 18:17:06 +02:00
daddyap
1ae0cdcddb
Remvoed whitespace
2017-07-20 09:29:03 -05:00
dennise1975
8803b88605
Remove whitespace
2017-07-19 21:25:17 -05:00
dennise1975
64a0597531
Fixed indentation
2017-07-19 21:22:10 -05:00
dennise1975
d30e3c47ee
Remove enum
2017-07-19 18:51:43 -05:00
Tacef Ine
1f9cbabfd3
Removed Error Message for trading no trade item
2017-07-19 18:14:14 +02:00
Tacef Ine
c37f9ed6d9
Removed warning for trading equipped Item
2017-07-19 18:06:32 +02:00
Tacef Ine
a513d17a80
Removed accidently committed files
2017-07-19 18:03:41 +02:00
dennise1975
9fe268ad81
Updated Race enum
2017-07-18 20:27:59 -05:00
Tacef Ine
41aa3ce16d
Added back the Message for Equiped item in tradewindow
2017-07-18 20:17:31 +02:00
Tacef Ine
5d87cea619
Removed unused Import
2017-07-18 20:15:25 +02:00
Tacef Ine
0dd020936b
Added Error Message to NoTradeabort
2017-07-18 19:53:46 +02:00
Tacef Ine
ae4fb408c5
Merged projectswg/holocore into quality_assurance
2017-07-18 18:59:07 +02:00
Tacef Ine
a2d7c76991
Changed session to tradeSession for continuity
...
Trading an Equipped Item no longer aborts the Trade
Added a Warning when trading an Equipped Item
Trading a No Trade Item will abort the Trade
Added a notifcation when attemptint to trade a NoTrade Item
Removed additional blanklines in Securetrade ObjController
2017-07-18 18:58:47 +02:00
Tacef Ine
8a7a2ea4cb
Merged in tacef/holocore (pull request #492 )
...
Fixed BeginTradeMessage and SUI Exception
2017-07-17 17:07:23 +00:00
Tacef Ine
4622170407
Changed Log.d for tradebegin
2017-07-17 19:03:44 +02:00
Tacef Ine
7ee6329326
Removed AtomicBoolean's
2017-07-17 18:58:25 +02:00
Tacef Ine
f5ef4adc1d
Merged projectswg/holocore into quality_assurance
2017-07-17 18:35:46 +02:00
Tacef Ine
b1a7dc4fb0
Fixed BeginTradeMessage and SUI Exception
2017-07-17 18:35:10 +02:00
dennise1975
5afe792008
Fixed alignment
2017-07-16 22:13:45 -05:00
dennise1975
74d6eea54a
Changed Race request to enum
2017-07-16 22:02:59 -05:00
dennise1975
5ec4416c98
Changed Race request to enum
2017-07-16 21:59:47 -05:00
dennise1975
d2135a22b4
Revert "Changed Race request to enum"
...
This reverts commit 71fbdf39ab
2017-07-16 21:51:24 -05:00
dennise1975
71fbdf39ab
Changed Race request to enum
2017-07-16 21:50:40 -05:00
dennise1975
6edc481b62
Revert "Changed Race request to enum"
...
This reverts commit 627c81787e
2017-07-16 21:35:21 -05:00
dennise1975
627c81787e
Changed Race request to enum
2017-07-16 21:28:03 -05:00
DaddyAP
b157efc12d
Merged projectswg/holocore into quality_assurance
2017-07-16 18:06:01 -05:00
dennise1975
e6b0fac587
Fixed Column names for racial stats
2017-07-16 18:04:18 -05:00
Tacef Ine
58026f4191
Merged in tacef/holocore (pull request #490 )
...
Added Trading
2017-07-14 19:12:28 +00:00
Tacef Ine
6971887611
Fixed Inventorypermissions
2017-07-14 21:05:25 +02:00
Tacef Ine
67136ff0de
Change the handling of Notrade and equipped Items for Trading
2017-07-14 18:52:57 +02:00
Tacef Ine
320dd29d03
Added Check for Equiped Items
2017-07-14 18:37:42 +02:00
Tacef Ine
770bb0b6b3
Changed the a Warning Log entry to be more descriptive
...
Removed a comment
2017-07-14 18:01:44 +02:00
Tacef Ine
85818d6361
Fixed an unused Import
...
Fixed Debug log
2017-07-14 17:56:23 +02:00
Tacef Ine
5aebdcb7d2
Refactored TradeService
...
Refactored TradeSession
2017-07-14 17:50:32 +02:00
Tacef Ine
d46f90e3f3
Removed extra Whitespace
2017-07-13 18:54:02 +02:00
Tacef Ine
938f5cfe6d
Removed unneeded this.
2017-07-12 18:35:24 +02:00
Tacef Ine
47a3510f71
Added syncronized to itemlists
2017-07-12 18:34:48 +02:00
Tacef Ine
4faf94e128
Fixed InventoryPermissions
...
Cleaned up TradeService
Fixed TradeSession
2017-07-11 20:14:21 +02:00
Undercova PSWG
d985c881c4
Added props database (entertainer)
2017-07-10 22:41:19 +00:00
Undercova PSWG
315028f046
Added instrument database
2017-07-10 22:38:08 +00:00
Mads Boddum
9819ee32a2
Added check to prevent mounting the same mount more than once
2017-07-10 22:15:51 +02:00
Tacef Ine
645464553a
Merge branch 'quality_assurance' of https://bitbucket.org/tacef/holocore into quality_assurance
2017-07-10 21:17:05 +02:00
Tacef Ine
3a51476903
Added Itemtransfer
2017-07-10 21:14:58 +02:00
Tacef Ine
8fd3aecc62
Merged projectswg/holocore into quality_assurance
2017-07-10 20:31:33 +02:00
DaddyAP