diff --git a/.hgignore b/.hgignore index acd8e8deb..ae7f6de31 100644 --- a/.hgignore +++ b/.hgignore @@ -144,6 +144,7 @@ external external_stlport 3rdParty .svn +*.lnk thumbs.db Thumbs.db @@ -156,11 +157,6 @@ code/build/* build/* install/* -code/build_nFV/* -code/build/* -externals/* -*/test_mfc/* - # Linux nel compile code/nel/build/nel-config code/nel/config.status @@ -213,5 +209,27 @@ code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service code/ryzom/server/src/tick_service/tick_service -# WebTT temp dir + +# Pipeline garbage and output +*/generated/* +code/ryzom/server/data_shard/collisions/* +code/ryzom/common/data_common/visual_slot.tab +code/ryzom/common/data_common/landscape_col_prim_pacs_list.txt +code/ryzom/client/data/gamedev/*_words_* +code/ryzom/client/data/gamedev/*.uxt +code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheets.txt +code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheet_id.bin +code/nel/tools/build_gamedata/configuration/buildsite.py +code/nel/tools/build_gamedata/configuration/upload.py +code/nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg +code/nel/tools/build_gamedata/processes/sheets/item_association.dbg +code/nel/tools/build_gamedata/processes/sheets/sheets_packer.cfg + +# WebTT temp dir code/ryzom/tools/server/www/webtt/app/tmp + + + + + + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheet_id.bin b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheet_id.bin index eb91a8d32..a1d0ee6b4 100644 Binary files a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheet_id.bin and b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheet_id.bin differ diff --git a/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive b/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive index 6a8268eb1..f4a194ec1 100644 --- a/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive +++ b/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive @@ -1,7 +1,7 @@ - + class @@ -110,103 +110,6 @@ alias - - - class - mission - - - name - GUILD_MISSION - - - script - # script generated from 'guild_missions.primitive' - - #mission tags and pre-requisites - replayable - guild - mission_category : Killing - - #Variables declaration - decl : bot : giver - decl : bot : player - decl : bot : chiang_the_strong - - #pre-requisites - req_guild - req_grade : Leader - - #script - mission_title : GUILD_MISSION_TITLE - mission_desc : GUILD_MISSION_DESC - # step - spawn_mission : SOLO_GUILD_MISSION : chiang_the_strong : guild - set_obj : MIS_DO_MISSION - mission : SOLO_GUILD_MISSION 2 - kill_fauna : chdfa1 2 - recv_money : 100: guild - recv_money : 50 - - - - - - class - alias - - - name - alias - - - - - - class - mission - - - name - SOLO_GUILD_MISSION - - - script - # script generated from 'guild_missions.primitive' - - #mission tags and pre-requisites - replayable - solo - mission_category : Killing - not_proposed - - #Variables declaration - decl : bot : giver - decl : bot : player - decl : bot : chiang_the_strong - - #pre-requisites - - #script - mission_title : SOLO_GUILD_MISSION_TITLE - mission_desc : SOLO_GUILD_MISSION_DESC - # step - kill_fauna : chdfa1 1 - recv_money : 20 - - - - - - class - alias - - - name - alias - - - class @@ -223,10 +126,6 @@ #mission tags and pre-requisites replayable solo - mission_category : Killing - player_replay_timer : 10 - global_replay_timer : 10 - mission_icon : tets #Variables declaration decl : bot : giver @@ -237,13 +136,10 @@ #script mission_title : WELCOME_RYZOM_CORE_TITLE - mission_desc : WELCOME_RYZOM_CORE_DESC_BLAH + mission_desc : WELCOME_RYZOM_CORE_DESC # step_4 - camera_animation : MY_CAMERA_ANIMATION - sound_trigger : my_sound_name : here - kill_fauna : chdfa1 1 + kill_fauna : chdfa1 3 recv_money : 10000 - sound_trigger : sfsd : sdfsdf @@ -258,107 +154,6 @@ - - - class - mission - - - name - HUNTING_GROUNDS - - - script - # script generated from 'urban_newbieland.primitive' - - #mission tags and pre-requisites - replayable - guild - mission_category : Killing - player_replay_timer : 10 - global_replay_timer : 10 - mission_icon : test - - #Variables declaration - decl : bot : giver - decl : bot : player - decl : bot : chiang_the_strong - - #pre-requisites - req_guild - req_grade : Leader - - #script - mission_title : WELCOME_RYZOM_CORE_DESC - mission_desc : WELCOME_RYZOM_CORE_TITLE - # step_4 - kill_fauna : chdfa1 2 - recv_money : 100000 - recv_money : 20: guild - - - - - - class - alias - - - name - alias - - - - - - class - mission - - - name - NEW - - - script - # script generated from 'urban_newbieland.primitive' - - #mission tags and pre-requisites - replayable - solo - mission_category : Kiling - player_replay_timer : 10 - global_replay_timer : 1 - need_validation - - #Variables declaration - decl : bot : giver - decl : bot : player - decl : bot : chiang_the_strong - - #pre-requisites - - #script - mission_title : dddd - mission_desc : gg - # step_4 - sound_trigger : sound : here - camera_animation : MY_CAMERA_ANIMATION - kill_fauna : chdfa1 2 - recv_money : 10000 - - - - - - class - alias - - - name - alias - - - @@ -522,46 +317,6 @@ - - - - chat_parameters - shop:guild_creator - menu: MENU_WHOAMI WHOAMI_GUILD_CLERK - - - class - npc_bot - - - equipment - CU: 4 - CL: 4 - - - is_stuck - true - - - name - creator - - - sheet_client - fyhc3old - - - - - class - alias - - - name - alias - - - @@ -641,8 +396,19 @@ chat_parameters - shop:guild_creator - menu: MENU_WHOAMI WHOAMI_GUILD_CLERK + shop : NEWBIELAND_LARMOR_ALL + item : icmalb.sitem 10 + item : icmalb.sitem 20 + item : icmalb.sitem 50 + item : icfalb.sitem 10 + item : icfalb.sitem 20 + item : icfalb.sitem 50 + item : ictalb.sitem 10 + item : ictalb.sitem 20 + item : ictalb.sitem 50 + item : iczalb.sitem 10 + item : iczalb.sitem 20 + item : iczalb.sitem 50 class @@ -678,243 +444,74 @@ + + + + class + missions_editor + + + name + missions_editor + class - npc_folder + mission_tree + + + giver_primitive + urban_newbieland.primitive + + + mission_description + WELCOME_RYZOM_CORE_DESC + + + mission_giver + $givervar@fullname$ + + + mission_title + WELCOME_RYZOM_CORE_TITLE name - Guild creator + WELCOME_RYZOM_CORE - - - - class - alias - - - name - alias - - - + + need_validation + false + + + replayable + true + + class - npc_zone + variables name - Npc Zone + variables - - + class - alias - - - name - alias + var_npc - - - bot_sheet_client - maha2 + npc_function + fct_ranger_leader - class - npc_group + npc_name + chiang_the_strong - name - Group - - - - class - npc_group_parameters - - - name - parameters - - - - - - class - alias - - - name - alias - - - - - - chat_parameters - shop:guild_creator - menu: MENU_WHOAMI WHOAMI_GUILD_CLERK - - - class - npc_bot - - - equipment - CU: 4 - CL: 4 - - - name - guild_creator - - - sheet_client - fyhc3old - - - - - class - alias - - - name - alias - - - - - - - - - - class - missions_editor - - - name - missions_editor - - - - audience - solo - - - auto_remove_from_journal - false - - - automatic - false - - - class - mission_tree - - - fail_if_inventory_is_full - false - - - giver_primitive - urban_newbieland.primitive - - - global_replay_timer - 10 - - - mission_category - Killing - - - mission_description - WELCOME_RYZOM_CORE_DESC_BLAH - - - mission_giver - $givervar@fullname$ - - - mission_icon - tets - - - mission_title - WELCOME_RYZOM_CORE_TITLE - - - mono_instance - false - - - name - WELCOME_RYZOM_CORE - - - need_validation - false - - - non_abandonnable - false - - - not_in_journal - false - - - not_proposed - false - - - phrase_auto_menu - TEST - - - player_replay_timer - 10 - - - replayable - true - - - run_only_once - false - - - - class - variables - - - name - variables - - - - class - var_npc - - - npc_function - fct_ranger_leader - - - npc_name - chiang_the_strong - - - var_name - givervar + var_name + givervar @@ -957,38 +554,6 @@ name pre_actions - - - animation_name - MY_CAMERA_ANIMATION - - - class - camera_animation - - - name - camera animation - - - - - class - sound_trigger - - - name - sound_trigger_autre - - - sound_name - my_sound_name - - - sound_position - here - - @@ -1006,7 +571,7 @@ fauna/quantity - chdfa1 1 + chdfa1 3 @@ -1029,625 +594,9 @@ recv_money - - - class - sound_trigger - - - name - sound_trigger_2 - - - sound_name - sfsd - - - sound_position - sdfsdf - - - - - audience - guild - - - auto_remove_from_journal - false - - - automatic - false - - - class - mission_tree - - - fail_if_inventory_is_full - false - - - giver_primitive - urban_newbieland.primitive - - - global_replay_timer - 10 - - - mission_category - Killing - - - mission_description - WELCOME_RYZOM_CORE_TITLE - - - mission_giver - $givervar@fullname$ - - - mission_icon - test - - - mission_title - WELCOME_RYZOM_CORE_DESC - - - mono_instance - false - - - name - HUNTING_GROUNDS - - - need_validation - false - - - non_abandonnable - false - - - not_in_journal - false - - - not_proposed - false - - - phrase_auto_menu - TEST - - - player_replay_timer - 10 - - - replayable - true - - - run_only_once - false - - - - class - variables - - - name - variables - - - - class - var_npc - - - npc_function - fct_ranger_leader - - - npc_name - chiang_the_strong - - - var_name - givervar - - - - - - class - pre_requisite - - - name - pre_requisite - - - require_guild_grade - Leader - - - require_guild_membership - true - - - - - - class - alias - - - name - alias - - - - - class - step - - - name - step_4 - - - - class - actions - - - name - pre_actions - - - - - class - mission_objectives - - - name - objectives - - - - class - kill - - - fauna/quantity - chdfa1 2 - - - name - kill chdfa1 2 - - - - - - class - actions - - - name - post_actions - - - - amount - 100000 - - - class - recv_money - - - - - amount - 20 - - - class - recv_money - - - guild - true - - - - - - - - audience - solo - - - class - mission_tree - - - giver_primitive - urban_newbieland.primitive - - - global_replay_timer - 1 - - - mission_category - Kiling - - - mission_description - gg - - - mission_giver - $givervar@fullname$ - - - mission_title - dddd - - - name - NEW - - - player_replay_timer - 10 - - - replayable - true - - - - class - variables - - - name - variables - - - - class - var_npc - - - name - givervar = chiang_the_strong (fct_ranger_leader) - - - npc_function - fct_ranger_leader - - - npc_name - chiang_the_strong - - - var_name - givervar - - - - - - class - pre_requisite - - - name - pre_requisite - - - - - - class - alias - - - name - alias - - - - - class - step - - - name - step_4 - - - - class - actions - - - name - pre_actions - - - - class - sound_trigger - - - name - sound_trigger - - - sound_name - sound - - - sound_position - here - - - - - animation_name - MY_CAMERA_ANIMATION - - - class - camera_animation - - - name - MY_CAMERA_ANIMATION - - - - - - class - mission_objectives - - - name - objectives - - - - class - kill - - - fauna/quantity - chdfa1 2 - - - - - - class - actions - - - name - post_actions - - - - amount - 10000 - - - class - recv_money - - - - - - - - - class - camera_animations_editor - - - name - camera_animations_editor_3 - - - - class - camera_animation_tree - - - name - MY_CAMERA_ANIMATION - - - - class - camera_animation_go_to - - - duration - 3 - - - end_position - here or there - - - look_at_position - i look there - - - name - go to npc in 3 sec - - - text - First step - - - - - class - camera_animation_static - - - duration - 2 - - - look_at_position - hhmmm there - - - name - stay here for 2 sec with shake effect - - - text - 2nd step - - - - class - camera_modifier_shake - - - name - shake - - - strength - 10000 - - - - - - class - camera_animation_static - - - duration - 2 - - - look_at_position - eheh here now - - - name - move look at position for 2 sec - - - text - 3rd step - - - - - class - camera_animation_follow_entity - - - distance_to_entity - 50 - - - duration - 10 - - - entity_to_follow - a man - - - look_at_position - i look at him - - - name - follow entity for 10 sec - - - text - 4th step - - - - - class - camera_animation_turn_around - - - distance_to_point - 10 - - - duration - 2 - - - look_at_position - i don't know - - - name - turn around - - - point_to_turn_around - this point - - - speed - 23 - - - text - 5th step - - - - - class - camera_animation_return - - - duration - 2 - - - name - go back in 2sec - - - - + \ No newline at end of file diff --git a/code/ryzom/server/shard_start_cmake_full.bat b/code/ryzom/server/shard_start_cmake_full.bat deleted file mode 100644 index 9d68b5272..000000000 --- a/code/ryzom/server/shard_start_cmake_full.bat +++ /dev/null @@ -1,105 +0,0 @@ -@echo off - -REM This script will start all the services with good parameters - -REM set MODE=Debug -set MODE=..\..\build\bin\Debug - -rem AS -start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem bms_master -start %MODE%\ryzom_backup_service --writepid -P49990 - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem egs -start %MODE%\ryzom_entities_game_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem gpms -start %MODE%\ryzom_gpm_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ios -start %MODE%\ryzom_ios_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem rns -start %MODE%\ryzom_naming_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem rws -start %MODE%\ryzom_welcome_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ts -start %MODE%\ryzom_tick_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ms -start %MODE%\ryzom_mirror_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ais_newbyland -start %MODE%\ryzom_ai_service --writepid -mCommon:Newbieland:Post - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem mfs -start %MODE%\ryzom_mail_forum_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem su -start %MODE%\ryzom_shard_unifier_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem fes -start %MODE%\ryzom_frontend_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem sbs -start %MODE%\ryzom_session_browser_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem lgs -start %MODE%\ryzom_logger_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem lgs -start %MODE%\ryzom_dynamic_scenario_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ras -start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid diff --git a/code/ryzom/tools/server/admin/config.php b/code/ryzom/tools/server/admin/config.php index e9739d3aa..9de173c09 100644 --- a/code/ryzom/tools/server/admin/config.php +++ b/code/ryzom/tools/server/admin/config.php @@ -9,8 +9,8 @@ define('NELTOOL_DBNAME','nel_tool'); // site paths definitions - define('NELTOOL_SITEBASE','.'); - define('NELTOOL_SYSTEMBASE','D:\\Programmation\\Personal projects\\ryzom\\ryzom\\code\\ryzom\\tools\\server\\admin\\'/*'/home/nevrax/hg/code/ryzom/tools/server/admin/'*/); + define('NELTOOL_SITEBASE','http://open.ryzom.com/'); +- define('NELTOOL_SYSTEMBASE','/home/nevrax/hg/code/ryzom/tools/server/admin/'); define('NELTOOL_LOGBASE', NELTOOL_SYSTEMBASE .'/logs/'); define('NELTOOL_IMGBASE', NELTOOL_SYSTEMBASE .'/imgs/');