| 00:29:06 | | Guest3795 Quit (Ping timeout: 246 seconds) |
| 01:20:36 | raptor | I suppose it's time to introduce the RenderManager |
| 01:35:46 | | Watusimoto has joined |
| 01:40:19 | Watusimoto | raptor, yes, ther emight be one uimanager per clientgame |
| 01:40:27 | Watusimoto | but there is never more than one client game |
| 01:40:48 | Watusimoto | and I think when there are two clientgames, we'll need to refactor uimanager |
| 01:41:04 | Watusimoto | or at very least create a uimanagermanager to manage them |
| 01:43:08 | Watusimoto | one change that can be backported is this: |
| 01:43:09 | Watusimoto | void ClientGame::gotWrongPassword() |
| 01:43:09 | Watusimoto | { |
| 01:43:09 | Watusimoto | - mUIManager->gotPasswordOrPermissionsReply(this, "Incorrect password"); |
| 01:43:09 | Watusimoto | + mUIManager->gotPasswordOrPermissionsReply(this, "!!! Incorrect password"); |
| 01:43:10 | Watusimoto | } |
| 01:43:14 | Watusimoto | very minor |
| 01:56:48 | | Nothing_Much has joined |
| 01:58:26 | Watusimoto | uh oh... |
| 01:58:46 | Watusimoto | hg strip does not actually rollback the commits... at least not in the way rollback does |
| 01:58:54 | Watusimoto | it just deletes all the changes... work is lost |
| 02:14:24 | raptor | Watusimoto: |
| 02:14:27 | raptor | work is not lost |
| 02:14:35 | raptor | hg strip saves the bundles |
| 02:14:44 | raptor | to a backup location |
| 02:14:50 | Watusimoto | so I've read |
| 02:14:58 | Watusimoto | but I could not find them... |
| 02:15:07 | Watusimoto | (I recovered all my work, btw) |
| 02:15:18 | Watusimoto | (using "alternate" means0 |
| 02:15:24 | raptor | ok - how did you recover... oh? |
| 02:15:41 | Watusimoto | editor had saved copies of everything open... just went to each file and saved again |
| 02:15:50 | raptor | ha |
| 02:15:56 | Watusimoto | it worked! |
| 02:16:03 | raptor | yes |
| 02:16:08 | Watusimoto | and now I've got my commits orgainized the way I want them |
| 02:16:29 | raptor | ok, so... strip backups are found in: .hg/strip-backup/ |
| 02:16:29 | Watusimoto | hg rollback is great, but only one step |
| 02:16:35 | raptor | in the project root directory |
| 02:16:37 | Watusimoto | I don't have that folder |
| 02:17:00 | Watusimoto | others have reported the same thing |
| 02:17:25 | raptor | that it doesn't exist on windows? |
| 02:17:26 | Watusimoto | so hg strip is not the same as undoing the commits... it undoes the commits AND reverts the changes |
| 02:17:36 | Watusimoto | it doesn't exist on my machine |
| 02:18:15 | Watusimoto | wtf??? |
| 02:18:19 | Watusimoto | the folder is there now |
| 02:18:31 | raptor | oh good |
| 02:18:37 | raptor | your OS has a mind of its own |
| 02:19:02 | Watusimoto | or I did not |
| 02:19:23 | Watusimoto | in any event... I wish I could use the rollback function for multi level undo |
| 02:19:36 | Watusimoto | just erase the fact I did a commit |
| 02:19:53 | Watusimoto | espcially when you have lots of changes and are trying to logically group them |
| 02:19:58 | raptor | you can always rollback one revision |
| 02:20:00 | Watusimoto | if you make a mistake... |
| 02:20:05 | Watusimoto | yes, one revision |
| 02:20:10 | raptor | oh, multiple revisions... hmmm |
| 02:20:11 | Watusimoto | my problem was I needed to go back two |
| 02:20:32 | Watusimoto | there's no reason for it... if you haven't pushed, all the work is local and all the info is available |
| 02:22:41 | raptor | so I'm thinking of starting a RenderManager class |
| 02:22:47 | raptor | and slowly migrating in OpenglUtils and RenderUtils |
| 02:23:25 | raptor | then in that class i'd have an init() that would instantiate a GL render object that will be either GLES1 or GLES2 depending on a compiler flag |
| 02:24:20 | Watusimoto | I'd be ok with that |
| 02:24:22 | raptor | with static access to the GL object so other classes can just do: RenderManager::getGL() |
| 02:24:30 | Watusimoto | glutils will be outdated when you do your work anyway |
| 02:24:31 | raptor | and then do gl->blah() |
| 02:24:36 | raptor | ok |
| 02:24:41 | Watusimoto | and renderutils is kind of a mishmash |
| 02:25:19 | raptor | yeah... there's also gameObjectRender |
| 02:25:25 | raptor | that i'm not sure about yet |
| 02:25:59 | Watusimoto | yes... the original idea was gameObjectRenerer was higher level (renderTurret) and renderUtils was lower level (drawRect) but it didn't really work out that way |
| 02:45:26 | raptor | ok, falling asleep - i'm going to commit what little i've done so far |
| 02:46:42 | Watusimoto | I'll commit my backportable stuff tonight |
| 02:46:48 | raptor | it's jsut the skeleton |
| 02:46:50 | Watusimoto | it's committed, but not pushed |
| 02:48:03 | raptor | ok |
| 02:48:11 | | BFLogBot Commit: 5a28f27086 | Author: buckyballreaction | Message: Create RenderManager class for future delegation to different OpenGL API methods. It doesn't do anything yet... |
| 02:48:12 | raptor | i'm headed to bed. night! |
| 02:48:38 | | raptor Quit () |
| 04:09:59 | | BFLogBot Commit: 53fc6eceda | Author: watusimoto | Message: Fix warning |
| 04:10:01 | | BFLogBot Commit: 6531d5df2d | Author: watusimoto | Message: Comment |
| 04:10:02 | | BFLogBot Commit: 4f137cfb91 | Author: watusimoto | Message: Add speculative assertion |
| 04:10:04 | | BFLogBot Commit: ca27fc31f7 | Author: watusimoto | Message: [B] More consistent message |
| 04:10:05 | | BFLogBot Commit: 48854d29f7 | Author: watusimoto | Message: Better way to accomplish same thing |
| 04:10:07 | | BFLogBot Commit: 1c9a769d87 | Author: watusimoto | Message: [B] Fixes bug where player is told pw is wrong if he enters pw for permissions he already has. I *think* this changeset is complete and can be direclty backported. |
| 04:10:08 | | BFLogBot Commit: f5cc3af9f6 | Author: watusimoto | Message: Not sure if this assert exists in 019x... if so, it should be removed |
| 04:10:10 | | BFLogBot Commit: ecc3e4a672 | Author: watusimoto | Message: Whitespace |
| 04:10:11 | | BFLogBot Commit: c5a36ef668 | Author: watusimoto | Message: Add convenience function, mainly to support tests |
| 04:10:13 | | BFLogBot Commit: 50f7f1b48b | Author: watusimoto | Message: More tests for /lockteams, enahnce general testing process by creating mechanism for sending chat cmds that very closely simulates actual usage |
| 04:10:14 | | BFLogBot Commit: babc1a4f78 | Author: watusimoto | Message: Fire up clients' MainUserInterface as a matter of course |
| 04:10:16 | | BFLogBot Commit: a09e953aa0 | Author: watusimoto | Message: Merge |
| 05:49:20 | | Watusimoto Quit (Ping timeout: 272 seconds) |
| 06:17:58 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 07:01:57 | | LordDVG has joined |
| 09:02:25 | | LordDVG Quit (Remote host closed the connection) |
| 10:54:13 | | Darrel is now known as Oberei |
| 10:56:30 | | Oberei is now known as Darrel |
| 11:15:32 | | raptor has joined |
| 11:15:32 | | ChanServ sets mode +o |
| 11:18:06 | | Watusimoto has joined |
| 11:38:37 | raptor | I know I said I wouldn't be coming online on Sundays... but I want to finish these backporting fixes before I forget.. |
| 11:55:39 | | BFLogBot Commit: dc4b094a79 | Author: buckyballreaction | Message: Fix tests: - Minor macro changes - Fix really weird error with static const not being intialized when linking - use of a '+' beforehand guarantees the value will be 'used' |
| 11:55:41 | | BFLogBot Commit: 25636c6f5d | Author: buckyballreaction | Message: Backport: More consistent message |
| 11:55:42 | | BFLogBot Commit: efcf3276dc | Author: buckyballreaction | Message: Backport: Fixes bug where player is told pw is wrong if he enters pw for permissions he already has. |
| 11:55:44 | | BFLogBot Commit: 2e1eb8364f | Author: buckyballreaction | Message: Merge 019 to 020 |
| 11:56:20 | raptor | ok all done. I'll be back tomorrow! There was one really weird compile error on the TestTeamManager... you'll have to check out my latest change |
| 11:56:27 | raptor | bye |
| 11:56:36 | | raptor Quit () |
| 11:59:58 | | Watusimoto Quit (Ping timeout: 255 seconds) |
| 12:14:57 | | Watusimoto has joined |
| 14:10:56 | | Watusimoto Quit (Ping timeout: 244 seconds) |
| 14:13:18 | | Nothing_Much Quit (Remote host closed the connection) |
| 14:14:12 | | Watusimoto has joined |
| 14:40:18 | | Invisible has joined |
| 14:40:42 | | Invisible is now known as Guest55448 |
| 15:18:32 | | kaen_mbp has joined |
| 15:28:06 | | kaen_mbp Quit (Remote host closed the connection) |
| 15:39:22 | | LordDVG has joined |
| 15:47:23 | | Guest55448 Quit (Ping timeout: 245 seconds) |
| 15:51:46 | | Watusimoto Quit (Ping timeout: 256 seconds) |
| 16:32:40 | | Invisible has joined |
| 16:33:04 | | Invisible is now known as Guest31885 |
| 16:49:30 | | Watusimoto has joined |
| 17:31:03 | | Guest31885 Quit (Ping timeout: 246 seconds) |
| 17:49:13 | | Flynnn has joined |
| 17:50:26 | | Flynnn Quit (Client Quit) |
| 18:05:04 | | Invisible has joined |
| 18:05:28 | | Invisible is now known as Guest7771 |
| 18:09:23 | | Guest7771 Quit (Ping timeout: 240 seconds) |
| 18:23:15 | | Watusimoto Quit (Ping timeout: 246 seconds) |
| 18:41:37 | | LordDVG Quit (Remote host closed the connection) |
| 19:02:18 | | Flynnn has joined |
| 19:14:51 | | Watusimoto has joined |
| 20:50:17 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 20:52:53 | | Invisible has joined |
| 20:53:16 | | Invisible is now known as Guest84559 |
| 22:43:59 | | Watusimoto Quit (Ping timeout: 244 seconds) |
| 22:49:53 | | Guest84559 Quit (Ping timeout: 240 seconds) |
| 23:14:47 | | Invisible has joined |
| 23:15:10 | | Invisible is now known as Guest43629 |