projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity
1,717 Commits 11 Branches 4 Tags
a3d4bb326cad424bcf960bb576baf61a69a062ce
Commit Graph
1098 Commits
Author SHA1 Message Date
CharonInferar a3d4bb326c merge conflict 2014-04-30 20:30:25 +02:00
CharonInferar 4f2b50fa97 merge conflict 2014-04-30 19:58:18 +02:00
CharonInferar 2a23dd8076 merge conflict resolve 2014-04-30 19:45:12 +02:00
CharonInferar ee5be99699 Disabled automatic shuttleport placement in sandbox city 2014-04-30 18:44:30 +02:00
Treeku 6d88bcb90a Static building criteria fixes 2014-04-30 10:44:42 +01:00
Treeku 1663091d95 Static buildings also spawn cells 2014-04-30 01:01:14 +01:00
Treeku 086ab7cd02 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-29 23:37:05 +01:00
Treeku fac4c7fe3b Moved Loot objs out of baseline dir 2014-04-29 23:04:53 +01:00
Waverunner d2c77d8906 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-29 17:49:19 -04:00
Waverunner ea9a1fdd82 Added setting of player bounties 
Mission for bounties still needs to be ironed out so you won't see them
in the bounty mission terminal, however you can now set bounties for
players.
 2014-04-29 17:49:03 -04:00
Treeku 77515ecae4 Added all collection messages 2014-04-29 22:36:28 +01:00
Treeku f343c9814f Fixed collection messages 2014-04-29 21:20:37 +01:00
Treeku 6530fb8cbd Minor static object change 2014-04-29 21:01:47 +01:00
Treeku 2de5cbe362 Static object and doid fixes 2014-04-29 19:41:05 +01:00
Treeku 8fa9be6030 Revert "Temp Fix to Static Spawns" 
This reverts commit bfa32b533f.
 2014-04-29 18:33:00 +01:00
Levarrishawk bfa32b533f Temp Fix to Static Spawns 
Temporary fix for the handling of static spawned objects.
 2014-04-29 09:27:57 -04:00
Treeku 3368682443 Static objects now use doids 2014-04-29 08:36:44 +01:00
Treeku 29e78e1d0d Made doids more precise 2014-04-29 08:35:18 +01:00
Treeku af64aae9f1 Fixed merge clashes 2014-04-29 05:33:16 +01: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 73f8ad85bc useObject adds the UseTarget 2014-04-29 04:49:42 +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
Treeku 919eb5ea44 Added UseTarget to CreatureObject 2014-04-29 03:29:03 +01:00
Waverunner b0e2a490f6 Changes to MissionObjective, started working on player bounties 2014-04-28 17:37:23 -04:00
Treeku 9fc30d10c4 Removed DeedObject, made buildings simpler 2014-04-28 22:07:32 +01:00
CharonInferar bec401c57b continued sandbox city, public structure problem 2014-04-28 22:52:04 +02: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
CharonInferar 3948fe11f3 Sandbox city building 2014-04-28 04:31:45 +02:00
Treeku 5e97870d66 Fixed issue with skillMod deduction 2014-04-27 21:23:28 +01:00
CharonInferar 4e6ae6d478 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-27 20:55:03 +02:00
tacefandCharonInferar f0e345bf37 Updated Objectservice 
to just load playerdeed out of TCG and Saga_system
 2014-04-27 03:07:40 +02:00
tacefandCharonInferar 50ddd6f42f Continued Work on Playerhouse deed 
Altered Objectservice again to support storyteller house deeds
 2014-04-27 03:07:39 +02:00
TreekuandCharonInferar 7dca8b362f Moved resource functions to resourceService 2014-04-27 03:07:38 +02:00
CharonInferar 25de95b310 Merge pull request #533 from tacef/master 
Continued Work on Playerhouse deed
 2014-04-26 15:42:45 +02:00
tacef caf9bf2f4b Updated Objectservice 
to just load playerdeed out of TCG and Saga_system
 2014-04-26 15:40:12 +02:00
tacef 3e5e748d6b Continued Work on Playerhouse deed 
Altered Objectservice again to support storyteller house deeds
 2014-04-26 15:19:44 +02:00
Treeku c1505e5974 Moved resource functions to resourceService 2014-04-26 00:36:13 +01:00
CharonInferar 76f9ff6be8 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-26 01:30:41 +02:00
Treeku 61748a3545 Some more skillMod improvements 2014-04-26 00:25:25 +01:00
CharonInferar 0c2f4b29a0 Grant zoning added 
test with 2 player chars to increase population to 2 citizens after
zoning and declare residence.
 2014-04-26 01:18:18 +02:00
Treeku 09a6aa05ac Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
 2014-04-26 00:12:22 +01:00
Treeku 5203f23524 Minor other skillMod changes 2014-04-26 00:09:22 +01:00
Treeku 565fdc20da Refactored skillMods 2014-04-25 23:25:01 +01:00
Waverunner 6fc8c53bb9 Fixed errors in MountService.java 2014-04-25 17:38:28 -04: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
Treeku 9bb4f280f0 Fixed vehicle posture and states 2014-04-25 22:11:12 +01:00
Treeku 632d157074 Merge pull request #524 from tacef/master 
Continued work on Playerhouse deeds
 2014-04-25 21:18:00 +01:00