From: <baz...@us...> - 2008-04-19 19:43:20
|
Revision: 8421 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8421&view=rev Author: bazaarmagetron Date: 2008-04-19 12:43:18 -0700 (Sat, 19 Apr 2008) Log Message: ----------- author: epsy46 Serval changes: * Global ID hiding now really works * Clarified access_level_hide_of_help and access_level_hide_to_help * Show a server-defined prefix before a hidden player's Global ID and access level in /players * Different /invite messages depending on if the team which is being joined is locked or not. * tColoredStringProxy ( -1, -1, -1 ) now gives 0xRESETT when <<'d to a tString Modified Paths: -------------- armagetronad/branches/0.2.8/armagetronad/language/english_base.txt armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/0.2.8/armagetronad/src/engine/eTeam.cpp armagetronad/branches/0.2.8/armagetronad/src/tools/tString.cpp Property Changed: ---------------- armagetronad/branches/0.2.8/armagetronad/ Property changes on: armagetronad/branches/0.2.8/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 20:53:59.877000093 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: 0.2.8 + timestamp: 2008-04-19 23:31:44.417000055 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: 0.2.8 Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 538 z-...@us...-20080207163247-91eo4mrbiind6xrz 540 z-...@us...-20080208122252-nvhak6io6j0ui3aa 541 z-...@us...-20080208123045-76r9p0l7iwpbq1hy 542 z-...@us...-20080208124439-10s870zpb61b8buo 543 z-...@us...-20080208133845-a22a5j0z6vjgfaby 544 z-...@us...-20080208134134-bxi2z09linxnzl63 545 z-...@us...-20080208165812-xabnqfq34666e2z5 546 z-...@us...-20080208170201-jmubp7bm7lrpmw4z 551 z-...@us...-20080209115751-1w0yo2lwtv1xxmsc 552 z-...@us...-20080209121700-8mf9ure4bfaxtqfp 553 z-...@us...-20080209130301-0kw4jxjm7cvmbptp 561 z-...@us...-20080210002729-ee7t2nfh542nxksj 563 wrt...@us...-20080210153610-ucwvl013f1yil7og 564 z-...@us...-20080210212253-bxpkh4mtyisctr39 565 z-...@us...-20080211084800-j2c13scyxqc31m8x 566 z-...@us...-20080211092807-gx4kehlz96356bpc 567 z-...@us...-20080211093118-7l2xf6tr891yx5ap 568 z-...@us...-20080211105013-2k81i8bnj2k4hhoy 569 z-...@us...-20080211112608-8qx1tlf94iwrrt1l 570 z-...@us...-20080211140216-bdm3bpx8zkv5z3se 571 z-...@us...-20080211151812-grth0h6loq9xxd3o 572 z-...@us...-20080211151834-b3vk44tzyhtm744f 573 z-...@us...-20080211152418-o4a4kj326igqh1k8 574 z-...@us...-20080211154253-1etqludquvn7co8g 575 z-...@us...-20080211160428-8ilc9qovrarz8w62 576 z-...@us...-20080211193858-at0c5em1d3lm8nbe 577 z-...@us...-20080211200418-qdmnetojj8pme9xy 578 z-...@us...-20080211200716-e44opbnzxkha3c75 579 z-...@us...-20080211200826-m9ogo5duturpmsmt 580 wrt...@us...-20080211221232-nqw6a4oxgj4ntika 581 z-...@us...-20080211232908-79iedh9xr87l8yta 582 z-...@us...-20080211232937-iolwhcxmqa1njxcb 583 z-...@us...-20080211233009-zdmtdhf1vg9bdbqt 584 z-...@us...-20080211233052-bzwl4p5d9kmxqrez 585 z-...@us...-20080211235937-6r1abzr9i24hi28j 586 z-...@us...-20080212001854-jy3lv5lpiti2am0i 587 z-...@us...-20080212004511-1guj58f0ll5o4g2u 588 z-...@us...-20080212004523-d30hcrujanooulp6 589 z-...@us...-20080212013442-k2dt1qg06vpm0riz 590 z-...@us...-20080212111458-w1vg4vbqmsxs0apt 591 z-...@us...-20080212111803-hlydu4wbw7upc32b 592 z-...@us...-20080212113358-rittno0wqzk5oh2c 593 z-...@us...-20080212115640-h8bs2cwm75tqmgt8 594 z-...@us...-20080212123800-5r9ttplpbdw88m2q 595 z-...@us...-20080212125109-t8afy73nty55ih47 596 z-...@us...-20080212135138-mevw0j5m97vchlgo 597 z-...@us...-20080212141438-2yz5c9esxrswak61 598 z-...@us...-20080212141535-vtic2yccgieyn7v0 599 z-...@us...-20080212143704-jd8pg0cnuh0kwab5 600 z-...@us...-20080212154606-ppxy7dl99fk8xk6j 601 z-...@us...-20080212154658-z5x6zuir7bxoq48i 602 z-...@us...-20080212212236-9803ovcxrzfzqf40 603 z-...@us...-20080212214530-sqlc3x9wk3b36169 604 z-...@us...-20080212215644-d36an0w0zdlipf03 605 z-...@us...-20080212224923-7d3wi96op47p4zyt 606 z-...@us...-20080212235107-l67eu41fhlpy0jkp 607 z-...@us...-20080213005523-2qet70xfnd34ool9 608 z-...@us...-20080213005609-16omuuhsf5svvtnf 609 z-...@us...-20080213091828-7k5xdbmhgvqacwfk 610 z-...@us...-20080213120826-83e9b69ps9gpncqm 611 z-...@us...-20080213141821-4av1kc6gjlpqxb9k 612 z-...@us...-20080213231607-9x5ea54snffyzeu4 613 z-...@us...-20080213231745-t7gutswv6pm0d9ts 614 z-...@us...-20080213235902-yct0jy7rtc8rm0ey 615 z-...@us...-20080213235919-8tl1388zcggq9tzc 616 z-...@us...-20080214082816-dfdjmj4fm9vy6orh 618 z-...@us...-20080214125233-3nrgfrnzogj7nmu7 619 z-...@us...-20080214130153-c49jc9bo0yq6wcun 620 z-...@us...-20080214125233-13kffzv1qhyqfh1g 621 z-...@us...-20080214143550-ovwirpmzh2demiau 622 z-...@us...-20080214145926-xh49sbvcmoa3dfnx 623 z-...@us...-20080214152942-i1gwyqby6t3gfsyd 624 z-...@us...-20080214160347-mrqwdogtsvt2jwx6 627 z-...@us...-20080215083038-kpe7i3xxibqs4w3t 630 z-...@us...-20080215113602-1v0jq31ocroi9ien 631 z-...@us...-20080215125814-qrc5baipd0es0f8s 632 z-...@us...-20080215132414-ap75kohnhkyot3io 633 z-...@us...-20080215142819-78at0b7fjz12df4f 634 z-...@us...-20080215144155-vvuudbxe5dfta35q 635 z-...@us...-20080215144410-jq4n72ifnb7fz0q2 636 z-...@us...-20080215202858-10plx59rnos3h3wx 637 z-...@us...-20080215203022-6lmmz1kflk335csv 638 z-...@us...-20080215203921-qhp01ccwowaws5zw 639 z-...@us...-20080215213800-wgwgohw6qj484v1l 640 z-...@us...-20080216125315-tcl1mu3dogdnj4oz 641 z-...@us...-20080216152929-tj517suzlvqe988j 642 z-...@us...-20080216160207-fne52uek26c8xsbq 644 z-...@us...-20080216210312-etwwtuziwqfiee4a 645 z-...@us...-20080216223305-fllgpnypalakrto9 646 z-...@us...-20080216224028-yub72nzo00wuuen6 647 z-...@us...-20080216225216-5dvqho6samx7taz0 648 z-...@us...-20080216233325-5m9la64qlix7yqgm 649 z-...@us...-20080216233406-mjevvwajyd3ttlx3 650 z-...@us...-20080217105133-rsruvt5qroz8x2ev 651 z-...@us...-20080217110247-f5pimrjhvwm3rx8a 652 z-...@us...-20080217151109-n3f7wdio7x2heq7a 653 z-...@us...-20080217151344-nndna800a0t8mj97 655 z-...@us...-20080217223209-fxf60qpiypsv10rx 656 z-...@us...-20080217225340-uv9y4fnalqhokc9z 658 z-...@us...-20080218102004-cdjayf0lz9e02fi4 659 z-...@us...-20080218102004-q7xyz5f56x82q3ya 660 z-...@us...-20080218105535-hy8er6w05toruntx 661 z-...@us...-20080218102004-0vx3aabq0fgbxwp1 662 z-...@us...-20080218113302-hz95tbxan759a49b 665 z-...@us...-20080220221226-vhyt8ef6nmv3wrma 666 z-...@us...-20080229183043-i04z65cxb7azya01 672 z-...@us...-20080229235852-zdhq3v1iwvllb1ch 673 z-...@us...-20080301001554-1n05n5oh6lncev3j 674 z-...@us...-20080304110341-uf7982hzslcgqdz4 675 z-...@us...-20080304113003-9cxdx6ign2beip25 676 z-...@us...-20080304135251-7payt727hknvj051 677 z-...@us...-20080304142133-z44uzew53a4b5ahe 678 z-...@us...-20080304145813-zl9ix8gjzx96x3to 679 z-...@us...-20080304150213-o0zqdvudc2ydckiw 680 z-...@us...-20080304150606-ojhkiuu0nkfsdzxh 681 z-...@us...-20080304153343-11zuw8l4qpy6c804 682 z-...@us...-20080304161108-35q9938k4uz45e7n 683 z-...@us...-20080304162218-0met1wl2hiarehxx 684 z-...@us...-20080304162409-a83mleet1q1oxvyl 685 z-...@us...-20080304163815-eza6ew840zbu3g8t 687 z-...@us...-20080304170429-67o62a20eaf5m71t 688 z-...@us...-20080304170806-ibhma13xv66iqmrn 689 z-...@us...-20080304181719-va2qxujt8xymlvnw 694 z-...@us...-20080305104648-j8yrdtlvn1fbl16f 695 z-...@us...-20080305105143-or3sfnz59o1lrpko 696 z-...@us...-20080305111936-1lkgcc0nxlht67rc 697 z-...@us...-20080305121112-ma05x8g2xxe97577 698 z-...@us...-20080305144132-u1z3dlmqx7w66i57 699 z-...@us...-20080305183702-042b1hpkp4b4131d 700 z-...@us...-20080305213644-2k7zxvqir5qwashd 701 z-...@us...-20080306001417-1xic7kn4id0o48wy 702 z-...@us...-20080306002055-ps9m9ub2pis24h1s 708 z-...@us...-20080306184205-5trimli63k50yw0i 711 z-...@us...-20080307234229-6d37bxl8qwm9p071 712 z-...@us...-20080307234333-he0ahafy7eio8os7 721 z-...@us...-20080308202032-762gimjyorbshgw5 725 z-...@us...-20080309203540-72yytsrt4eh2fpnz 726 z-...@us...-20080309204413-oqf7py0cckchcvuk 727 z-...@us...-20080309204558-5z4x0jbf1qsnlt14 728 z-...@us...-20080310160543-or6d04u4wd2lqf86 729 z-...@us...-20080310204637-m3ny5zti4bz0jut1 730 z-...@us...-20080310210722-3omh1ng139qke53d 735 z-...@us...-20080311214611-on2weees1k1dt8hr 736 z-...@us...-20080311221921-0ohk3zz2ago8uoen 742 z-...@us...-20080314122729-1pzdi3xnnc1oaxhz 743 z-...@us...-20080315004823-6463oolvbj2a2k5e 744 z-...@us...-20080315004845-j5in82malq71kb31 745 z-...@us...-20080315234805-wgdyhfi1ujsqlewo 747 z-...@us...-20080316152908-51424mv65ivsiy0b 748 ep...@fr...-20080316153532-xlki6lf0fjb5wf57 750 epsy-20080317072934-5pr4ygp142kqkqr0 752 z-...@us...-20080317103020-t06zcug1jca7wkad 753 z-...@us...-20080317105914-tugsi7atv1qt0kjm 754 epsy-20080317203445-88howmqbme4na1fi 756 z-...@us...-20080318154654-g2jjh105v55bnlx7 757 z-...@us...-20080318163754-nx4unl68ktk3o2y1 758 z-...@us...-20080318164536-4shuy567zu9yzfy5 761 z-...@us...-20080318190251-u8vth8wwcy0bv6wm 762 z-...@us...-20080318191455-0ushdbdwzw0xdei7 763 z-...@us...-20080318193704-uey2w3pj1rk7hv98 765 z-...@us...-20080318200922-fif4v3t16bqjkb98 767 z-...@us...-20080318204138-hfwol9rkawm83qq8 772 z-...@us...-20080319185658-33i263bew6glphlo 773 z-...@us...-20080319191210-vzr9cnahx7lnq8vn 774 epsy-20080319191936-4mv6w2p4clrg5xqp 775 epsy-20080319192123-r1jjinuafv028u6w 777 z-...@us...-20080319202314-36j2sl34bdnxv42a 779 z-...@us...-20080320120501-17v2020goqsm3uy9 780 z-...@us...-20080320122108-fxon3du35opw4w9l 781 z-...@us...-20080320122804-p78fl209ouit4rac 782 z-...@us...-20080320124133-ogwmpgzawf7k7mb9 783 z-...@us...-20080320153458-kzpvdq4ot20jq2ys 784 z-...@us...-20080320154738-1hqwrdd4ur85t0wc 785 z-...@us...-20080320161752-z16barxhajr6g3u1 790 wrt...@us...-20080324114314-ovpngfceabgdrjw1 791 z-...@us...-20080324140643-mi4bbst3otkixvxr 792 z-...@us...-20080324140702-my3a8324osylxu5w 793 z-...@us...-20080324150602-8qcaza12xvnb5656 794 z-...@us...-20080324150903-102wwxv4ftujx0ri 795 z-...@us...-20080324200209-697loupzo7vful5m 796 z-...@us...-20080324201344-ltgkffdh25bca1h1 797 z-...@us...-20080324201704-t8ojf8wo6yuf0w3q 798 z-...@us...-20080325142406-elvu8lo7f1vpqykf 801 z-...@us...-20080408225027-z6jtik5hyyvh1r3k 802 epsy-20080409143340-tmynld6yvx0hrupq 803 epsy-20080409161853-5dyty0sra1j4wu20 804 epsy-20080410203444-uv8005sqv29niznl 805 epsy-20080410210652-4v8qz498xx2xf9gm 806 epsy-20080412215911-an0ciuot2xcw0j3e 807 wrt...@us...-20080413150948-6st3fg3amcpljyrs 808 z-...@us...-20080415221847-luq99q83qk1kf0qj 810 ep...@fr...-20080419003256-1d34b0frf3sghbgt 811 wrt...@us...-20080419181752-qybwic6wstifb6xi 812 wrt...@us...-20080419183353-nhlu69c5lo303fd0 813 wrt...@us...-20080419185359-juo8h5gk2l11nvzi + 538 z-...@us...-20080207163247-91eo4mrbiind6xrz 540 z-...@us...-20080208122252-nvhak6io6j0ui3aa 541 z-...@us...-20080208123045-76r9p0l7iwpbq1hy 542 z-...@us...-20080208124439-10s870zpb61b8buo 543 z-...@us...-20080208133845-a22a5j0z6vjgfaby 544 z-...@us...-20080208134134-bxi2z09linxnzl63 545 z-...@us...-20080208165812-xabnqfq34666e2z5 546 z-...@us...-20080208170201-jmubp7bm7lrpmw4z 551 z-...@us...-20080209115751-1w0yo2lwtv1xxmsc 552 z-...@us...-20080209121700-8mf9ure4bfaxtqfp 553 z-...@us...-20080209130301-0kw4jxjm7cvmbptp 561 z-...@us...-20080210002729-ee7t2nfh542nxksj 563 wrt...@us...-20080210153610-ucwvl013f1yil7og 564 z-...@us...-20080210212253-bxpkh4mtyisctr39 565 z-...@us...-20080211084800-j2c13scyxqc31m8x 566 z-...@us...-20080211092807-gx4kehlz96356bpc 567 z-...@us...-20080211093118-7l2xf6tr891yx5ap 568 z-...@us...-20080211105013-2k81i8bnj2k4hhoy 569 z-...@us...-20080211112608-8qx1tlf94iwrrt1l 570 z-...@us...-20080211140216-bdm3bpx8zkv5z3se 571 z-...@us...-20080211151812-grth0h6loq9xxd3o 572 z-...@us...-20080211151834-b3vk44tzyhtm744f 573 z-...@us...-20080211152418-o4a4kj326igqh1k8 574 z-...@us...-20080211154253-1etqludquvn7co8g 575 z-...@us...-20080211160428-8ilc9qovrarz8w62 576 z-...@us...-20080211193858-at0c5em1d3lm8nbe 577 z-...@us...-20080211200418-qdmnetojj8pme9xy 578 z-...@us...-20080211200716-e44opbnzxkha3c75 579 z-...@us...-20080211200826-m9ogo5duturpmsmt 580 wrt...@us...-20080211221232-nqw6a4oxgj4ntika 581 z-...@us...-20080211232908-79iedh9xr87l8yta 582 z-...@us...-20080211232937-iolwhcxmqa1njxcb 583 z-...@us...-20080211233009-zdmtdhf1vg9bdbqt 584 z-...@us...-20080211233052-bzwl4p5d9kmxqrez 585 z-...@us...-20080211235937-6r1abzr9i24hi28j 586 z-...@us...-20080212001854-jy3lv5lpiti2am0i 587 z-...@us...-20080212004511-1guj58f0ll5o4g2u 588 z-...@us...-20080212004523-d30hcrujanooulp6 589 z-...@us...-20080212013442-k2dt1qg06vpm0riz 590 z-...@us...-20080212111458-w1vg4vbqmsxs0apt 591 z-...@us...-20080212111803-hlydu4wbw7upc32b 592 z-...@us...-20080212113358-rittno0wqzk5oh2c 593 z-...@us...-20080212115640-h8bs2cwm75tqmgt8 594 z-...@us...-20080212123800-5r9ttplpbdw88m2q 595 z-...@us...-20080212125109-t8afy73nty55ih47 596 z-...@us...-20080212135138-mevw0j5m97vchlgo 597 z-...@us...-20080212141438-2yz5c9esxrswak61 598 z-...@us...-20080212141535-vtic2yccgieyn7v0 599 z-...@us...-20080212143704-jd8pg0cnuh0kwab5 600 z-...@us...-20080212154606-ppxy7dl99fk8xk6j 601 z-...@us...-20080212154658-z5x6zuir7bxoq48i 602 z-...@us...-20080212212236-9803ovcxrzfzqf40 603 z-...@us...-20080212214530-sqlc3x9wk3b36169 604 z-...@us...-20080212215644-d36an0w0zdlipf03 605 z-...@us...-20080212224923-7d3wi96op47p4zyt 606 z-...@us...-20080212235107-l67eu41fhlpy0jkp 607 z-...@us...-20080213005523-2qet70xfnd34ool9 608 z-...@us...-20080213005609-16omuuhsf5svvtnf 609 z-...@us...-20080213091828-7k5xdbmhgvqacwfk 610 z-...@us...-20080213120826-83e9b69ps9gpncqm 611 z-...@us...-20080213141821-4av1kc6gjlpqxb9k 612 z-...@us...-20080213231607-9x5ea54snffyzeu4 613 z-...@us...-20080213231745-t7gutswv6pm0d9ts 614 z-...@us...-20080213235902-yct0jy7rtc8rm0ey 615 z-...@us...-20080213235919-8tl1388zcggq9tzc 616 z-...@us...-20080214082816-dfdjmj4fm9vy6orh 618 z-...@us...-20080214125233-3nrgfrnzogj7nmu7 619 z-...@us...-20080214130153-c49jc9bo0yq6wcun 620 z-...@us...-20080214125233-13kffzv1qhyqfh1g 621 z-...@us...-20080214143550-ovwirpmzh2demiau 622 z-...@us...-20080214145926-xh49sbvcmoa3dfnx 623 z-...@us...-20080214152942-i1gwyqby6t3gfsyd 624 z-...@us...-20080214160347-mrqwdogtsvt2jwx6 627 z-...@us...-20080215083038-kpe7i3xxibqs4w3t 630 z-...@us...-20080215113602-1v0jq31ocroi9ien 631 z-...@us...-20080215125814-qrc5baipd0es0f8s 632 z-...@us...-20080215132414-ap75kohnhkyot3io 633 z-...@us...-20080215142819-78at0b7fjz12df4f 634 z-...@us...-20080215144155-vvuudbxe5dfta35q 635 z-...@us...-20080215144410-jq4n72ifnb7fz0q2 636 z-...@us...-20080215202858-10plx59rnos3h3wx 637 z-...@us...-20080215203022-6lmmz1kflk335csv 638 z-...@us...-20080215203921-qhp01ccwowaws5zw 639 z-...@us...-20080215213800-wgwgohw6qj484v1l 640 z-...@us...-20080216125315-tcl1mu3dogdnj4oz 641 z-...@us...-20080216152929-tj517suzlvqe988j 642 z-...@us...-20080216160207-fne52uek26c8xsbq 644 z-...@us...-20080216210312-etwwtuziwqfiee4a 645 z-...@us...-20080216223305-fllgpnypalakrto9 646 z-...@us...-20080216224028-yub72nzo00wuuen6 647 z-...@us...-20080216225216-5dvqho6samx7taz0 648 z-...@us...-20080216233325-5m9la64qlix7yqgm 649 z-...@us...-20080216233406-mjevvwajyd3ttlx3 650 z-...@us...-20080217105133-rsruvt5qroz8x2ev 651 z-...@us...-20080217110247-f5pimrjhvwm3rx8a 652 z-...@us...-20080217151109-n3f7wdio7x2heq7a 653 z-...@us...-20080217151344-nndna800a0t8mj97 655 z-...@us...-20080217223209-fxf60qpiypsv10rx 656 z-...@us...-20080217225340-uv9y4fnalqhokc9z 658 z-...@us...-20080218102004-cdjayf0lz9e02fi4 659 z-...@us...-20080218102004-q7xyz5f56x82q3ya 660 z-...@us...-20080218105535-hy8er6w05toruntx 661 z-...@us...-20080218102004-0vx3aabq0fgbxwp1 662 z-...@us...-20080218113302-hz95tbxan759a49b 665 z-...@us...-20080220221226-vhyt8ef6nmv3wrma 666 z-...@us...-20080229183043-i04z65cxb7azya01 672 z-...@us...-20080229235852-zdhq3v1iwvllb1ch 673 z-...@us...-20080301001554-1n05n5oh6lncev3j 674 z-...@us...-20080304110341-uf7982hzslcgqdz4 675 z-...@us...-20080304113003-9cxdx6ign2beip25 676 z-...@us...-20080304135251-7payt727hknvj051 677 z-...@us...-20080304142133-z44uzew53a4b5ahe 678 z-...@us...-20080304145813-zl9ix8gjzx96x3to 679 z-...@us...-20080304150213-o0zqdvudc2ydckiw 680 z-...@us...-20080304150606-ojhkiuu0nkfsdzxh 681 z-...@us...-20080304153343-11zuw8l4qpy6c804 682 z-...@us...-20080304161108-35q9938k4uz45e7n 683 z-...@us...-20080304162218-0met1wl2hiarehxx 684 z-...@us...-20080304162409-a83mleet1q1oxvyl 685 z-...@us...-20080304163815-eza6ew840zbu3g8t 687 z-...@us...-20080304170429-67o62a20eaf5m71t 688 z-...@us...-20080304170806-ibhma13xv66iqmrn 689 z-...@us...-20080304181719-va2qxujt8xymlvnw 694 z-...@us...-20080305104648-j8yrdtlvn1fbl16f 695 z-...@us...-20080305105143-or3sfnz59o1lrpko 696 z-...@us...-20080305111936-1lkgcc0nxlht67rc 697 z-...@us...-20080305121112-ma05x8g2xxe97577 698 z-...@us...-20080305144132-u1z3dlmqx7w66i57 699 z-...@us...-20080305183702-042b1hpkp4b4131d 700 z-...@us...-20080305213644-2k7zxvqir5qwashd 701 z-...@us...-20080306001417-1xic7kn4id0o48wy 702 z-...@us...-20080306002055-ps9m9ub2pis24h1s 708 z-...@us...-20080306184205-5trimli63k50yw0i 711 z-...@us...-20080307234229-6d37bxl8qwm9p071 712 z-...@us...-20080307234333-he0ahafy7eio8os7 721 z-...@us...-20080308202032-762gimjyorbshgw5 725 z-...@us...-20080309203540-72yytsrt4eh2fpnz 726 z-...@us...-20080309204413-oqf7py0cckchcvuk 727 z-...@us...-20080309204558-5z4x0jbf1qsnlt14 728 z-...@us...-20080310160543-or6d04u4wd2lqf86 729 z-...@us...-20080310204637-m3ny5zti4bz0jut1 730 z-...@us...-20080310210722-3omh1ng139qke53d 735 z-...@us...-20080311214611-on2weees1k1dt8hr 736 z-...@us...-20080311221921-0ohk3zz2ago8uoen 742 z-...@us...-20080314122729-1pzdi3xnnc1oaxhz 743 z-...@us...-20080315004823-6463oolvbj2a2k5e 744 z-...@us...-20080315004845-j5in82malq71kb31 745 z-...@us...-20080315234805-wgdyhfi1ujsqlewo 747 z-...@us...-20080316152908-51424mv65ivsiy0b 748 ep...@fr...-20080316153532-xlki6lf0fjb5wf57 750 epsy-20080317072934-5pr4ygp142kqkqr0 752 z-...@us...-20080317103020-t06zcug1jca7wkad 753 z-...@us...-20080317105914-tugsi7atv1qt0kjm 754 epsy-20080317203445-88howmqbme4na1fi 756 z-...@us...-20080318154654-g2jjh105v55bnlx7 757 z-...@us...-20080318163754-nx4unl68ktk3o2y1 758 z-...@us...-20080318164536-4shuy567zu9yzfy5 761 z-...@us...-20080318190251-u8vth8wwcy0bv6wm 762 z-...@us...-20080318191455-0ushdbdwzw0xdei7 763 z-...@us...-20080318193704-uey2w3pj1rk7hv98 765 z-...@us...-20080318200922-fif4v3t16bqjkb98 767 z-...@us...-20080318204138-hfwol9rkawm83qq8 772 z-...@us...-20080319185658-33i263bew6glphlo 773 z-...@us...-20080319191210-vzr9cnahx7lnq8vn 774 epsy-20080319191936-4mv6w2p4clrg5xqp 775 epsy-20080319192123-r1jjinuafv028u6w 777 z-...@us...-20080319202314-36j2sl34bdnxv42a 779 z-...@us...-20080320120501-17v2020goqsm3uy9 780 z-...@us...-20080320122108-fxon3du35opw4w9l 781 z-...@us...-20080320122804-p78fl209ouit4rac 782 z-...@us...-20080320124133-ogwmpgzawf7k7mb9 783 z-...@us...-20080320153458-kzpvdq4ot20jq2ys 784 z-...@us...-20080320154738-1hqwrdd4ur85t0wc 785 z-...@us...-20080320161752-z16barxhajr6g3u1 790 wrt...@us...-20080324114314-ovpngfceabgdrjw1 791 z-...@us...-20080324140643-mi4bbst3otkixvxr 792 z-...@us...-20080324140702-my3a8324osylxu5w 793 z-...@us...-20080324150602-8qcaza12xvnb5656 794 z-...@us...-20080324150903-102wwxv4ftujx0ri 795 z-...@us...-20080324200209-697loupzo7vful5m 796 z-...@us...-20080324201344-ltgkffdh25bca1h1 797 z-...@us...-20080324201704-t8ojf8wo6yuf0w3q 798 z-...@us...-20080325142406-elvu8lo7f1vpqykf 801 z-...@us...-20080408225027-z6jtik5hyyvh1r3k 802 epsy-20080409143340-tmynld6yvx0hrupq 803 epsy-20080409161853-5dyty0sra1j4wu20 804 epsy-20080410203444-uv8005sqv29niznl 805 epsy-20080410210652-4v8qz498xx2xf9gm 806 epsy-20080412215911-an0ciuot2xcw0j3e 807 wrt...@us...-20080413150948-6st3fg3amcpljyrs 808 z-...@us...-20080415221847-luq99q83qk1kf0qj 810 ep...@fr...-20080419003256-1d34b0frf3sghbgt 811 wrt...@us...-20080419181752-qybwic6wstifb6xi 812 wrt...@us...-20080419183353-nhlu69c5lo303fd0 813 wrt...@us...-20080419185359-juo8h5gk2l11nvzi 814 ep...@fr...-20080419213144-85xf2i2xxdjafk2e Modified: armagetronad/branches/0.2.8/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.2.8/armagetronad/language/english_base.txt 2008-04-19 19:11:14 UTC (rev 8420) +++ armagetronad/branches/0.2.8/armagetronad/language/english_base.txt 2008-04-19 19:43:18 UTC (rev 8421) @@ -862,6 +862,8 @@ ban_list_help Prints a list of currently banned IPs. unban_ip_help Revokes the ban of the specified IP address. +player_list_hidden_player_prefix_help The prefix that is shown on hidden players' Global ID and access level when we can see it. + # communication console_message_help Prints a message on the console of all connected clients. center_message_help Prints a big message on the screen of all connected clients. @@ -2271,9 +2273,10 @@ invite_no_team Can't use \1 if you're not on a team.\n invite_team_locked \1 locked, you'll need an invitation from a team leader via the /invite command to join from now on.\n invite_team_unlocked \1 unlocked, you can join it freely again.\n +invite_team_can_join \10xRESETT can now join \2.\n invite_team_invite \10xRESETT has been invited to join \2.\n invite_team_kick \10xRESETT has been kicked from \2.\n -invite_team_uninvite \10xRESETT has been uninvited from \2.\n +invite_team_uninvite \10xRESETT got his invitation to join \2 cancelled.\n invite_team_locked_list (locked) msg_toomanymatches 0xff0000Too many matches found for the search term \1. Be more specific.\n @@ -2654,8 +2657,8 @@ login_request_master Master server requires Login. # access level messages -access_level_hide_of_help Hide user account information of players with at most this access level. -access_level_hide_to_help Hide user account information to players with less than this access level. +access_level_hide_of_help Minimal access level to be able to hide it's own user account information. +access_level_hide_to_help Minimal access level to see everyone's user account information. access_level_team_help Minimal access level for /lock, /unlock, /invite and /uninvite team management. access_level_op_help Minimal access level for /op, /deop, /promote and /demote co-admin management commands commands. access_level_op_max_help Maximal access level attainable by /op and /promote commands. Modified: armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp 2008-04-19 19:11:14 UTC (rev 8420) +++ armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp 2008-04-19 19:43:18 UTC (rev 8421) @@ -133,6 +133,9 @@ static bool se_enableChat = true; //flag indicating whether chat should be allowed at all (logged in players can always chat) static tSettingItem< bool > se_enaChat("ENABLE_CHAT", se_enableChat); +static tString se_hiddenPlayerPrefix ("0xaaaaaa"); +static tConfItemLine se_hiddenPlayerPrefixConf( "PLAYER_LIST_HIDDEN_PLAYER_PREFIX", se_hiddenPlayerPrefix ); + static tReferenceHolder< ePlayerNetID > se_PlayerReferences; class PasswordStorage @@ -731,7 +734,7 @@ tASSERT( hider ); return - hider->GetAccessLevel() >= se_hideAccessLevelOf && + hider->GetAccessLevel() <= se_hideAccessLevelOf && hider->StealthMode() && currentLevel > se_hideAccessLevelTo; } @@ -2915,6 +2918,8 @@ if ( search.Len() > 1 ) doSearch = true; + bool hidden = false; + for ( int i2 = se_PlayerNetIDs.Len()-1; i2>=0; --i2 ) { ePlayerNetID* p2 = se_PlayerNetIDs(i2); @@ -2923,13 +2928,23 @@ tos << ": "; if ( p2->GetAccessLevel() < tAccessLevel_Default && !se_Hide( p2, receiver ) ) { - // player username comes from authentication name and may be much different from - // the screen name - tos << p2->GetColoredName() - << tColoredString::ColorString(1,1,1) - << " ( " << p2->GetFilteredAuthenticatedName() << ", " - << tCurrentAccessLevel::GetName( p2->GetAccessLevel() ) - << " )"; + hidden = p2->GetAccessLevel() <= se_hideAccessLevelOf && p2->StealthMode(); + tos << p2->GetColoredName() + << tColoredString::ColorString( -1, -1, -1) + << " ( "; + if ( hidden ) + tos << se_hiddenPlayerPrefix; + tos << p2->GetFilteredAuthenticatedName(); + if ( hidden ) + tos << tColoredString::ColorString( -1 ,-1 ,-1 ) + << ", " + << se_hiddenPlayerPrefix; + else + tos << ", "; + tos << tCurrentAccessLevel::GetName( p2->GetAccessLevel() ); + if ( hidden ) + tos << tColoredString::ColorString( -1 ,-1 ,-1 ); + tos << " )"; } else { Modified: armagetronad/branches/0.2.8/armagetronad/src/engine/eTeam.cpp =================================================================== --- armagetronad/branches/0.2.8/armagetronad/src/engine/eTeam.cpp 2008-04-19 19:11:14 UTC (rev 8420) +++ armagetronad/branches/0.2.8/armagetronad/src/engine/eTeam.cpp 2008-04-19 19:43:18 UTC (rev 8421) @@ -324,8 +324,12 @@ void eTeam::Invite( ePlayerNetID * player ) { tASSERT( player ); - if ( !IsInvited( player ) ) + if ( !IsInvited( player ) && this->IsLocked() ) { + sn_ConsoleOut( tOutput( "$invite_team_can_join", player->GetColoredName(), Name() ) ); + } + else if ( !IsInvited( player ) ) + { sn_ConsoleOut( tOutput( "$invite_team_invite", player->GetColoredName(), Name() ) ); } player->invitations_.insert( this ); @@ -335,7 +339,7 @@ void eTeam::UnInvite( ePlayerNetID * player ) { tASSERT( player ); - if ( player->CurrentTeam() == this ) + if ( player->CurrentTeam() == this && this->IsLocked() ) { sn_ConsoleOut( tOutput( "$invite_team_kick", player->GetColoredName(), Name() ) ); player->SetTeam(0); Modified: armagetronad/branches/0.2.8/armagetronad/src/tools/tString.cpp =================================================================== --- armagetronad/branches/0.2.8/armagetronad/src/tools/tString.cpp 2008-04-19 19:11:14 UTC (rev 8420) +++ armagetronad/branches/0.2.8/armagetronad/src/tools/tString.cpp 2008-04-19 19:43:18 UTC (rev 8421) @@ -1396,11 +1396,17 @@ { if (st_colorStrings) { - char cs[9]; + if ( colorCode.r_ == -1 || colorCode.g_ == -1 || colorCode.b_ == -1 ) + { + s << "0xRESETT"; + return s; + } + + char cs[9]; cs[0]='0'; cs[1]='x'; - - int RGB[3]; + + int RGB[3]; RGB[0]=RTC(colorCode.r_); RGB[1]=RTC(colorCode.g_); RGB[2]=RTC(colorCode.b_); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |