Light2
c3ad54ac8f
more work on bazaar categories
2014-06-02 00:08:22 +02:00
Light2
e8b6a46701
fixed item categories
2014-06-01 01:49:48 +02:00
Light2
58385aeb4c
fixed waypoint mail attachments
2014-05-31 20:22:57 +02:00
Light2
bd8d05001f
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-30 19:38:29 +02:00
Light2
5c0297c2fc
Minor vendor fixes
2014-05-30 19:38:13 +02:00
Waverunner
45c91104e0
Added more guild features, fixed re-joining chat channels on relog
...
Changed guilds to be saved to a TreeMap instead of solely the SWGSet.
Fixed uses string
Added UnknownAbilityPacket (was sent for every new ability, doesnt seem
to do anything)
Lots of guild improvement/features added.
2014-05-29 13:51:40 -04:00
Treeku
865db149ad
Fixed loads of warnings
2014-05-14 15:51:25 +01:00
Treeku
60eee0d4dd
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-11 15:56:36 +01:00
Treeku
7fd08bc7ad
Baseline changes, cleaned some things
2014-05-11 09:54:50 +01:00
Waverunner
b5344eab07
Added bindLocation variable, clone location shows bind spot in yellow, fixed incap and db messages
2014-05-10 16:38:59 -04:00
Waverunner
7a6360e235
Comm message when accepting bounties, basework for probe droids
2014-05-01 16:14:20 -04:00
Treeku
02ff93312e
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
scripts/houses/player_house_corellia_large_style_01.py
scripts/houses/player_house_corellia_large_style_02.py
src/resources/objects/tangible/Deed.java
src/resources/objects/tangible/Harvester_Deed.java
src/resources/objects/tangible/Player_House_Deed.java
src/services/PlayerService.java
src/services/object/ObjectService.java
2014-04-29 05:04:23 +01:00
Treeku
985cd6b779
Moved buff and skillmod objects
2014-04-29 03:56:52 +01:00
Treeku
de296b4db2
More removed DeedObject stuff
...
Also changed attachments to use ids instead of objects. Best to use Ids
otherwise issues such as objects not deleting successfully occur, if not
outright causing persistence errors during saving.
2014-04-29 03:48:32 +01:00
Light2
97743da840
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-28 16:17:40 +02:00
Light2
a740e0c6ca
bazaar retrieve item fix
2014-04-28 16:17:31 +02:00
Waverunner
14ce2f5a8d
Merge pull request #531 from ProjectSWGCore/Wave_Missions
...
Delivery Missions
2014-04-25 17:29:42 -04:00
Waverunner
5e240b00fa
Added aborting for missions, finished delivery missions, cleaned up code
2014-04-25 17:26:48 -04:00
Waverunner
8e481be783
Added accepting for missions, added first phase for delivery missions
2014-04-24 17:46:28 -04:00
Waverunner
a00f637f13
More randomization's for delivery missions, more work on objectives
2014-04-22 17:54:05 -04:00
Waverunner
6184d21420
Merge remote-tracking branch 'origin/master' into Wave_Missions
...
Conflicts:
src/main/NGECore.java
src/protocol/swg/chat/ChatFriendsListUpdate.java
src/services/MissionService.java
2014-04-19 18:33:02 -04:00
Ziggeh
9b6127402d
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-19 15:15:21 +02:00
Treeku
b4a6ac5334
Fixed a chat crash bug
2014-04-19 08:30:12 +01:00
Treeku
b050065649
Languages implemented, added OOB to spatialchat
2014-04-19 03:27:08 +01:00
Waverunner
9252ebaaea
Added Enter & Leave Messages for ChatRooms as well as info stats for the
...
room
2014-04-17 16:01:12 -04:00
Ziggeh
7f796d211e
Created HitType datatable and removed unused code
2014-04-17 12:47:48 +02:00
Waverunner
ff6c2d7d4c
Added GroupChat, PlanetChat, and basic chat channels
2014-04-16 16:52:11 -04:00
CharonInferar
b36081e630
Improvements on loot system
...
Loot icon
Loot system messages
2014-04-16 17:18:59 +02:00
CharonInferar
37dc1a45c2
Loot window added
...
Loot window implemented
Loot info effect added
2014-04-16 05:23:30 +02:00
Light2
0ec275cf7b
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/services/bazaar/BazaarService.java
2014-04-15 01:12:44 +02:00
Light2
bd0a30aa96
Added basic bazaar functionality - see extended
...
Categories are not working right now, Auctions and Vendors are not yet
implemented
2014-04-15 01:11:33 +02:00
CharonInferar
afcec36cc1
second commit
2014-04-13 22:46:02 +02:00
Treeku
7cee1990b5
Serial number uses attribute
2014-04-13 16:33:18 +01:00
Treeku
60972655dd
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/services/command/CommandService.java
src/services/object/ObjectService.java
2014-04-13 00:49:58 +01:00
Treeku
eeb1ea54af
Flytext, System, Comms now use ProsePackages
2014-04-13 00:27:02 +01:00
Light2
b2edbb2104
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-12 15:23:22 +02:00
Light2
acbc1a7c74
minor changes
2014-04-12 15:23:14 +02:00
CharonInferar
090a15de84
Merge remote-tracking branch 'origin/master' into Housing
2014-04-12 02:47:01 +02:00
CharonInferar
7cd8d8d742
All structure terminal menus and functionalities implemented
...
Dropped items add nowto the buildings itemlist
Some databse work for permissions
2014-04-12 02:30:17 +02:00
Light2
e5ed3a356c
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/main/NGECore.java
2014-04-11 23:53:15 +02:00
Light2
ea8bc53394
Started work on bazaar
2014-04-11 23:47:03 +02:00
Waverunner and CharonInferar
8c76695a9f
Added chat channels for all planets (system and planetary chat)
2014-04-11 02:25:07 +02:00
Waverunner and CharonInferar
5854eaea00
Refactored ChatRoom to store Strings for lists instead of CreatureObject
2014-04-11 02:25:05 +02:00
Waverunner
f7bac13377
Added chat channels for all planets (system and planetary chat)
2014-04-10 18:13:45 -04:00
Waverunner
b8b33a5019
Refactored ChatRoom to store Strings for lists instead of CreatureObject
2014-04-10 14:45:00 -04:00
Treeku
e91362a12f
Fixed most warnings
2014-04-10 11:52:09 +01:00
Waverunner
931404bf3f
Organized chat packets, disabled chat channels temporarily
2014-04-09 18:50:14 -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
Light2