projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-10 00:13:42 -04:00
Code Issues Projects Releases Wiki Activity
3,656 Commits 16 Branches 86 Tags
fa239ee9b2edf36ca0d868d554ab2f5ae6743c1b
Commit Graph
3656 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tacef Ine fa239ee9b2 Merge branch 'quality_assurance' of https://bitbucket.org/tacef/holocore into quality_assurance 2017-07-09 19:36:57 +02:00
Tacef Ine 92ebaa4fd1 Merged projectswg/holocore into quality_assurance 2017-07-09 19:36:49 +02:00
Tacef Ine ae222bc1c3 Merge branch 'quality_assurance' of https://bitbucket.org/tacef/holocore into quality_assurance 2017-07-09 19:36:46 +02:00
Tacef Ine 19289fedaf Refactored TradeService again 
Added Moneyhandling to TradeSession
Added sendToPartner function to TradeSession
Added StarterMoney to Charcreation
 2017-07-09 19:36:08 +02:00
Undercova PSWG 796cd46f93 Merged in Undercova/holocore_2 (pull request #487) 
Set entertainer flourish XP back to normal
 2017-07-07 16:54:58 +00:00
Undercova PSWG cd9e86bfad Set entertainer flourish XP back to normal 2017-07-07 16:45:58 +00:00
DaddyAP 1f5991d6d1 Merged in DaddyAP/holocore (pull request #486) 
Quality assurance
 2017-07-07 03:09:14 +00:00
dennise1975 810ef09711 Update to loot permissions 2017-07-06 21:42:38 -05:00
dennise1975 ecf28a2702 Fix for NPC inventory pops up instead of loot window 2017-07-06 21:31:51 -05:00
dennise1975 e45f3ecf89 Removed old code 2017-07-06 18:10:17 -05:00
dennise1975 64974ca462 Update to loot permissions 2017-07-06 16:46:09 -05:00
dennise1975 99f4c97550 Fix missing ) issue 2017-07-05 22:53:30 -05:00
dennise1975 1a8340c88e Null check update to loot permissions 2017-07-05 22:39:57 -05:00
dennise1975 dcb050067c Updates to loot permissions 2017-07-05 22:34:29 -05:00
dennise1975 9eefbf1fd0 Added Loot Permissions 2017-07-05 21:42:41 -05:00
Tacef Ine dd60dfe170 Merged projectswg/holocore into quality_assurance 2017-07-04 17:36:12 +02:00
DaddyAP 38c943710d Merged in DaddyAP/holocore (pull request #485) 
Fixed Flourish spam gets you insane amount of XP
 2017-07-04 02:14:35 +00:00
dennise1975 2da7764401 Fixed Flourish spam gets you insane amount of XP 2017-07-03 21:04:30 -05:00
DaddyAP 2f819f8066 Merged in DaddyAP/holocore (pull request #484) 
Fixed issue with equip not updating health/action.  Updated attribute parsing
 2017-07-03 19:58:35 +00:00
daddyap 0f09bb8797 Fixed modication rate 2017-07-03 14:48:17 -05:00
Tacef Ine a22ed6063d Added handling for remaining Packets 2017-07-01 15:57:41 +02:00
Tacef Ine daed790e4d Changed TradeService, TradeSessions and some Packets 2017-06-30 20:02:08 +02:00
Tacef Ine be8352ee40 Merged projectswg/holocore into quality_assurance 2017-06-30 17:37:13 +02:00
dennise1975 c974631544 Fixed issue with equip not updated health/action. Updated attribute parsing 2017-06-29 20:03:39 -05:00
DaddyAP baee2f04b7 Merged in DaddyAP/holocore (pull request #483) 
Replaced const regen rate with creature regen rate
 2017-06-29 22:09:37 +00:00
daddyap 12b17a746e Replaced const regen rate with creature regen rate 2017-06-29 15:03:59 -05:00
Tacef Ine c761fe2f9b Merged projectswg/holocore into quality_assurance 2017-06-29 20:26:03 +02:00
Tacef Ine 452c364f99 Refactored TradeService and TradeSession again 2017-06-29 19:53:10 +02:00
DaddyAP 1a7fad2fef Merged in DaddyAP/holocore (pull request #482) 
Standard Skillmod Functionality (Luck, Const, Stam...)
 2017-06-29 02:23:32 +00:00
dennise1975 3e5516ff77 Fixed indent and added check for array length 2017-06-28 21:11:06 -05:00
dennise1975 adc19aa714 Updated Standard Skillmod Functionality 2017-06-28 19:53:45 -05:00
dennise1975 0add0f92ee Updated Standard Skillmod Functionality 2017-06-28 19:06:41 -05:00
Tacef Ine 4dd71596c2 Refactored TradeSession and TradeService a bit 2017-06-28 20:38:27 +02:00
dennise1975 9778cb6f73 Standard Skillmod Functionality (Luck, Const, Stam...) 2017-06-27 20:45:42 -05:00
Tacef Ine d00a55fb6a Removed unused ObjectController 
Moved Tradepartner to CreatureObject
 2017-06-27 20:49:02 +02:00
Tacef Ine b97212d1ac Added Trading 2017-06-27 18:22:27 +02:00
dennise1975 93abb6ddf0 Removed debug line 2017-06-26 20:07:11 -05:00
dennise1975 fbb8331b15 Added Standard Skillmod Functionality (Luck, Const, Stam...) 2017-06-26 19:46:34 -05:00
Tacef Ine e8a5e24d49 Merged projectswg/holocore into quality_assurance 2017-06-26 21:21:19 +02:00
Obique PSWG 5535e32dfc Updated build.gradle to output print test information once 2017-06-24 20:23:14 -05:00
Obique PSWG b13fb15490 Wandered in the dark until I figured out what broke zone-in 2017-06-24 20:22:50 -05:00
Obique PSWG d45d218562 Trying something new in regards to vehicles 2017-06-24 20:22:24 -05:00
Obique PSWG d1cb86ec7b Reset object awareness code to previous commit 2017-06-24 15:10:36 -05:00
Obique PSWG 3966df4b66 Changed data transforms to be about the vehicle instead of the creature 2017-06-24 13:22:43 -05:00
Obique PSWG 14a12920be Added string identifiers to assertions in BuildingObject 2017-06-24 13:16:49 -05:00
Obique PSWG f695da97f1 Fixed encode in Equipment 2017-06-24 11:41:19 -05:00
Obique PSWG 371309a4c9 Fixed vehicle movement and added a test case for it 2017-06-20 07:46:46 -05:00
Obique PSWG b33dda9598 Added CreatureObject.isStatesBitmask() and a test case for testing vehicle mounts 2017-06-20 07:08:39 -05:00
Obique PSWG 42a4660dfb Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2017-06-19 21:04:42 -05:00
Obique PSWG eae94373f2 Added assertions for TestObjectAwareness and added slotted objects to awareness 2017-06-19 21:04:06 -05:00