projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity
1,688 Commits 11 Branches 4 Tags
fac4c7fe3b0ff8ca0debff4e1f1e35a1e8741be3
Commit Graph
83 Commits
Author SHA1 Message Date
Treeku 73f8ad85bc useObject adds the UseTarget 2014-04-29 04:49:42 +01:00
Treeku 9fc30d10c4 Removed DeedObject, made buildings simpler 2014-04-28 22:07:32 +01:00
Waverunner 14ce2f5a8d Merge pull request #531 from ProjectSWGCore/Wave_Missions 
Delivery Missions
 2014-04-25 17:29:42 -04:00
CharonInferar e877a44713 Jedi Loot templates inserted 
Buried treasure loot realized
 2014-04-25 01:49:50 +02:00
Waverunner 8e481be783 Added accepting for missions, added first phase for delivery missions 2014-04-24 17:46:28 -04:00
CharonInferar 05be4b0620 Merge remote-tracking branch 'origin/master' into TreasureMaps 2014-04-24 15:24:40 +02:00
CharonInferar 42724a76d6 Updated Housing service 
Housing service detects if new citizen builds structure
and adds him as citizen to the city
 2014-04-24 01:20:02 +02:00
CharonInferar fbc4ddc85f Merge remote-tracking branch 'origin/master' into PlayerCities 2014-04-23 22:06:21 +02:00
Seefo 064e733cba Fixed vehicle passenger stuff 2014-04-23 00:11:26 -04:00
CharonInferar 173c7e6674 Continued work on terminal 
Differentiated taxes and ranks
 2014-04-22 19:24:15 +02:00
CharonInferar c02f7d5e86 Worked on City Maintenance Console 
Implementation of SUI windows and menus
 2014-04-22 03:46:51 +02:00
CharonInferar 02fafa5e73 Player city service methods added 
added administrative methods
 2014-04-21 22:56:40 +02:00
CharonInferar 14f774447f More Treasure map work 
Mysterious disk radials implemented
Treasure guards added
 2014-04-21 03:23:07 +02:00
Treeku 7d40523833 Various vehicle fixes 2014-04-19 00:39:38 +01:00
Treeku e8a1959f9d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java
 2014-04-18 21:10:53 +01:00
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
Seefo b0a4204a49 Fixed an issue where saber reflect would not be granted upon speccing it in expertise - fixed a vehicle radial bug 2014-04-16 13:27:12 -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
Treeku 6d38e2badc Tidied radials 2014-04-13 21:46:51 +01:00
CharonInferar 53c1ea65e9 merge conflict fix 2 2014-04-13 20:39:36 +02:00
CharonInferar 27137c79c7 merge conflict fix 2014-04-13 20:13:20 +02:00
Seefo 1b1294136a Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates 2014-04-13 13:37:54 -04:00
Light2 cf9bcf66f9 Fixed vehicles 2014-04-13 17:17:25 +02:00
CharonInferar 343569ed38 Swoop is mountable for further tests 2014-04-13 14:50:19 +02:00
CharonInferar 13495e3f35 first work on swoop deed 2014-04-13 14:50:18 +02:00
CharonInferar fa00c85290 Swoop is mountable for further tests 2014-04-13 03:50:45 +02:00
CharonInferar 9f72afee01 first work on swoop deed 2014-04-13 02:22:45 +02:00
CharonInferar 18c184ea79 Cleanup 2014-04-12 21:52:08 +02:00
CharonInferar 81f77b06dd All structure terminal menus and functionalities implemented 
Dropped items add nowto the buildings itemlist
Some databse work for permissions
 2014-04-12 21:52:07 +02:00
CharonInferar 4df7274ac9 Structure terminal work 
Creation of player_house_deed class
terminal menus made
py scripts arranged
 2014-04-12 21:52:07 +02:00
CharonInferar a1370a9b60 Harvesters introduced 
Working harvesters and generators
Big update
 2014-04-11 02:25:07 +02:00
CharonInferar ebe705f338 Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-10 18:51:02 +02:00
CharonInferar 4bb055ca19 Rare loot system stage added 
Rare loot system stage in effect for every loot session.
Added legendary,exceptional,rare loot chests
 2014-04-10 17:04:52 +02:00
CharonInferar 221f9a93fc Loot radial and power crystal items 
Connected loot radial to corpse. Made powercrystal scripts.
Allowed the mobile scripts to drop loot now.
 2014-04-10 04:22:54 +02:00
Seefo 38283f3351 Added house radials and fixed a lot calculation mistake 2014-04-09 21:23:12 -04:00
CharonInferar abe8d6475f Merge remote-tracking branch 'origin/master' into LootSystem 
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
 2014-04-10 00:38:13 +02:00
CharonInferar 118d622c6d More Junk, Krayt Pearls added 
The System has been more generalized, but also deals with special cases
of Krayt Pearls/Power Crystals.
More itemscripts created
 2014-04-09 21:16:28 +02:00
Seefo 46c2c1bf2c Preliminary housing 2014-04-08 23:47:59 -04:00
CharonInferar c6836dead9 Clean up 
SurveyCommand is now done fully over the Jython interface consistent to
client command handling
 2014-04-06 14:49:22 +02:00
CharonInferar a5ba92cbf1 Bug fix 
Picking up sampling a previously sampled resource, will add the stack to
the according container.
 2014-04-06 14:27:55 +02:00
CharonInferar e448a41bb0 Merge remote-tracking branch 'origin/master' into ResourceSpawn 
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
	src/services/command/CommandService.java
 2014-04-06 03:59:55 +02:00
CharonInferar 065fe79945 Clean up of code 
Cleaned up some classes
Moved functionalities into more appropriate methods/classes
 2014-04-06 02:08:55 +02:00
CharonInferar 531acac7c6 More quality assurance work 
- Resource container split/join
- Surveying test runs
- Balancing
 2014-04-02 23:28:08 +02:00
Light2 4c5ff93385 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-02 18:12:20 +02:00
Light2 b245efdce6 Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check 2014-04-02 18:12:08 +02:00
Waverunner 57922d6892 Fixed #336, Fixed #320, able to use basic dance 2014-04-01 17:26:46 -04:00
Light2 760e9726a9 more work on conversations 2014-04-01 15:31:14 +02:00
CharonInferar 5345e8c031 Work on bikes 
Further work will be in another branch
 2014-03-31 19:53:55 +02:00
CharonInferar e692120b8f Surveying debugging 
Improved surveying
 2014-03-31 19:50:02 +02:00