*** tpb has joined #tp | 00:00 | |
*** ChanServ sets mode: +o tpb | 00:00 | |
*** vi1985 has quit IRC | 00:05 | |
*** JLafont has joined #tp | 00:23 | |
*** bddebian has quit IRC | 00:30 | |
*** mithro has quit IRC | 00:35 | |
* llnz reboot to linux | 01:02 | |
llnz | hopefully the network card works this time | 01:03 |
---|---|---|
*** llnz has quit IRC | 01:03 | |
*** llnz has joined #tp | 01:10 | |
llnz | here come two mergers | 01:11 |
CIA-33 | aaron libtpproto-cpp * r2d244bdef34f /AUTHORS: Added self to AUTHORS. | 01:12 |
CIA-33 | aaron libtpproto-cpp * rb6f3d45ff40b /tpproto/ (Makefile.am logmessage.cpp logmessage.h): Added LogMessage frame type. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r45b61718b442 /tpproto/frame.h: Added admin frame types to FrameType enum. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r437a6813ecf9 /tpproto/ (Makefile.am getcommanddesc.cpp getcommanddesc.h): Added GetCommandDescription frame. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r4cb7f80a2e7c /tpproto/ (Makefile.am commanddesc.cpp commanddesc.h): Added CommandDescription frame type (still needs command parameter class). | 01:12 |
CIA-33 | aaron libtpproto-cpp * r7c194e876f97 /tpproto/ (4 files): | 01:12 |
CIA-33 | Added CommandParameter classes. | 01:12 |
CIA-33 | CommandDescription now uses parameters. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r6c2cb81894de /tpproto/ (commanddesc.cpp commandparameter.cpp): Fixed some minor problems in Command-related classes. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r30898a21257e /tpproto/ (4 files): Added GetCommandTypesList frame type. | 01:12 |
CIA-33 | aaron libtpproto-cpp * ra79483b178e6 /tpproto/ (Makefile.am command.cpp command.h): Added Command frame type. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r908c9a1d8068 /tpproto/ (Makefile.am commandresult.cpp commandresult.h): Added CommandResult frame type. | 01:12 |
CIA-33 | aaron libtpproto-cpp * re586b05debb8 /tpproto/ (adminlayer.cpp adminlayer.h): Added AdminLayer high-level interface for administration clients. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r3b6c8a2698e0 /tpproto/ (commanddesccache.cpp commanddesccache.h): Added CommandDescCache cache object for administration commands. | 01:12 |
CIA-33 | aaron libtpproto-cpp * ref9a155969e6 /tpproto/ (framefactory.cpp framefactory.h): Added admin frame types to FrameFactory. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r80b605d6d836 /tpproto/ (commandtypeslist.cpp commandtypeslist.h): Added CommandTypesList admin frame type. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r0f67219c24c4 /tpproto/ (command.cpp command.h): Added required unpackBuffer method to Command frame class. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r92dbf8c14eab /tpproto/adminlayer.h: Prototype setLogger method. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r90f471f89de0 /tpproto/ (adminlayer.cpp adminlayer.h): Added getStatus() method to AdminLayer. | 01:12 |
CIA-33 | aaron libtpproto-cpp * r0d26f7a038ff /tpproto/Makefile.am: Appended CommandTypesList, AdminLayer, and CommandDescCache to sources. | 01:13 |
CIA-33 | aaron libtpproto-cpp * r76ef4f5dea53 /tpproto/ (adminlayer.cpp commanddesccache.cpp commandtypeslist.cpp): Fixed some invalid remnant code. | 01:13 |
CIA-33 | aaron libtpproto-cpp * rf886030c7ef0 /tpproto/ (framebuilder.cpp framebuilder.h): Added admin frame types and CommandDescCache to FrameBuilder. | 01:13 |
CIA-33 | aaron libtpproto-cpp * re968076ae654 /tpproto/commanddesccache.cpp: Fixed invalid remnants. | 01:13 |
CIA-33 | aaron libtpproto-cpp * r6aca4ad9936b /tpproto/ (adminlayer.cpp asyncframelistener.h gamelayer.cpp): Added LogMessage virtual to AsyncFrameListener (may not be an ideal solution). | 01:13 |
CIA-33 | aaron libtpproto-cpp * rcfeac4f6b49f /tpproto/adminlayer.h: Proper class declarations for some methods. | 01:13 |
CIA-33 | aaron libtpproto-cpp * r97c153582a35 /m4/ax_boost_signals.m4: Merge commit 'origin/master' into config | 01:13 |
CIA-33 | aaron libtpproto-cpp * r1d083b4c2cc3 /tpproto/adminlayer.cpp: Reincorporated redirects in connect callback. | 01:13 |
CIA-33 | aaron libtpproto-cpp * rfd0ec3d7932c /tpproto/adminlayer.cpp: Put some Doxygen comments back in. | 01:13 |
CIA-33 | aaron libtpproto-cpp * rae38a467d6c2 /tpproto/gamelayer.h: Declare Frame in GameLayer. | 01:13 |
CIA-33 | aaron libtpproto-cpp * r320aa98e0067 /tpproto/ (4 files): Added an AdminStatusListener class and calls in AdminLayer. | 01:13 |
CIA-33 | aaron libtpproto-cpp * r648bca27d84f /tpproto/ (commandparameter.cpp commandparameter.h): Added setValueFromString function to CommandParameter classes. | 01:13 |
CIA-33 | aaron libtpproto-cpp * r7d5f46ba99a9 /tpproto/ (adminlayer.cpp adminlayer.h command.cpp command.h): Support for command frame sending from admin clients. | 01:13 |
CIA-33 | aaron libtpproto-cpp * re25e8a16645b /tpproto/cachenonemethod.cpp: Merge commit 'origin/master' into config | 01:13 |
CIA-33 | aaron libtpproto-cpp * r64a0a3b2fcfb /tpproto/commandparameter.cpp: Removed incorrect packInt in string parameter packBuffer method. | 01:13 |
CIA-33 | (102 lines omitted) | 01:13 |
CIA-33 | aaron tpserver-cpp * r4b37e410ed2e / (8 files in 2 dirs): | 01:13 |
CIA-33 | Merge commit 'origin/master' into config | 01:14 |
CIA-33 | Conflicts: | 01:14 |
CIA-33 | tpserver/frame.cpp | 01:14 |
CIA-33 | nuleren tpserver-cpp * rc4d92f1f2248 /modules/games/tae/ (Makefile.am fleet.cpp fleet.h tae.cpp): Added a stripped down fleet object | 01:14 |
CIA-33 | aaron tpserver-cpp * r3682300bc1e0 /tpserver/ (adminconnection.cpp adminconnection.h): Skeleton frame processing functionality added to AdminConnection. | 01:14 |
CIA-33 | aaron tpserver-cpp * r3f7664f15d62 /tpserver/ (5 files): Added Command and CommandManager classes with partial functionality. | 01:14 |
CIA-33 | jphr tpserver-cpp * r697106bbc83e /modules/games/risk/ (constellations.txt risk.cpp risk.h): Modified createUniverse and functions it calls to statically set IDs. This is in preparation of implementing an adjacency matrix | 01:14 |
CIA-33 | jphr tpserver-cpp * r0c05459f10b7 /modules/games/risk/risk.cpp: Modified planets to be id 1 to #Planets instead of planet systems, since Planets will issue orders, not systems. | 01:14 |
CIA-33 | jphr tpserver-cpp * r52559868ecab /modules/games/risk/ (move.cpp planet.cpp risk.cpp riskturn.cpp): Modified some TODO, ASK comments. | 01:14 |
CIA-33 | aaron tpserver-cpp * reea401bdc1e2 /tpserver/ (6 files): | 01:14 |
CIA-33 | AdminConnection connects to CommandManager, response frames mostly formed. | 01:14 |
CIA-33 | Starting base command set implementation. | 01:14 |
CIA-33 | jphr tpserver-cpp * r772806e5a310 /modules/games/risk/risk.cpp: Reworked constellation layout to make the differentiation between constellations more obvious. | 01:14 |
CIA-33 | aaron tpserver-cpp * r3461e5bd60e7 /tpserver/commandmanager.cpp: Added full basic command set (commands with parameters are disabled). | 01:14 |
CIA-33 | jphr tpserver-cpp * r2a2cfd11c1a1 /modules/games/risk/ (risk.cpp risk.h riskturn.cpp riskturn.h): Added generic order processing to RiskTurn. Added class variable matrix, a boost adjacency matrix to Risk(to be converted to list.) Added many tags to source. | 01:15 |
CIA-33 | jphr tpserver-cpp * re0900e1e817c /modules/games/risk/ (move.cpp move.h risk.h): Added some more tags, most notably a FIXME, the branch won't compile at present because a boost include isn't correct | 01:15 |
CIA-33 | aaron tpserver-cpp * r24bcc1ce77b0 /tpserver/ (command.cpp command.h commandmanager.cpp): Added command parameters; enabled commands with parameters. | 01:15 |
CIA-33 | jphr tpserver-cpp * rd7d3ecdbb65c /modules/games/risk/ (6 files): Added a lot of pseudo code in the form of comments to the 3 orders: Move, Reinforce, Colonize. | 01:15 |
CIA-33 | jphr tpserver-cpp * r0095e968e7b4 /modules/games/risk/ (risk.cpp risk.h): Commented out boost/graphs library import and class variable in Risk class until import is fixed | 01:15 |
CIA-33 | aaron tpserver-cpp * r986d31069dec /tpserver/asynclogmessage.h: Fixed improper header definition. | 01:15 |
CIA-33 | jphr tpserver-cpp * r980e93503567 /modules/games/risk/risk.cpp: removed planetOrders->addOwner(0) from Risk::createPlanet as I was informed by llnz it wasn't required. | 01:15 |
CIA-33 | aaron tpserver-cpp * raad5b4660f21 /tpserver/ (command.cpp commandmanager.cpp): Passing std::strings directly to packString calls. | 01:15 |
CIA-33 | jphr tpserver-cpp * rf34a7ed76c46 /modules/games/risk/ (colonize.cpp move.cpp reinforce.cpp risk.cpp risk.h): Removed statically setting IDs for objects. Converted adjacency_matrix to list. Removed setting turns for orders as they are not necessary. | 01:15 |
CIA-33 | jphr tpserver-cpp * r90fe065207ce /modules/games/risk/ (8 files): Mass find and replace of galaxy to constellation. Was informed type did not NEED to be named galaxy. | 01:15 |
CIA-33 | aaron tpserver-cpp * r5c99555bbd1f /tpserver/ (4 files): Removed AsyncLogMessage, now built into AdminLogger. | 01:15 |
CIA-33 | jphr tpserver-cpp * rc74a79d4abf5 /modules/games/risk/ (6 files): Added methods/variable for holding reinforcements. Various little tweaks. Added logic for updated availible reinforcements display on planets. | 01:15 |
CIA-33 | (163 lines omitted) | 01:15 |
CIA-33 | jphr tpserver-cpp * r4a9e4c3a9118 /modules/games/risk/risk.cpp: Changed unit position for map to display properly | 01:16 |
CIA-33 | nuleren tpserver-cpp * r0dd95b8893cc /modules/games/tae/ (colonize.cpp fleetorder.cpp fleetorder.h tae.cpp taeturn.cpp): | 01:16 |
CIA-33 | The colonize order now adds to the player's score, and a score message | 01:16 |
CIA-33 | is sent to the player after each turn. | 01:16 |
CIA-33 | nuleren tpserver-cpp * r637742fcca10 /modules/games/tae/colonize.cpp: | 01:16 |
CIA-33 | Added rule which allows the Settler Leader of a region to act as a | 01:16 |
CIA-33 | fallback when awarding points if the correct leader is not present in | 01:16 |
CIA-33 | the region. | 01:16 |
CIA-33 | jphr tpserver-cpp * r779c92b37f0b /modules/games/risk/ (bugs.txt risk.cpp): Changed startup text, removed bug from bugs.txt that is no longer relevant | 01:16 |
CIA-33 | jphr tpserver-cpp * r4990164ec63c /modules/games/risk/ (bugs.txt colonize.cpp): corrected bug where previous bid restriction would be reset by some code | 01:16 |
CIA-33 | nuleren tpserver-cpp * r18ec135e81f9 /modules/games/tae/taeturn.cpp: Split orders up so they are processed one player at a time. | 01:16 |
CIA-33 | jphr tpserver-cpp * r3845d712257e /modules/games/risk/ (bugs.txt colonize.cpp colonize.h move.cpp move.h): Removed old tags, reorganized and revised bugs.txt | 01:16 |
CIA-33 | jphr tpserver-cpp * rb0e23a56d8b7 /modules/games/risk/bugs.txt: Additional testing on "You have no objects" bug showed similar names are to blame...Added this to bugs.txt | 01:16 |
CIA-33 | nuleren tpserver-cpp * r04132f62cc30 /modules/games/tae/ (taeturn.cpp taeturn.h): | 01:16 |
CIA-33 | Orders are now processed one player at a time and rotate each turn. | 01:16 |
CIA-33 | Players are alerted to the order for the next turn. | 01:16 |
CIA-33 | nuleren tpserver-cpp * r8d3fde0eaeaf /modules/games/tae/ (colonize.cpp move.cpp): | 01:16 |
CIA-33 | Added some checks to catch illegal moves which were not illegal until | 01:17 |
CIA-33 | other players' orders were processed | 01:17 |
CIA-33 | aaron tpserver-cpp * r3aa7255c0f32 /tpserver/commandmanager.cpp: Added server-side log messages for some commands which produce none otherwise. | 01:17 |
CIA-33 | jphr tpserver-cpp * rf2cf3ce4fbc1 /modules/games/risk/risk.cpp: Removed old commented out code. Added logic to onAddPlayer to allow for guest players to not occupy a players spot | 01:17 |
CIA-33 | jphr tpserver-cpp * rce7be5815826 / (6 files in 2 dirs): Merge branch 'master' of git://git.thousandparsec.net/git/tpserver-cpp into risk | 01:17 |
llnz | hehehe | 01:17 |
CIA-33 | aaron tpserver-cpp * r02fcd1820705 /tpserver/ (adminconnection.cpp admintcpconn.cpp main.cpp): | 01:17 |
CIA-33 | Removed some debug log messages on disconnect and ignore SIGPIPE. | 01:17 |
CIA-33 | This prevents the server from crashing when an admin client disconnects. | 01:17 |
CIA-33 | nuleren tpserver-cpp * r346efed6f9fd /modules/games/tae/ (Makefile.am fleetbuilder.cpp fleetbuilder.h tae.cpp tae.h): | 01:17 |
CIA-33 | (124 lines omitted) | 01:17 |
CIA-33 | nuleren tpserver-cpp * rf889e41f6af4 /modules/games/tae/ (18 files): Added a lot of comments in many TaE files | 01:17 |
CIA-33 | nuleren tpserver-cpp * rb30e00f696bd /modules/games/tae/taeturn.cpp: Added more comments to taeturn | 01:17 |
CIA-33 | jphr tpserver-cpp * r9ea9cc6a1b7e /modules/games/risk/ (sc-maps.txt sc-risk-adv.txt sc-risk-basic.txt thisweek.txt): Removed personal todo list for GSoC from repo, also removed draft scripts for screencasts. | 01:17 |
CIA-33 | llnz tpserver-cpp * r544ce8595c5f / (7 files in 3 dirs): Merge branch 'master' into tae | 01:17 |
CIA-33 | llnz tpserver-cpp * r02607c3cc997 / (32 files in 2 dirs): Merge branch 'config' into all | 01:17 |
nash | llnz: Seems like a great time to disable the bots | 01:17 |
CIA-33 | llnz tpserver-cpp * rf9dca0fb923a / (34 files in 3 dirs): | 01:17 |
CIA-33 | Merge branch 'tae' into all | 01:17 |
CIA-33 | Conflicts: | 01:18 |
CIA-33 | configure.ac | 01:18 |
CIA-33 | modules/games/Makefile.am | 01:18 |
CIA-33 | llnz tpserver-cpp * r76abf9cb14b4 / (3 files in 2 dirs): | 01:18 |
CIA-33 | Little fixes to tae, and added nuleren to AUTHORS. | 01:18 |
CIA-33 | One fix for g++-4.3, on for s/lowest/low/. | 01:18 |
CIA-33 | llnz tpserver-cpp * reddcc5fcf7f8 /tpserver/main.cpp: g++-4.3 fix for config daemonising. | 01:18 |
CIA-33 | llnz tpserver-cpp-tae * r641311adddc5 /libltdl/ (Makefile.in aclocal.m4 configure): | 01:18 |
CIA-33 | Ran automake and friends in libltdl to update the generated files. | 01:18 |
CIA-33 | This was needed. The automake version between the main project and the | 01:18 |
CIA-33 | subproject needs to be similar, and they were too different. This fixes | 01:18 |
CIA-33 | llnz's issue with doing make dist | 01:18 |
CIA-33 | llnz tpserver-cpp-tae * rf34ba471043d / (ChangeLog NEWS configure.ac): Preparing for 0.5.1 release. | 01:18 |
CIA-33 | mithro tpserver-cpp-tae * r72f938f88f85 /tpserver/playeragent.cpp: Some small formatting and error messages changes. | 01:18 |
CIA-33 | mithro tpserver-cpp-tae * rd430e9d29a80 /tpserver/playeragent.cpp: Fix the Board ID Sequence frame for TP04 (added the overall modtime). | 01:18 |
CIA-33 | llnz tpserver-cpp-tae * r544ce8595c5f / (7 files in 3 dirs): Merge branch 'master' into tae | 01:18 |
llnz | i think that's it | 01:21 |
llnz | Merge Complete! | 01:26 |
*** JLafont has quit IRC | 01:27 | |
CIA-33 | pluskid tpclient-pywx-schemepy * r99b4b09e71c9 / (.gitmodules schemepy): Added schemepy as submodule. | 01:58 |
CIA-33 | pluskid tpclient-pywx-schemepy * r5588eea2c4de /requirements.py: Added code to check the schemepy requirement and setup the sys.path. | 01:58 |
* llnz wanders off | 02:01 | |
llnz | later all | 02:01 |
*** llnz has quit IRC | 02:01 | |
*** pluskid has quit IRC | 02:40 | |
*** zzorn_laptop has joined #tp | 03:24 | |
*** nash has quit IRC | 03:51 | |
*** peres has joined #tp | 08:15 | |
*** Ohm__ has joined #tp | 08:41 | |
*** Ohm__ has quit IRC | 09:20 | |
*** Ohm___ has joined #tp | 10:03 | |
*** zzorn_laptop has quit IRC | 10:12 | |
*** JLafont has joined #tp | 10:34 | |
*** peres has quit IRC | 10:43 | |
*** zzorn_ has quit IRC | 10:53 | |
*** Ohm___ has quit IRC | 11:04 | |
*** bddebian has joined #tp | 11:09 | |
bddebian | Heya | 11:10 |
*** Ohm_ has joined #tp | 11:12 | |
*** tuna has quit IRC | 11:33 | |
*** tuna-fish has joined #tp | 11:36 | |
*** tuna-fish is now known as tuna | 11:37 | |
CIA-33 | jm tpclient-pyogre * r43a8b262bfe0 /src/starmap.py: Fix map extents not being updated properly between logins | 12:04 |
CIA-33 | jm tpclient-pyogre * rb9d9e07746d7 /src/requirements.py: Fix directory checking in requirements.py | 12:04 |
CIA-33 | jm tpclient-pyogre * r2d47c05dcfde / (5 files in 2 dirs): Normalise map distance to a standard scale and remove distance scale option | 12:04 |
CIA-33 | jm tpclient-pyogre * r60ca1109208f /src/ (gui.py scene.py sound.py): Toggle sound/music immediately upon saving options | 12:04 |
CIA-33 | jm tpclient-pyogre * r820781e22b92 / (5 files in 2 dirs): Add fps counter, toggled from configuration window | 12:04 |
CIA-33 | jm tpclient-pyogre * r44e5f5293ac8 /src/gui.py: Querying for sound/graphics devices returns an "ogreal vector" on some systems, which does not work with python iterators | 12:04 |
CIA-33 | jm tpclient-pyogre * re7c08d9c2ef5 /src/scene.py: Fix bug where background music was activated in login screen | 12:04 |
CIA-33 | jm tpclient-pyogre * r554fc3b92992 /src/ (framework.py tpclient-pyogre): Loading screen was taking up too many cycles, stopping background threads from working properly | 12:04 |
*** tuna has quit IRC | 12:30 | |
*** Ohm_ has quit IRC | 12:48 | |
*** zzorn_ has joined #tp | 12:55 | |
*** Ohm_ has joined #tp | 13:36 | |
*** Ohm has quit IRC | 13:37 | |
*** Erroneous has joined #tp | 13:50 | |
*** vi1985 has joined #tp | 13:53 | |
*** tuna-fish has joined #tp | 14:59 | |
*** tuna-fish is now known as tuna | 15:06 | |
*** llnz has joined #tp | 17:10 | |
llnz | morning all | 17:11 |
*** tuna has quit IRC | 17:51 | |
*** bddebian has quit IRC | 17:56 | |
llnz | humm... sloc page not updating | 17:59 |
*** jphr has joined #tp | 19:10 | |
jphr | vi1985: how are things going? | 19:11 |
*** jphr has quit IRC | 19:22 | |
*** nash has joined #tp | 19:40 | |
*** nash_ has joined #tp | 19:40 | |
*** bddebian has joined #tp | 19:42 | |
*** nash has quit IRC | 19:43 | |
*** nash_ is now known as nash | 19:44 | |
*** TBBle has quit IRC | 19:45 | |
*** nash has quit IRC | 20:22 | |
*** ezod has quit IRC | 20:22 | |
*** ezod has joined #tp | 20:26 | |
*** tuna has joined #tp | 21:00 | |
*** nash has joined #tp | 21:00 | |
*** peres has joined #tp | 22:23 | |
CIA-33 | jphr tpserver-cpp-risk * rce9fd36121e3 /modules/games/risk/ (bugs.txt colonize.cpp): | 22:58 |
CIA-33 | Updated bugs text and fixed bug in colonize.cpp that caused a crash during a certain situation. | 22:58 |
CIA-33 | - The situation mentioned is when a bid to colonize a planet was placed from a planet with only 1 unit remaining, becoming an invalid bid | 22:58 |
*** peres has quit IRC | 23:28 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!