repo string | commit string | message string | diff string |
|---|---|---|---|
marcoshack/marcoshack.github.io | 5cf932213f45c62e9700ba3b58e08e444633ae49 | nao exibir imagens na lista de posts em telefones | diff --git a/index.html b/index.html
index ebcc58c..a8943b2 100644
--- a/index.html
+++ b/index.html
@@ -1,24 +1,24 @@
---
layout: default
title: home
---
{% for post in paginator.posts %}
<div class="row">
- <div class="span2">
+ <div class="span2 hidden-phone">
{% if post.image != nil %}
<img src=... |
marcoshack/marcoshack.github.io | b5d7bcca818bea709f9d694904bf48062a6c87dc | [git post-receive] nao prosseguir se ocorrer um erro em algum dos comandos | diff --git a/_deploy/git-post-receive.sh b/_deploy/git-post-receive.sh
index dbc5fdc..0d40a5d 100644
--- a/_deploy/git-post-receive.sh
+++ b/_deploy/git-post-receive.sh
@@ -1,36 +1,44 @@
#
# The "post-receive" script is run after receive-pack has accepted a pack
# and the repository has been updated. It is passed a... |
marcoshack/marcoshack.github.io | 7908b1d4f95db7ae59b415886b108f6d39f0cdfd | alteracao da home, listando posts com conteudo parcial e imagens | diff --git a/Gemfile b/Gemfile
index 4279128..0a89dbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,12 @@
source :rubygems
gem 'jekyll'
gem 'rake'
+gem 'nokogiri'
# gsl needs native libraries:
#
# $ brew tap homebrew/versions
# $ brew install gsl114
#
gem 'gsl'
\ No newline at end of file
diff --git ... |
marcoshack/marcoshack.github.io | 6ee9055207c0413566252d59efba5215dce5935b | --future adicionado ao rake server | diff --git a/Rakefile b/Rakefile
index 1b17409..4c1841f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,18 +1,18 @@
require 'rubygems'
require 'rake'
task :server do
- sh "jekyll --server --auto"
+ sh "jekyll --server --auto --future"
end
namespace :site do
task :deploy do
sh "git push aws master"
end
... |
marcoshack/marcoshack.github.io | 8cf94cbdbd8232763c49a1bd365f31901150c324 | refatoracao das categorias do post | diff --git a/_posts/2012-09-28-mongo-on-rails-mongodb-sao-paulo.html b/_posts/2012-09-28-mongo-on-rails-mongodb-sao-paulo.html
index 9950148..c077668 100644
--- a/_posts/2012-09-28-mongo-on-rails-mongodb-sao-paulo.html
+++ b/_posts/2012-09-28-mongo-on-rails-mongodb-sao-paulo.html
@@ -1,17 +1,10 @@
---
layo... |
marcoshack/marcoshack.github.io | e012bfa4bfbc91b13bb5ac1bd444e89b3b52ab6f | another minor fix in post-receive hook | diff --git a/_deploy/git-post-receive.sh b/_deploy/git-post-receive.sh
index d6489f7..dbc5fdc 100644
--- a/_deploy/git-post-receive.sh
+++ b/_deploy/git-post-receive.sh
@@ -1,36 +1,36 @@
#
# The "post-receive" script is run after receive-pack has accepted a pack
# and the repository has been updated. It is passed a... |
marcoshack/marcoshack.github.io | 190699ba489b10c0c1a4ed3b745697f0ed59d4cd | minor fix in post-receive hook | diff --git a/Rakefile b/Rakefile
index bed71d8..1b17409 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,18 @@
require 'rubygems'
require 'rake'
task :server do
sh "jekyll --server --auto"
end
-task :deploy do
- sh "git push aws master"
+namespace :site do
+ task :deploy do
+ sh "git push aws master"
+ ... |
marcoshack/marcoshack.github.io | 1599311fd2ba2224428eb7b03eb855a618e6e507 | apache vhost config and git post-receive script | diff --git a/Gemfile b/Gemfile
index 8dbbd62..4279128 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,11 @@
source :rubygems
gem 'jekyll'
+gem 'rake'
# gsl needs native libraries:
#
# $ brew tap homebrew/versions
# $ brew install gsl114
#
-gem 'gsl'
+gem 'gsl'
\ No newline at end of file
diff --git a/Gem... |
marcoshack/marcoshack.github.io | 4a89abd1963e2b17dc5dfc6127b53049c6228a75 | pagination | diff --git a/Gemfile b/Gemfile
index 9224d0b..8dbbd62 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,10 @@
source :rubygems
gem 'jekyll'
-#gem 'gsl'
+
+# gsl needs native libraries:
+#
+# $ brew tap homebrew/versions
+# $ brew install gsl114
+#
+gem 'gsl'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 1... |
marcoshack/marcoshack.github.io | 297faf51e841ab7077efde9e97541f978696f85a | fork me on github added | diff --git a/_includes/github_ribbon.html b/_includes/github_ribbon.html
new file mode 100644
index 0000000..ebf63a6
--- /dev/null
+++ b/_includes/github_ribbon.html
@@ -0,0 +1,3 @@
+<spam class="hidden-phone">
+ <a href="https://github.com/marcoshack"><img style="position: absolute; top: 0; right: 0; border: 0;" src=... |
marcoshack/marcoshack.github.io | a4e203e74dd77144824090d3f60edea53e8bbfc6 | redirecionamento dos dominios | diff --git a/.htaccess b/.htaccess
index ca4db61..2b2d77e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,25 +1,22 @@
-#
-# Redirecionamentos
-#
+<If "%{HTTP_HOST} != 'mhack.com'">
+ RedirectMatch permanent /(.*) http://mhack.com/$1
+</If>
-# post antigos
RedirectPermanent /2012/10/java-jdk-15-no-os-x-lion-e-mountain-... |
marcoshack/marcoshack.github.io | d4a4d7097f9682e4c7b3b049c80124677e65bca0 | refatoracao dos includes do facebook e disqus, inclusao do widget do twitter | diff --git a/_includes/.gitkeep b/_includes/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/_includes/disqus_div.html b/_includes/disqus_div.html
new file mode 100644
index 0000000..9120fa7
--- /dev/null
+++ b/_includes/disqus_div.html
@@ -0,0 +1,8 @@
+{% unless page.comments == false %}
+<!-- dis... |
damian/jQuery-Colour-Swatch | b065583eb9eb9915ca63fc211120f13f112b5a43 | Some refining of column logic | diff --git a/colourpicker.html b/colourpicker.html
index 3e87fe1..ef6d2ad 100644
--- a/colourpicker.html
+++ b/colourpicker.html
@@ -1,74 +1,74 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-UK... |
Kyahx/remotecontrol | 86ec23bf8ed0cb8c0e4646ef08a4a7532d15e120 | inital code | diff --git a/RemoteControl.lua b/RemoteControl.lua
new file mode 100644
index 0000000..c3f5ec4
--- /dev/null
+++ b/RemoteControl.lua
@@ -0,0 +1,159 @@
+--[[-------------------------------------------------------------------------
+ Copyright (c) 2009, Kyahx
+ All rights reserved.
+-----------------------------------... |
rgee/HFOSS-Dasher | d4d75616ebfdc9b0263fe7d2e263592d04d1c761 | File dialog now closes when you hit cancel. We weren't checking the response. | diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index 0ccb88e..3be0421 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -125,1032 +125,1036 @@ dasher_main_class_init(DasherMainClass *pClass) {
G_TYPE_NONE, 0);
GObjectClass *pObjectClass = (GObjectClass *)... |
rgee/HFOSS-Dasher | 440e0383c5af22dd3e9be81e225e5b56366677d5 | Improved documentation in various places. Fixed innacuracies caused by code and docs being out of sync. | diff --git a/Src/DasherCore/EventHandler.cpp b/Src/DasherCore/EventHandler.cpp
index 36b414a..e6d99d7 100644
--- a/Src/DasherCore/EventHandler.cpp
+++ b/Src/DasherCore/EventHandler.cpp
@@ -1,122 +1,122 @@
#include "../Common/Common.h"
#include "EventHandler.h"
#include "DasherComponent.h"
#include "DasherInterfac... |
rgee/HFOSS-Dasher | 41851e9ec71a5527270ebfbbabeee3612469319f | Cleaned up game module switch and fixed some documentation on events. | diff --git a/Src/DasherCore/Event.h b/Src/DasherCore/Event.h
index 52d0154..4b20de1 100644
--- a/Src/DasherCore/Event.h
+++ b/Src/DasherCore/Event.h
@@ -1,228 +1,227 @@
#ifndef __event_h__
#define __event_h__
// Classes representing different event types.
#include <string>
#include "DasherTypes.h"
namespa... |
rgee/HFOSS-Dasher | 4e04baa4ecd63d39004e0e46a7f3d6ec636467f0 | Got the edtior text to clear when game finishes. | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index b62a10b..76ae20f 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -1,875 +1,877 @@
// DasherInterfaceBase.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This fil... |
rgee/HFOSS-Dasher | 63ef2ca3fdadf0a8c984e36439c0311d2dd70687 | added gamemode directory to version control | diff --git a/Data/gamemode/Makefile.am b/Data/gamemode/Makefile.am
new file mode 100644
index 0000000..09a9bde
--- /dev/null
+++ b/Data/gamemode/Makefile.am
@@ -0,0 +1 @@
+pkgdata_DATA = game_mode_english.txt
diff --git "a/Data/gamemode/\\" "b/Data/gamemode/\\"
new file mode 100644
index 0000000..ef26135
--- /dev/null
... |
rgee/HFOSS-Dasher | c91f88705f8447408912536cfcfd92d2df8632df | Got default game text working and integrated into the build system. Had to do some ugly things in GTK. | diff --git a/Data/Makefile.am b/Data/Makefile.am
index 22d07c8..7e9f449 100644
--- a/Data/Makefile.am
+++ b/Data/Makefile.am
@@ -1,66 +1,66 @@
-SUBDIRS = training alphabets colours controllabels GUI Help
+SUBDIRS = training alphabets colours gamemode controllabels GUI Help
desktopdir = $(datadir)/applications
des... |
rgee/HFOSS-Dasher | 2761c68066702c278f0525b965fb68472039c58f | Forgot the add anything before committing. Tend to do that a lot. | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index 0cb8253..2f1b3ef 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -1,1183 +1,1190 @@
// DasherInterfaceBase.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This f... |
rgee/HFOSS-Dasher | ca77d8657f9aefbb719cfd8984afe707d3169677 | Added enum to events to maintain the number of them in a reasonable place. | diff --git a/Src/DasherCore/Event.h b/Src/DasherCore/Event.h
index 21f1789..52d0154 100644
--- a/Src/DasherCore/Event.h
+++ b/Src/DasherCore/Event.h
@@ -1,228 +1,228 @@
#ifndef __event_h__
#define __event_h__
// Classes representing different event types.
#include <string>
#include "DasherTypes.h"
namespa... |
rgee/HFOSS-Dasher | 2e2477ae8ffd0228389f341f254e4dbdcba48746 | Game module now signals with an event when the user has completed the target. | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index a7bf737..0cb8253 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -1,790 +1,784 @@
// DasherInterfaceBase.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This fil... |
rgee/HFOSS-Dasher | 751f135b9ecc8dca789f4128e0efd4a197724f45 | Fixed both 1 off errors, but unwittingly introduced ridiculous, inexplicable problems with the file chooser. I'm ecstatic and baffled at the same time. | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index e050421..a7bf737 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -1,1189 +1,1189 @@
// DasherInterfaceBase.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This f... |
rgee/HFOSS-Dasher | f0ce014fe5d589d36755d686105b91a2b8aff94c | Made game mode menu item a toggle button. | diff --git a/Data/GUI/dasher.traditional.ui b/Data/GUI/dasher.traditional.ui
index 0e3e1c6..464cea4 100644
--- a/Data/GUI/dasher.traditional.ui
+++ b/Data/GUI/dasher.traditional.ui
@@ -1,501 +1,501 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
<object class="GtkAdjustment" id="adjustment1">
<pr... |
rgee/HFOSS-Dasher | 441d3e6df2c68f643fcde736481fa626c6ba1a3c | Made DisplayChunkText take a reference to a string. No need for a pointer here. | diff --git a/Src/DasherCore/GameDisplay.h b/Src/DasherCore/GameDisplay.h
index 6107c03..342c31a 100644
--- a/Src/DasherCore/GameDisplay.h
+++ b/Src/DasherCore/GameDisplay.h
@@ -1,37 +1,37 @@
#ifndef _GameDisplay_H_
#define _GameDisplay_H_
#include <vector>
#include <string>
using namespace std;
namespace Da... |
rgee/HFOSS-Dasher | ea9e28b7e737a7921b3d39ff254a6ede8a3eaea9 | Forget GtkGameDisplay | diff --git a/Src/Gtk2/GtkGameDisplay.cpp b/Src/Gtk2/GtkGameDisplay.cpp
new file mode 100644
index 0000000..27c1100
--- /dev/null
+++ b/Src/Gtk2/GtkGameDisplay.cpp
@@ -0,0 +1,16 @@
+#include "GtkGameDisplay.h"
+
+using namespace std;
+
+void GtkGameDisplay::DisplayChunkText(std::string text, std::vector<std::string> *co... |
rgee/HFOSS-Dasher | aad00102b651d64f4d8f3aa6b6d1115b4258e05b | Apparently GameDisplay.h was not in version control. | diff --git a/Src/DasherCore/GameDisplay.h b/Src/DasherCore/GameDisplay.h
new file mode 100644
index 0000000..6107c03
--- /dev/null
+++ b/Src/DasherCore/GameDisplay.h
@@ -0,0 +1,37 @@
+#ifndef _GameDisplay_H_
+#define _GameDisplay_H_
+
+#include <vector>
+#include <string>
+
+using namespace std;
+
+namespace Dasher {
+... |
rgee/HFOSS-Dasher | fe289087819bc6a5e60ae01bd13908333889334f | Added some method signature documentation to DasherModel. Made sure to check for game mode's toggle status in key places in the model's code. | diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index 7ab8643..1051b80 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1,913 +1,919 @@
// DasherModel.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is f... |
rgee/HFOSS-Dasher | a7e27ec54016dadf98a173643c18497db9356b2f | Huge progress on UI today, but still wrestling with 1 off issues. | diff --git a/Data/GUI/dasher.traditional.ui b/Data/GUI/dasher.traditional.ui
index d7e1f86..0e3e1c6 100644
--- a/Data/GUI/dasher.traditional.ui
+++ b/Data/GUI/dasher.traditional.ui
@@ -1,523 +1,501 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
<object class="GtkAdjustment" id="adjustment1">
<pr... |
rgee/HFOSS-Dasher | cfd1ab09e9a5db5b38eb59353bebe59c7bdc0d91 | One step away from instantiating CGameDisplay. Lots of digging through GTK code. | diff --git a/Data/GUI/dasher.traditional.ui b/Data/GUI/dasher.traditional.ui
index 1c4c3b4..d7e1f86 100644
--- a/Data/GUI/dasher.traditional.ui
+++ b/Data/GUI/dasher.traditional.ui
@@ -1,461 +1,523 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
<object class="GtkAdjustment" id="adjustment1">
<pr... |
rgee/HFOSS-Dasher | 12c8907f7d7597e8901ec6d38028bced8d7a554c | Added confirmation box when quitting game mode. | diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index 408b70c..cc156f0 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -116,1064 +116,1087 @@ extern "C" gint dasher_main_key_snooper(GtkWidget *pWidget, GdkEventKey *pEvent,
static void
dasher_main_class_init(DasherMainClass *p... |
rgee/HFOSS-Dasher | ab53af85ee65a41913b65d23146f44218cf30be1 | Added more high-level documentation of the model. | diff --git a/Src/DasherCore/DasherModel.h b/Src/DasherCore/DasherModel.h
index 85dbf02..8db139b 100644
--- a/Src/DasherCore/DasherModel.h
+++ b/Src/DasherCore/DasherModel.h
@@ -1,379 +1,396 @@
// DasherModel.h
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is free softwa... |
rgee/HFOSS-Dasher | 48dcdd7460313fe9da94faa576d36e5d9b02edc4 | Added documentation to game mode related methods in dasher_main.cpp. Still have a 1 off error when starting game mode. | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index ec34c80..ba11c64 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -372,812 +372,819 @@ void CDasherInterfaceBase::InterfaceEventHandler(Dasher::CEvent *pEvent) {
cas... |
rgee/HFOSS-Dasher | b0f887b5eaa52353321deff1b1b80a5ada70f42d | Removed all old game mode code from the model. | diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index 4bef83f..a7ac6b6 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1,823 +1,780 @@
// DasherModel.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is f... |
rgee/HFOSS-Dasher | 727c5c67d470403739cc4dc357ef25f85ae4c294 | Fixed more logic errors and other bugs in node approximation. Still does NOT work. Most likely segfaults on startup. | diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index 50aee8a..18e6eb5 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1,710 +1,727 @@
// DasherModel.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is f... |
rgee/HFOSS-Dasher | d99e86ceab204738ddfe746543521dc001aac235 | Documented Game Node Drawn event | diff --git a/Src/DasherCore/Event.h b/Src/DasherCore/Event.h
index 65d52a1..4b74e78 100644
--- a/Src/DasherCore/Event.h
+++ b/Src/DasherCore/Event.h
@@ -1,201 +1,216 @@
#ifndef __event_h__
#define __event_h__
// Classes representing different event types.
#include <string>
#include "DasherTypes.h"
namespa... |
rgee/HFOSS-Dasher | d847aa8c4f4b3d3d9132267c1030e8b98f26a048 | Got rid of redundant reverse lookup function. Already exists in GetSymbols. oops. | diff --git a/Src/DasherCore/Alphabet/Alphabet.h b/Src/DasherCore/Alphabet/Alphabet.h
index 91cc89d..04ed2a3 100644
--- a/Src/DasherCore/Alphabet/Alphabet.h
+++ b/Src/DasherCore/Alphabet/Alphabet.h
@@ -1,233 +1,224 @@
// Alphabet.h
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.
//
// ... |
rgee/HFOSS-Dasher | 51dfbb6c232e835f3a0d41e28f06f13a3315fcf8 | In the middle of Game mode UI development. Now, Dasher resets the model and text box every time the user toggles game mode. Have some logging statements lying around. | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index ddbf4bd..ec34c80 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -376,806 +376,808 @@ void CDasherInterfaceBase::InterfaceEventHandler(Dasher::CEvent *pEvent) {
m... |
rgee/HFOSS-Dasher | 655561ce3c776839420a17e7c41506f37ee0c951 | Improved search approximation. Still not working. Currently segfaults on startup. | diff --git a/Src/DasherCore/Alphabet/Alphabet.h b/Src/DasherCore/Alphabet/Alphabet.h
index 5a44efb..91cc89d 100644
--- a/Src/DasherCore/Alphabet/Alphabet.h
+++ b/Src/DasherCore/Alphabet/Alphabet.h
@@ -1,233 +1,233 @@
// Alphabet.h
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.
//
// ... |
rgee/HFOSS-Dasher | bcb09f05bb0a0b9701c97ba87aed565fa2c98174 | Added new node approximation functions. Committing and leaving early due to possible HAIL. oh god.... | diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index 9795a16..dd27082 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -1,452 +1,451 @@
// AlphabetManager.cpp
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.... |
rgee/HFOSS-Dasher | 5a5d3038f3d884c510a17271201ee75f25db9549 | Not building test for now. When we do, we get a really strange error. To be fixed later. | diff --git a/Makefile.am b/Makefile.am
index fa59c4f..84ceda7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,71 +1,71 @@
-SUBDIRS = Src Data Doc Testing/dasher_tests
+SUBDIRS = Src Data Doc
if USE_INTLTOOL
SUBDIRS += po
endif
ACLOCAL_AMFLAGS = -I m4
distuninstallcheck_listfiles = \
find . -type f -print |... |
rgee/HFOSS-Dasher | 3bea8d8be0af41ad2b7089fac2e732cb84449fa6 | Fixed compilation problemt in EventTest.cpp | diff --git a/Testing/dasher_tests/EventTest.cpp b/Testing/dasher_tests/EventTest.cpp
index efa7306..acedf7e 100755
--- a/Testing/dasher_tests/EventTest.cpp
+++ b/Testing/dasher_tests/EventTest.cpp
@@ -1,157 +1,157 @@
#include "gtest/gtest.h"
#include "../../Src/TestPlatform/MockInterfaceBase.h"
#include "../../Src/T... |
rgee/HFOSS-Dasher | 4b5ef3f7482289955785ddcda94b0df25a7ec6ba | Hard coded version number into configure.ac | diff --git a/configure.ac b/configure.ac
index b592424..f734d3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,421 +1,419 @@
AC_PREREQ(2.59)
AC_INIT([dasher],
- m4_esyscmd([build-aux/mkversion]),
- [http://bugzilla.gnome.org/enter_bug.cgi?product=dasher],
- [dasher],
+ 4.11,
[http://www.inference.phy.cam.a... |
rgee/HFOSS-Dasher | 655502a996a6d7aaf5b4690dd421b4e325b7700f | Hard coded version number for now. m4 macro to get version number does not work. Specifically, git describe --abbrev=4 gives an error | diff --git a/configure.ac b/configure.ac
index b592424..8464f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,421 +1,417 @@
AC_PREREQ(2.59)
-AC_INIT([dasher],
- m4_esyscmd([build-aux/mkversion]),
- [http://bugzilla.gnome.org/enter_bug.cgi?product=dasher],
- [dasher],
- [http://www.inference.phy.cam.ac.uk/dash... |
rgee/HFOSS-Dasher | 2fd3b5c21f71e3823c5c2a42e55cf6ffd4094832 | Added m4's in gtest. This better work | diff --git a/Testing/gtest/m4/acx_pthread.m4 b/Testing/gtest/m4/acx_pthread.m4
new file mode 100644
index 0000000..2cf20de
--- /dev/null
+++ b/Testing/gtest/m4/acx_pthread.m4
@@ -0,0 +1,363 @@
+# This was retrieved from
+# http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?revision=1277&root=avahi
+# See also... |
rgee/HFOSS-Dasher | 3d4daa76164d8df5204b017edf3d294619305fcb | Continuing work on game mode UI elements - now have a useless, but functioning dialog box and file chooser | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index c7f4e10..484e688 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -1,1116 +1,1112 @@
// DasherInterfaceBase.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This f... |
rgee/HFOSS-Dasher | 5189b7cc0ea5580c4dcedd91736b9e028d50375e | Started approximation function. Untested | diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index 352352b..bc87d4e 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1,623 +1,671 @@
// DasherModel.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is f... |
rgee/HFOSS-Dasher | 6383e69b5a932c6bc902f31f45f69049626f09c8 | Finished moving game node searching to the model. The model now searches for game nodes itself. | diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index 12ca4e4..9795a16 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -1,489 +1,452 @@
// AlphabetManager.cpp
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.... |
rgee/HFOSS-Dasher | 421f18cf90e3511dd27d8596b3bc41d609bfa393 | Began moving game search to the model and out of the specific node methods. Allows us to fire events easily while searching, for example. It also makes the code clearer. | diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index 4bef83f..db1f1a2 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1,823 +1,841 @@
// DasherModel.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is f... |
rgee/HFOSS-Dasher | 5bf7f21a95f2e1657d015ec65ab1879094399e28 | Added node types to each Dasher Node. Now we can perform conditional functionality without doing strange things like calling a search function on an element of the data structure you're searching. | diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index 92e46c3..12ca4e4 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -1,463 +1,489 @@
// AlphabetManager.cpp
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.... |
rgee/HFOSS-Dasher | 0ea12884a6f5fd9a4a97fecc6135b09678bc1076 | Added reverse lookup to character alphabet | diff --git a/Src/DasherCore/Alphabet/Alphabet.h b/Src/DasherCore/Alphabet/Alphabet.h
index ba31c45..5a44efb 100644
--- a/Src/DasherCore/Alphabet/Alphabet.h
+++ b/Src/DasherCore/Alphabet/Alphabet.h
@@ -1,224 +1,233 @@
// Alphabet.h
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.
//
// ... |
rgee/HFOSS-Dasher | 401408a6fb0721f723b6cbbf5ac7dee5eb5cc38e | fixed memory leak with word generator in game module constructor | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index 6ceef74..df2d3ff 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -1,1164 +1,1170 @@
// DasherInterfaceBase.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This f... |
rgee/HFOSS-Dasher | 2645eb7a4d877d256b8596b951fe9af7a961ed64 | got rid of unecessary null check | diff --git a/Src/DasherCore/GameModule.h b/Src/DasherCore/GameModule.h
index 4e9afa8..c5af5a0 100644
--- a/Src/DasherCore/GameModule.h
+++ b/Src/DasherCore/GameModule.h
@@ -1,225 +1,222 @@
// GameModule.h
#ifndef __GameModule_h__
#define __GameModule_h__
#include <string>
#include <cstring>
using namespace ... |
rgee/HFOSS-Dasher | 1200e732e098a0b59d38fd1a57872cb3dd6252fc | Added GameModule.cpp | diff --git a/Src/DasherCore/GameModule.cpp b/Src/DasherCore/GameModule.cpp
index 39d533f..a255e14 100644
--- a/Src/DasherCore/GameModule.cpp
+++ b/Src/DasherCore/GameModule.cpp
@@ -1,137 +1,137 @@
#include "GameModule.h"
using namespace Dasher;
void CGameModule::HandleEvent(Dasher::CEvent *pEvent) {
switc... |
rgee/HFOSS-Dasher | 079b6ecbbecc54fd75036bb79bac22f3e2735b22 | Once again, forgot to add anything before last commit. Need to stop doing that. | diff --git a/Data/GUI/dasher.traditional.ui b/Data/GUI/dasher.traditional.ui
index 8a2378a..1c4c3b4 100644
--- a/Data/GUI/dasher.traditional.ui
+++ b/Data/GUI/dasher.traditional.ui
@@ -1,461 +1,461 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
<object class="GtkAdjustment" id="adjustment1">
<pr... |
rgee/HFOSS-Dasher | b7bfd6d58c70ece42a40aa9fe2dd137f06717f75 | Added test game mode data to version control. | diff --git a/Src/DasherCore/test_text.txt b/Src/DasherCore/test_text.txt
new file mode 100644
index 0000000..7e94834
--- /dev/null
+++ b/Src/DasherCore/test_text.txt
@@ -0,0 +1,79 @@
+I'm_a_senior at Cesar Chavez high in San Francisco's sunny Mission district, and that makes me one of the most surveilled people in the ... |
rgee/HFOSS-Dasher | 31487c713ecd533406c1541cb8a048202da851f8 | Removed all traces of EV_Textdraw as we no longer use it. | diff --git a/Src/DasherCore/DasherViewSquare.cpp b/Src/DasherCore/DasherViewSquare.cpp
index 3fe96f7..97708f4 100644
--- a/Src/DasherCore/DasherViewSquare.cpp
+++ b/Src/DasherCore/DasherViewSquare.cpp
@@ -1,731 +1,728 @@
// DasherViewSquare.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Da... |
rgee/HFOSS-Dasher | 0f5e7f5714bb54b1bf34dd3f878526c71d22d28c | Fixed bugs introduced by merge with game node tagging branch | diff --git a/Src/DasherCore/EventHandler.h b/Src/DasherCore/EventHandler.h
index c8f16f5..5ec8c88 100644
--- a/Src/DasherCore/EventHandler.h
+++ b/Src/DasherCore/EventHandler.h
@@ -1,168 +1,167 @@
#ifndef __eventhandler_h__
#define __eventhandler_h__
#include <vector>
#include <queue>
#include "Event.h"
names... |
rgee/HFOSS-Dasher | 4ec0021896fff7cb988fdd827bf37c077bbd5ffa | FIXED GAME NODE TAGGING. Now searching from the node under the crosshair instead of relying on the root, which can be inconsistent and isn't guaranteed to be 1 above the level we're trying to search. | diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index b424abc..4bef83f 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1,823 +1,823 @@
// DasherModel.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is f... |
rgee/HFOSS-Dasher | c1143d07ef5aaa6a81fb2701eba4c4b79ec84f2e | Made it so that the collection of events a component or module listens for is now a class-level constant. Before, they could vary by instance AND the caller of the constructor had to know what events the object needs...very poor design that managed to sneak in a while ago. | diff --git a/Src/DasherCore/DasherComponent.h b/Src/DasherCore/DasherComponent.h
index 86b19a3..d3e6dab 100644
--- a/Src/DasherCore/DasherComponent.h
+++ b/Src/DasherCore/DasherComponent.h
@@ -1,48 +1,54 @@
#ifndef __dashercomponent_h__
#define __dashercomponent_h__
#include <vector>
#include "SettingsStore.h"
nam... |
rgee/HFOSS-Dasher | eee5bc391e756bc787b02816b75dfacf21b314f5 | Performed slight optimizations on Event Manager. Made typedefs private. | diff --git a/Src/DasherCore/EventHandler.cpp b/Src/DasherCore/EventHandler.cpp
index d1bed94..36b414a 100644
--- a/Src/DasherCore/EventHandler.cpp
+++ b/Src/DasherCore/EventHandler.cpp
@@ -1,130 +1,122 @@
#include "../Common/Common.h"
#include "EventHandler.h"
#include "DasherComponent.h"
#include "DasherInterfac... |
rgee/HFOSS-Dasher | f0e79db2d2ac4a9a7563f5a7ad5bc94a2ce4c2cd | Added include guards to old mock objects. Added mock object for FileWordGenerator. File word tests are NOT building yet. | diff --git a/Src/DasherCore/FileWordGenerator.h b/Src/DasherCore/FileWordGenerator.h
index a229fb7..fffef4a 100644
--- a/Src/DasherCore/FileWordGenerator.h
+++ b/Src/DasherCore/FileWordGenerator.h
@@ -1,114 +1,113 @@
#ifndef __FileWordGenerator_h__
#define __FileWordGenerator_h__
#include <string>
#include <iostr... |
rgee/HFOSS-Dasher | daebef18448f3324859e480d3af54fef0164c044 | Of course, forgot to actually add the changed files on that last commit | diff --git a/Data/GUI/dasher.compose.ui b/Data/GUI/dasher.compose.ui
index 247baa4..8791aa5 100644
--- a/Data/GUI/dasher.compose.ui
+++ b/Data/GUI/dasher.compose.ui
@@ -1,546 +1,539 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
<object class="GtkAdjustment" id="adjustment1">
<property name="upp... |
rgee/HFOSS-Dasher | 855e9b8e29a10e038014161254725f2df343fd4e | Cleaned up the internals of FileWordGenerator. These were transparent changes. | diff --git a/Src/DasherCore/FileWordGenerator.cpp b/Src/DasherCore/FileWordGenerator.cpp
index f65c7d3..2ab3d36 100644
--- a/Src/DasherCore/FileWordGenerator.cpp
+++ b/Src/DasherCore/FileWordGenerator.cpp
@@ -1,70 +1,56 @@
#include "FileWordGenerator.h"
using namespace Dasher;
bool CFileWordGenerator::Generate... |
rgee/HFOSS-Dasher | 3f59cc79bf96edae0b754e5a8655489c79609c9c | Generate is no longer required for WordGenerators. The constructor of FileWordGenerator now throws an exception if the file does not exist. | diff --git a/Src/DasherCore/FileWordGenerator.cpp b/Src/DasherCore/FileWordGenerator.cpp
index 22a7b3a..f65c7d3 100644
--- a/Src/DasherCore/FileWordGenerator.cpp
+++ b/Src/DasherCore/FileWordGenerator.cpp
@@ -1,67 +1,70 @@
#include "FileWordGenerator.h"
using namespace Dasher;
bool CFileWordGenerator::Generate... |
rgee/HFOSS-Dasher | 6d8cf4eaee6f5f976e1627b0f1f5d60a23914465 | Cleaned up the mess from debugging the segfault and the node-tagging weirdness | diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index c0c5bbd..b424abc 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1,824 +1,823 @@
// DasherModel.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is f... |
rgee/HFOSS-Dasher | 001ebe58c09ae5a828c84ab1a0f5103611499827 | FIXED THE RANDOM SEGFAULT! Watch your if-statement blocks. :P | diff --git a/Src/DasherCore/EventHandler.cpp b/Src/DasherCore/EventHandler.cpp
index d7f6db8..d1bed94 100644
--- a/Src/DasherCore/EventHandler.cpp
+++ b/Src/DasherCore/EventHandler.cpp
@@ -1,129 +1,130 @@
#include "../Common/Common.h"
#include "EventHandler.h"
#include "DasherComponent.h"
#include "DasherInterfac... |
rgee/HFOSS-Dasher | 3740c8ce6f5cdc6c3231fd50b678d41704b4bb20 | Added test data to version control | diff --git a/Testing/dasher_tests/test_data/word_gen_full_data.txt b/Testing/dasher_tests/test_data/word_gen_full_data.txt
new file mode 100644
index 0000000..277e809
--- /dev/null
+++ b/Testing/dasher_tests/test_data/word_gen_full_data.txt
@@ -0,0 +1,79 @@
+I'm a senior at Cesar Chavez high in San Francisco's sunny Mi... |
rgee/HFOSS-Dasher | 27219d63692cd4467ec3da3c3f9170abdbf1922e | Documented test intents | diff --git a/Testing/dasher_tests/WordGenTest.cpp b/Testing/dasher_tests/WordGenTest.cpp
index 8e1ae9a..a16df4d 100644
--- a/Testing/dasher_tests/WordGenTest.cpp
+++ b/Testing/dasher_tests/WordGenTest.cpp
@@ -1,55 +1,69 @@
#include "gtest/gtest.h"
#include "../../Src/DasherCore/FileWordGenerator.h"
using namespace D... |
rgee/HFOSS-Dasher | ee70fc46b801c7778dad758dfdbe0d57c9be3225 | Made shell script to encapsulate running all tests. | diff --git a/Testing/dasher_tests/run_tests.sh b/Testing/dasher_tests/run_tests.sh
new file mode 100755
index 0000000..f1bb839
--- /dev/null
+++ b/Testing/dasher_tests/run_tests.sh
@@ -0,0 +1,4 @@
+# This script just runs all the tests in the dasher_tests dir.
+
+./EventTest
+./WordGenTest
|
rgee/HFOSS-Dasher | 0f9520cf568dc2d69eff318fb1ce4fdc56078e24 | Lowered the number of dispatches in the stress test so it doesn't destroy Ryan's computer. Currently performing 10,0000,000 dispatches. | diff --git a/Testing/dasher_tests/EventTest.cpp b/Testing/dasher_tests/EventTest.cpp
index 8d50867..efa7306 100755
--- a/Testing/dasher_tests/EventTest.cpp
+++ b/Testing/dasher_tests/EventTest.cpp
@@ -1,157 +1,157 @@
#include "gtest/gtest.h"
#include "../../Src/TestPlatform/MockInterfaceBase.h"
#include "../../Src/T... |
rgee/HFOSS-Dasher | 5a2b8f4d6c147bcede2f6b1eb4d41d7d28688be8 | Did some reorganization in EventHandler and wrote some new unit tests. | diff --git a/Src/DasherCore/EventHandler.cpp b/Src/DasherCore/EventHandler.cpp
index 5dda894..d7f6db8 100644
--- a/Src/DasherCore/EventHandler.cpp
+++ b/Src/DasherCore/EventHandler.cpp
@@ -1,117 +1,129 @@
#include "../Common/Common.h"
#include "EventHandler.h"
#include "DasherComponent.h"
#include "DasherInterfac... |
rgee/HFOSS-Dasher | 796bd99c74fd4380ee82e1a3e8503cfa612f1fcd | Cleaned up file word generator. Segfaulting randomly on startup for some reason. Maybe a merge with new event code will fix it. | diff --git a/Src/DasherCore/FileWordGenerator.cpp b/Src/DasherCore/FileWordGenerator.cpp
index 3502cad..22a7b3a 100644
--- a/Src/DasherCore/FileWordGenerator.cpp
+++ b/Src/DasherCore/FileWordGenerator.cpp
@@ -1,67 +1,67 @@
#include "FileWordGenerator.h"
using namespace Dasher;
bool CFileWordGenerator::Generate... |
rgee/HFOSS-Dasher | b54606e29585ec37e357c1a61d47c71897f269ac | Refactored out magic string in FileWordGen. Added incomplete unit test for it | diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index 88cca61..0b6e807 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -452,714 +452,714 @@ void CDasherInterfaceBase::Pause() {
#ifndef _WIN32_WCE
if (m_pUserLog != NULL)... |
rgee/HFOSS-Dasher | 7b4e83f3525aee7765964ba95ae5680d8014a9a1 | Added TestPlatform to version control | diff --git a/Src/TestPlatform/Makefile.am b/Src/TestPlatform/Makefile.am
new file mode 100644
index 0000000..e69de29
diff --git a/Src/TestPlatform/MockInterfaceBase.h b/Src/TestPlatform/MockInterfaceBase.h
new file mode 100644
index 0000000..dcc6683
--- /dev/null
+++ b/Src/TestPlatform/MockInterfaceBase.h
@@ -0,0 +1,34... |
rgee/HFOSS-Dasher | a7ea58f7f3d2328748bce157e4bd225fb372ab79 | Cleaned up weird, old make targets... | diff --git a/Testing/dasher_tests/Makefile b/Testing/dasher_tests/Makefile
index 3a7b5c1..d395e37 100644
--- a/Testing/dasher_tests/Makefile
+++ b/Testing/dasher_tests/Makefile
@@ -1,126 +1,109 @@
# A sample Makefile for building Google Test and using it in user
# tests. Please tweak it to suit your environment and ... |
rgee/HFOSS-Dasher | 9e25f941c4e27a969306c1a3ff5c28d87b1be100 | Increased number of events in event manager to support the new node tagging events. | diff --git a/Src/DasherCore/EventHandler.h b/Src/DasherCore/EventHandler.h
index a051ebc..8c27293 100644
--- a/Src/DasherCore/EventHandler.h
+++ b/Src/DasherCore/EventHandler.h
@@ -1,148 +1,148 @@
#ifndef __eventhandler_h__
#define __eventhandler_h__
#include <vector>
#include <queue>
#include "Event.h"
names... |
rgee/HFOSS-Dasher | 4437de7b166cf979b2bd56c651b184ec92b8315d | Writing more unit tests. Found a bug with recursive calls to EventHandler:: InsertEvent - trying to figure that out. | diff --git a/Src/DasherCore/EventHandler.cpp b/Src/DasherCore/EventHandler.cpp
index a589834..5dda894 100644
--- a/Src/DasherCore/EventHandler.cpp
+++ b/Src/DasherCore/EventHandler.cpp
@@ -1,118 +1,117 @@
#include "../Common/Common.h"
#include "EventHandler.h"
#include "DasherComponent.h"
#include "DasherInterfac... |
rgee/HFOSS-Dasher | 94f59b8b2fec2a072cc034db9529b17024fbd483 | New game mode node tagging almost complete. Dasher model doesn't seem to be properly getting the target string, currently. | diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index 70afecf..92e46c3 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -1,462 +1,463 @@
// AlphabetManager.cpp
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.... |
rgee/HFOSS-Dasher | 89bbcb570f5762f48ae0abc1daab863d49cd9b33 | Finally got Gtest integrated into our build process. Starting to write some unit tests for the new event system. | diff --git a/Makefile.am b/Makefile.am
index 84ceda7..fa59c4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,71 +1,71 @@
-SUBDIRS = Src Data Doc
+SUBDIRS = Src Data Doc Testing/dasher_tests
if USE_INTLTOOL
SUBDIRS += po
endif
ACLOCAL_AMFLAGS = -I m4
distuninstallcheck_listfiles = \
find . -type f -print |... |
rgee/HFOSS-Dasher | 6772aeba544a0bce957b1a0ad2dc2e4945d83d53 | Begun trying to integrate NF_GAME to track nodes on the game target's path. | diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index bd5ce3e..70afecf 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -1,461 +1,462 @@
// AlphabetManager.cpp
//
// Copyright (c) 2007 The Dasher Team
//
// This file is part of Dasher.... |
rgee/HFOSS-Dasher | 885faada0499e7aee3e4cc11c3bc993d93db1776 | ScreenPolyline now takes an array of points. This makes much more sense. Updated GameModule to comply. | diff --git a/Src/DasherCore/DasherView.cpp b/Src/DasherCore/DasherView.cpp
index 219a580..cf8dc15 100644
--- a/Src/DasherCore/DasherView.cpp
+++ b/Src/DasherCore/DasherView.cpp
@@ -1,322 +1,313 @@
// DasherView.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is free s... |
rgee/HFOSS-Dasher | 815e38ffeb0a139015b74672ada0816ed0530916 | More work integrating GTest | diff --git a/Testing/dasher_tests/EventTest.cpp b/Testing/dasher_tests/EventTest.cpp
index 4cfab05..038bac7 100755
--- a/Testing/dasher_tests/EventTest.cpp
+++ b/Testing/dasher_tests/EventTest.cpp
@@ -1,5 +1,6 @@
#include "gtest/gtest.h"
+#include "MockInterfaceBase.h"
TEST(EventTest, simpletest) {
EXPECT_EQ(1, 1... |
rgee/HFOSS-Dasher | 555ee857c43a779a50b27d040d60fd92e35af914 | Game Module now overlays the typed text with a different color to indicate progress through the target string. | diff --git a/Src/DasherCore/GameModule.cpp b/Src/DasherCore/GameModule.cpp
index 118031e..4f31576 100644
--- a/Src/DasherCore/GameModule.cpp
+++ b/Src/DasherCore/GameModule.cpp
@@ -1,139 +1,138 @@
#include "GameModule.h"
using namespace Dasher;
void CGameModule::HandleEvent(Dasher::CEvent *pEvent) {
switc... |
rgee/HFOSS-Dasher | 0eb9c809c5d17f50fb7f24c8eecddadee76ad5d4 | Fixed a dumb syntax error. I should have checked for it. | diff --git a/Src/DasherCore/GameModule.h b/Src/DasherCore/GameModule.h
index 10c743f..570a4dc 100644
--- a/Src/DasherCore/GameModule.h
+++ b/Src/DasherCore/GameModule.h
@@ -1,209 +1,209 @@
// GameModule.h
#ifndef __GameModule_h__
#define __GameModule_h__
#include <string>
#include <cstring>
using namespace ... |
rgee/HFOSS-Dasher | 73b3a5e775772f09eac56590f1ccc5a32a7d4e0c | Cleaned up Game Module constructor and wrote stand-alone developer documentation. | diff --git a/Doc/development/game_mode.pdf b/Doc/development/game_mode.pdf
new file mode 100644
index 0000000..21b8000
Binary files /dev/null and b/Doc/development/game_mode.pdf differ
diff --git a/Src/DasherCore/GameModule.h b/Src/DasherCore/GameModule.h
index 972f4f5..10c743f 100644
--- a/Src/DasherCore/GameModule.h
... |
rgee/HFOSS-Dasher | 08ac9152dcbaf1d627ef732ae1769639cdc0634e | No longer deleting anything. Turns out I didn't understand what I was doing. Dodged that bullet... Also cleaned up obsolete, commented-out code. | diff --git a/Src/DasherCore/GameModule.cpp b/Src/DasherCore/GameModule.cpp
index e723542..118031e 100644
--- a/Src/DasherCore/GameModule.cpp
+++ b/Src/DasherCore/GameModule.cpp
@@ -1,178 +1,139 @@
#include "GameModule.h"
using namespace Dasher;
void CGameModule::HandleEvent(Dasher::CEvent *pEvent) {
switc... |
rgee/HFOSS-Dasher | 8fe01e4969da80decbf8dce51cc8912ff1d15fb4 | Revert "Reformatted crosshair coord. array section" | diff --git a/Src/DasherCore/GameModule.cpp b/Src/DasherCore/GameModule.cpp
index 20cfe93..e723542 100644
--- a/Src/DasherCore/GameModule.cpp
+++ b/Src/DasherCore/GameModule.cpp
@@ -1,157 +1,178 @@
#include "GameModule.h"
using namespace Dasher;
void CGameModule::HandleEvent(Dasher::CEvent *pEvent) {
switc... |
rgee/HFOSS-Dasher | ab6ba665326542b614d0f7a31c860508b0fbcb07 | Created proper destructor. Now we actually get rid of dangling pointers. :P | diff --git a/Src/DasherCore/GameModule.h b/Src/DasherCore/GameModule.h
index 918daef..32ad8fc 100644
--- a/Src/DasherCore/GameModule.h
+++ b/Src/DasherCore/GameModule.h
@@ -1,208 +1,211 @@
// GameModule.h
#ifndef __GameModule_h__
#define __GameModule_h__
#include <string>
#include <cstring>
using namespace ... |
rgee/HFOSS-Dasher | e3db9f8d2464fd4f279df8380bce12691773b53f | Got rid of unused member variables. | diff --git a/Src/DasherCore/GameModule.h b/Src/DasherCore/GameModule.h
index 62fdc69..918daef 100644
--- a/Src/DasherCore/GameModule.h
+++ b/Src/DasherCore/GameModule.h
@@ -1,218 +1,208 @@
// GameModule.h
#ifndef __GameModule_h__
#define __GameModule_h__
#include <string>
#include <cstring>
using namespace ... |
rgee/HFOSS-Dasher | f7ce8b792a655f6ed011cbd89c891eae2a14b422 | Finished converting the event handler to a queue based implementation. Haven't tested rigorously, but compiles and runs without errors. | diff --git a/Src/DasherCore/EventHandler.cpp b/Src/DasherCore/EventHandler.cpp
index adbdb25..a589834 100644
--- a/Src/DasherCore/EventHandler.cpp
+++ b/Src/DasherCore/EventHandler.cpp
@@ -1,116 +1,118 @@
#include "../Common/Common.h"
#include "EventHandler.h"
#include "DasherComponent.h"
#include "DasherInterfac... |
rgee/HFOSS-Dasher | d77803de743c5779743a058725508012dfb4fbe8 | Reformatted crosshair coord. array section | diff --git a/Src/DasherCore/GameModule.cpp b/Src/DasherCore/GameModule.cpp
index e723542..20cfe93 100644
--- a/Src/DasherCore/GameModule.cpp
+++ b/Src/DasherCore/GameModule.cpp
@@ -1,178 +1,157 @@
#include "GameModule.h"
using namespace Dasher;
void CGameModule::HandleEvent(Dasher::CEvent *pEvent) {
switc... |
rgee/HFOSS-Dasher | 82c615a41ed7c6bcebc377cf024ac5998421e8b4 | Fixed issue with drawing the incorrect target string. Made crosshair coordinate arrays not use C++0x-only syntax. | diff --git a/Src/DasherCore/GameModule.cpp b/Src/DasherCore/GameModule.cpp
index e5c96eb..e723542 100644
--- a/Src/DasherCore/GameModule.cpp
+++ b/Src/DasherCore/GameModule.cpp
@@ -1,138 +1,178 @@
#include "GameModule.h"
using namespace Dasher;
void CGameModule::HandleEvent(Dasher::CEvent *pEvent) {
switc... |
rgee/HFOSS-Dasher | 921af652d7a8b6a0f1b272f12a6da576f4bd8269 | Game Mode now draws the target string to the screen. I know the text is huge. Font size or any other display design things have not been decided whatsoever. | diff --git a/Src/DasherCore/DasherView.cpp b/Src/DasherCore/DasherView.cpp
index 5d6eeda..219a580 100644
--- a/Src/DasherCore/DasherView.cpp
+++ b/Src/DasherCore/DasherView.cpp
@@ -1,322 +1,322 @@
// DasherView.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is free s... |
rgee/HFOSS-Dasher | 2cceb46f62fb1223d8e674a876967a36dce7aef9 | Wrote screen-space text draw function. | diff --git a/Src/DasherCore/DasherView.cpp b/Src/DasherCore/DasherView.cpp
index 3701eac..5d6eeda 100644
--- a/Src/DasherCore/DasherView.cpp
+++ b/Src/DasherCore/DasherView.cpp
@@ -1,317 +1,322 @@
// DasherView.cpp
//
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
// Dasher is free s... |
rgee/HFOSS-Dasher | c9bbf5a4b44c7c38bb0b1df5b4b7dbb6665362b9 | Can't seem to get this testing code to build properly. Keeping it around to come back to later. | diff --git a/Src/DasherCore/FileWordGenerator.h b/Src/DasherCore/FileWordGenerator.h
index 411fbff..5c54a85 100644
--- a/Src/DasherCore/FileWordGenerator.h
+++ b/Src/DasherCore/FileWordGenerator.h
@@ -1,143 +1,143 @@
#ifndef __FileWordGenerator_h__
#define __FileWordGenerator_h__
#include <string>
#include <iostr... |
rgee/HFOSS-Dasher | be42d52734c63b431719200640ac779d379ac8e3 | Added testing getters to FileWordGenerator. Wrote test for file opening. | diff --git a/Src/DasherCore/FileWordGenerator.h b/Src/DasherCore/FileWordGenerator.h
index 1c73923..411fbff 100644
--- a/Src/DasherCore/FileWordGenerator.h
+++ b/Src/DasherCore/FileWordGenerator.h
@@ -1,139 +1,143 @@
#ifndef __FileWordGenerator_h__
#define __FileWordGenerator_h__
#include <string>
#include <iostr... |
rgee/HFOSS-Dasher | 01f1260e02f470a1d3b88840851b55867a1dcdab | Pulled out testing branch. All tests will be done here. This is in order to add silly things like getters for private data for use in test fixtures. Changes to code that should not be part of production, but are necessary for testing. | diff --git a/Testing/dasher_tests/FileWordGenTest.cpp b/Testing/dasher_tests/FileWordGenTest.cpp
new file mode 100644
index 0000000..8664894
--- /dev/null
+++ b/Testing/dasher_tests/FileWordGenTest.cpp
@@ -0,0 +1,16 @@
+#include "gtest/gtest.h"
+#include "FileWordGenerator.h"
+using namespace Dasher;
+
+class FileWo... |
rgee/HFOSS-Dasher | 819ff3b965f9a397b056d9ee9315e69008b62872 | Fixed event handler test makefile | diff --git a/Testing/dasher_tests/Makefile b/Testing/dasher_tests/Makefile
index c03d350..7b981c5 100644
--- a/Testing/dasher_tests/Makefile
+++ b/Testing/dasher_tests/Makefile
@@ -1,87 +1,87 @@
# A sample Makefile for building Google Test and using it in user
# tests. Please tweak it to suit your environment and pr... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.