Commit 1175485
committed
Merge branch 'master' of https://github.com/ProjectSWGCore/Holocore
366 files changed
Lines changed: 2815 additions & 7676 deletions
File tree
- serverdata
- conversation
- buffs_medic
- droid
- junk_dealer_generic
- condition_checkForKitToo
- condition_checkForKit
- condition_hasInv
- condition_hasNoInv
- junk_dealer_wookiee
- condition_hasInv
- condition_hasNoInv
- junk_dealer
- mustafar_mensix
- tatooine_jabbas_palace_barada
- handleBranch5
- handleBranch6
- handleBranch7
- handleBranch8
- tatooine_jabbas_palace_ollobo
- handleBranch1
- handleBranch2
- tatooine_jabbas_palace_ree_yees
- handleBranch10
- handleBranch6
- handleBranch8
- handleBranch9
- tatooine_jabbas_palace
- tatooine_mos_eisley_aigorn
- handleBranch12
- handleBranch13
- handleBranch14
- handleBranch15
- handleBranch17
- handleBranch18
- handleBranch19
- handleBranch1
- handleBranch21
- handleBranch22
- handleBranch23
- handleBranch24
- handleBranch26
- handleBranch27
- handleBranch2
- handleBranch5
- handleBranch6
- handleBranch7
- handleBranch8
- handleBranch9
- tatooine_mos_eisley_bib_fortuna
- tatooine_mos_eisley_dunir
- handleBranch10
- handleBranch12
- handleBranch14
- handleBranch16
- handleBranch17
- handleBranch18
- handleBranch19
- handleBranch1
- handleBranch20
- handleBranch21
- handleBranch4
- handleBranch7
- handleBranch8
- handleBranch9
- tatooine_mos_eisley_gendra
- handleBranch10
- handleBranch11
- handleBranch14
- handleBranch15
- handleBranch16
- handleBranch18
- handleBranch19
- handleBranch1
- handleBranch21
- handleBranch22
- handleBranch26
- handleBranch27
- handleBranch28
- handleBranch29
- handleBranch30
- handleBranch32
- handleBranch34
- handleBranch36
- handleBranch3
- handleBranch40
- handleBranch41
- handleBranch43
- handleBranch44
- handleBranch45
- handleBranch48
- handleBranch49
- handleBranch4
- handleBranch51
- handleBranch53
- handleBranch55
- handleBranch6
- handleBranch7
- handleBranch8
- tatooine_mos_eisley_happer
- handleBranch2
- handleBranch3
- handleBranch4
- handleBranch5
- handleBranch6
- handleBranch7
- tatooine_mos_eisley_niko
- handleBranch10
- handleBranch11
- handleBranch13
- handleBranch14
- handleBranch15
- handleBranch16
- handleBranch3
- handleBranch4
- handleBranch5
- handleBranch6
- handleBranch8
- tatooine_mos_eisley_purvis
- handleBranch10
- handleBranch11
- handleBranch12
- handleBranch15
- handleBranch16
- handleBranch17
- handleBranch20
- handleBranch5
- handleBranch6
- handleBranch7
- handleBranch8
- handleBranch9
- tatooine_mos_eisley_toggi
- handleBranch1
- handleBranch3
- tatooine_mos_eisley
- tatooine_mos_espa
- items
- patrol
- spawn
- city
- dynamic
- gcw
- outback
- poi
- src
- main/java/com/projectswg/holocore
- resources/support
- global/commands/callbacks
- objects/radial
- object
- services
- gameplay/world/travel
- support/objects/items
- test/java/com/projectswg/holocore/resources/support/data/server_info/loader
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
0 commit comments