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,488 Commits 11 Branches 4 Tags
fdfd07795863a8ecc538bc9cb058f3b4a6fa2b0f
Commit Graph
1488 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Undercova fdfd077958 Merge pull request #2 from ProjectSWGCore/master 
Update my branch
 2014-04-19 13:21:24 +02:00
Bronco69 55a3350f34 Bonus sets finished 
BH / Co / Jedi / Medic / Officer / Smuggler / Spy
 2014-04-19 12:22:03 +02:00
Treeku ed78dd459b Minor changes 2014-04-19 08:57:14 +01: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
Treeku 506e1f160e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 00:39:51 +01:00
Treeku 7d40523833 Various vehicle fixes 2014-04-19 00:39:38 +01:00
Waverunner b6158a4014 leaveChatChannel removes from list of players channels 2014-04-18 18:14:59 -04:00
Treeku 65099a4ddf Safety improvement 2014-04-18 22:39:47 +01:00
Treeku 50e88d2300 Cut down a few warnings 2014-04-18 22:38:07 +01:00
Treeku bcbcbde34a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
 2014-04-18 21:29:57 +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
CharonInferar ab7f12591d Merge pull request #475 from CharonInferar/JunkDealer 
Junk dealer added
 2014-04-18 21:22:24 +02:00
CharonInferar 8adea112f3 options.cfg set to default values 2014-04-18 21:16:56 +02:00
CharonInferar 69266f2896 Merge remote-tracking branch 'origin/master' into JunkDealer 2014-04-18 21:07:52 +02:00
CharonInferar 0eb5cf05f4 Merge remote-tracking branch 'upstream/master' 2014-04-18 21:06:38 +02:00
CharonInferar 4f60260e53 Menu functionality improved 
Lootkit implemented
Loot price and further stats considered
 2014-04-18 20:57:56 +02:00
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
CharonInferar 29ce1d42a5 Merge pull request #473 from tacef/master 
Added Generic House Small Style 02, looks clean
 2014-04-18 18:27:52 +02:00
tacef 9975656a97 Added Generic House Small Style 02 2014-04-18 18:16:36 +02:00
Undercova ce7345e169 Merge pull request #1 from ProjectSWGCore/master 
Update my branch
 2014-04-18 12:56:42 +02:00
Undercova a5dab407a0 Delete set_bonus_medic_dps_1.py 2014-04-18 12:46:43 +02:00
Undercova 2eb649455e Delete set_bonus_medic_dps_2.py 2014-04-18 12:46:38 +02:00
Undercova f1abe5790e Delete set_bonus_medic_dps_3.py 2014-04-18 12:46:33 +02:00
Undercova 0be6302991 Delete set_bonus_medic_utility_a_1.py 2014-04-18 12:46:26 +02:00
Undercova 1c8a5b5468 Delete set_bonus_medic_utility_a_2.py 2014-04-18 12:46:22 +02:00
Undercova c0d13327b9 Delete set_bonus_medic_utility_a_3.py 2014-04-18 12:46:16 +02:00
Undercova 6e25c66937 Delete set_bonus_medic_utility_b_1.py 2014-04-18 12:46:10 +02:00
Undercova 3b9a778406 Delete set_bonus_medic_utility_b_2.py 2014-04-18 12:46:05 +02:00
Undercova de0d585a95 Delete set_bonus_medic_utility_b_3.py 2014-04-18 12:46:00 +02:00
Undercova d40352df3d Delete set_bonus_spy_dps_1.py 2014-04-18 12:45:54 +02:00
Undercova b3a5938f40 Delete set_bonus_spy_dps_2.py 2014-04-18 12:45:09 +02:00
Undercova 85d3f4b5a9 Delete set_bonus_spy_dps_3.py 2014-04-18 12:45:04 +02:00
Undercova b1f4ad45b0 Delete set_bonus_spy_utility_a_1.py 2014-04-18 12:44:57 +02:00
Undercova 621363d53a Delete set_bonus_spy_utility_a_2.py 2014-04-18 12:44:51 +02:00
Undercova 7bf9e36343 Delete set_bonus_spy_utility_a_3.py 2014-04-18 12:44:46 +02:00
Undercova 417d8022a5 Delete set_bonus_spy_utility_b_1.py 2014-04-18 12:44:40 +02:00
Undercova 229b36b7ef Delete set_bonus_spy_utility_b_2.py 2014-04-18 12:44:35 +02:00
Undercova fdd9b1c86c Delete set_bonus_spy_utility_b_3.py 2014-04-18 12:44:30 +02:00
Undercova 829748dc51 Delete set_bonus_hero_3.py 2014-04-18 12:44:24 +02:00
Undercova 36086fed11 Delete set_bonus_hero_2.py 2014-04-18 12:44:15 +02:00
Undercova 935079cee3 Delete set_bonus_hero_1.py 2014-04-18 12:44:08 +02:00
Undercova 7260b8b936 Delete set_bonus_bh_utility_b_3.py 2014-04-18 12:44:02 +02:00
Undercova dac01c9ba7 Delete set_bonus_bh_utility_b_2.py 2014-04-18 12:43:49 +02:00
Undercova 71099264fe Delete set_bonus_bh_utility_b_1.py 2014-04-18 12:42:34 +02:00
Undercova 5f60b82fc0 Delete set_bonus_bh_utility_a_3.py 2014-04-18 12:42:24 +02:00
Undercova 71bdada849 Delete set_bonus_bh_utility_a_2.py 2014-04-18 12:42:12 +02:00
Undercova f3a64f7aa3 Delete set_bonus_bh_utility_a_1.py 2014-04-18 12:42:01 +02:00
Undercova e0a45bd55e Delete set_bonus_bh_dps_3.py 2014-04-18 12:41:50 +02:00
Undercova 6936a19c9e Delete set_bonus_bh_dps_1.py 2014-04-18 12:41:35 +02:00