Skip to content

Commit 925b9ba

Browse files
author
Ellen Poe
committed
Fixed some stuff
1 parent 97abec1 commit 925b9ba

File tree

7 files changed

+381
-363
lines changed

7 files changed

+381
-363
lines changed

native/course_render.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ void draw_sky(point_t pos)
470470
// that makes the plane and texture non contiguous.
471471
// this removes an artifacts visible in the sky
472472

473-
// nopoe 10/13/2013: necessary even on windows when using OpenGL ES rendering code
473+
// ellenhp 10/13/2013: necessary even on windows when using OpenGL ES rendering code
474474

475475
ZERO,
476476
ZERO,

native/credits.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#define CREDITS_MAX_Y -140
4444
#define CREDITS_MIN_Y 64
4545

46-
#define CREDITS_SPEED 40
46+
#define CREDITS_SPEED 60
4747
#define CREDITS_JOYSTICK_SPEED 150
4848

4949
double joystick_y;
@@ -70,8 +70,8 @@ static credit_line_t credit_lines[] =
7070
{"credits_text", ""},
7171
{"credits_h2", "Development Team:"},
7272
{"credits_text_small", "(Alphabetical Order)"},
73+
{"credits_text", "Ellen Poe"},
7374
{"credits_text", "Lennie Araki"},
74-
{"credits_text", "Nolan Poe"},
7575
{"credits_text", ""},
7676
{"credits_h2", "Original Tux Racer"},
7777
{"credits_h2", "Core Development Team:"},
@@ -90,7 +90,7 @@ static credit_line_t credit_lines[] =
9090
{"credits_text", "Felix Jankowski"},
9191
{"credits_text", ""},
9292
{"credits_h2", "Source available at:"},
93-
{"credits_text", "https://github.com/nopoe/TuxRacer-SDL2"},
93+
{"credits_text", "https://github.com/ellenhp/TuxRacer-SDL2"},
9494
};
9595

9696
static scalar_t y_offset = 0;
@@ -127,7 +127,7 @@ void mouse_cb(int button, int state, int finger_index, int x, int y)
127127
/*---------------------------------------------------------------------------*/
128128
/*!
129129
Joystick axis event callback
130-
\author nopoe
130+
\author ellenhp
131131
\date Created: 2013-10-08
132132
\date Modified: 2013-10-08
133133
*/
@@ -139,7 +139,7 @@ void credits_joystick_func(double x, double y)
139139
/*---------------------------------------------------------------------------*/
140140
/*!
141141
Joystick button event callback
142-
\author nopoe
142+
\author ellenhp
143143
\date Created: 2013-10-08
144144
\date Modified: 2013-10-08
145145
*/

native/game_type_select.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ static void game_type_select_init(void)
153153
setup_gui();
154154

155155
gui_add_widget(practice_btn = create_button("Play", practice_click_cb), NULL);
156-
gui_add_widget(basic_tutorial_btn = create_button("Basic Tutorial", basic_tutorial_click_cb), NULL);
157-
gui_add_widget(advanced_tutorial_btn = create_button("Jump Tutorial", advanced_tutorial_click_cb), NULL);
156+
gui_add_widget(basic_tutorial_btn = create_button("Tutorial", basic_tutorial_click_cb), NULL);
158157
gui_add_widget(pref_btn = create_button("Settings", pref_click_cb), NULL);
159158
gui_add_widget(credits_btn = create_button("Credits", credits_click_cb), NULL);
160159

native/hier_util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <vector>
3535

3636
std::deque<glm::mat4> matrix_stack;
37-
glm::mat4 current_mat;
37+
glm::mat4 current_mat(1.0f);
3838

3939
std::vector<GLfloat> tux_verts;
4040
std::vector<GLfloat> tux_normals;

0 commit comments

Comments
 (0)