CharonInferar
5836699b41
merge conflict resolved
2014-06-11 16:50:29 +02:00
CharonInferar
755e9659fd
master merge
2014-06-11 16:47:59 +02:00
Light2
73b53ead09
some more fixes, optimised collidable circle
2014-06-11 02:46:45 +02:00
Light2
4b594c574f
fixed declare residency bugs
2014-06-11 01:54:10 +02:00
Light2
721634b406
fixed declare residency bugs
2014-06-10 23:34:17 +02:00
Light2
34aca38bc4
Added prose package attachments to mails
2014-06-04 23:17:39 +02:00
Treeku
865db149ad
Fixed loads of warnings
2014-05-14 15:51:25 +01:00
Waverunner
df374e8615
Fixed trader roadmap scripts, fixed rand. bounty mission checks, purchaseTravelTicket accounts for travel tax now
2014-05-07 16:07:55 -04:00
Light2
536b51d953
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
.gitignore
src/main/NGECore.java
src/resources/objects/creature/CreatureObject.java
src/resources/objects/mission/MissionObject.java
src/resources/objects/tangible/TangibleObject.java
src/services/chat/Mail.java
src/services/mission/MissionObjective.java
src/services/object/ObjectService.java
src/services/playercities/PlayerCity.java
2014-05-01 21:08:20 +02:00
Light2
7d457101f3
Refactored odb system (read extended), added implementation of Dynamic World Spawns
...
ODB no longer uses DPL layer of Berkeley DB, persistent classes have to
implement the Serializable interface, annotations are no longer used,
use transient modifier for variables that should not be persistent.
Entity reference errors will no longer occur, however it is better to
use ids if the entity that is being referenced is stored in the db too!
(or you will have two different objects). DB is cached for 5 minutes
then it will write its log/cache to disk, transactions are no longer
used.
2014-05-01 20:33:38 +02:00
CharonInferar
bec401c57b
continued sandbox city, public structure problem
2014-04-28 22:52:04 +02: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
CharonInferar
2e0fcd7ee5
Added another mail
2014-04-24 01:44:51 +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
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
f2126e15b5
Player Cities added
...
Player City Class created
2014-04-21 13:24:17 +02:00
CharonInferar