Browse Source

Changed Font to Droid Sans Mono

Thomas Buck 11 years ago
parent
commit
b3580de005
6 changed files with 19 additions and 14 deletions
  1. 1
    0
      ChangeLog
  2. 2
    0
      README.md
  3. 4
    4
      data/OpenRaider.init
  4. BIN
      data/test.ttf
  5. 1
    1
      setup.sh
  6. 11
    9
      src/Render.cpp

+ 1
- 0
ChangeLog View File

6
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
6
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
7
 
7
 
8
 	[ 20140101 ]
8
 	[ 20140101 ]
9
+	* Changed (unknown) included Font to Droid Sans Mono
9
 	* Fixed Render bug, now console is visible again
10
 	* Fixed Render bug, now console is visible again
10
 	* Implemented CMD + Q shortcut on Mac to quit
11
 	* Implemented CMD + Q shortcut on Mac to quit
11
 	* Added bool mFirstMouseEvent to SDLSystem used to ignore
12
 	* Added bool mFirstMouseEvent to SDLSystem used to ignore

+ 2
- 0
README.md View File

53
 
53
 
54
 ## License
54
 ## License
55
 
55
 
56
+The included font, Droid Sans Mono, was created by Steve Matteson and is licensed under the [Apache 2.0 License](http://www.droidfonts.com/licensing/).
57
+
56
 OpenRaider is based on code, specs, and alogrithms from:
58
 OpenRaider is based on code, specs, and alogrithms from:
57
 
59
 
58
 + GooseEgg/Freyja 3d Modelers by Mongoose
60
 + GooseEgg/Freyja 3d Modelers by Mongoose

+ 4
- 4
data/OpenRaider.init View File

3
 
3
 
4
 [Video.OpenGL]
4
 [Video.OpenGL]
5
 Driver=/usr/lib/libGL.so.1
5
 Driver=/usr/lib/libGL.so.1
6
-Width=640
7
-Height=480
6
+Width=1280
7
+Height=720
8
 FastCard=true
8
 FastCard=true
9
 FullScreen=false
9
 FullScreen=false
10
 Font=~/.OpenRaider/data/test.ttf
10
 Font=~/.OpenRaider/data/test.ttf
19
 Port=27910
19
 Port=27910
20
 
20
 
21
 [Input.Mouse]
21
 [Input.Mouse]
22
-SensitivityX=2.0
23
-SensitivityY=0.5
22
+SensitivityX=1.0
23
+SensitivityY=1.0
24
 
24
 
25
 [OpenRaider.Engine]
25
 [OpenRaider.Engine]
26
 PakDir=~/.OpenRaider/paks/
26
 PakDir=~/.OpenRaider/paks/

BIN
data/test.ttf View File


+ 1
- 1
setup.sh View File

1
 #!/bin/sh
1
 #!/bin/sh
2
 
2
 
3
-## If you modify this file, do the same changes to mac_dist/OpenRaider!!!
3
+## If you modify this file, do similar changes in mac_dist/OpenRaider.sh
4
 
4
 
5
 echo "Setting up OpenRaider for user $USER..."
5
 echo "Setting up OpenRaider for user $USER..."
6
 mkdir -p ~/.OpenRaider
6
 mkdir -p ~/.OpenRaider

+ 11
- 9
src/Render.cpp View File

291
 	mString.Init(5, 5, id);
291
 	mString.Init(5, 5, id);
292
 
292
 
293
 	// String 0: OpenRaider version in lower right corner
293
 	// String 0: OpenRaider version in lower right corner
294
-	mString.Scale(0.90);
295
-	err = mString.glPrintf(mWidth - 10 * strlen(VERSION),
296
-								  mHeight-24, 0, VERSION);
294
+	mString.Scale(1.00);
295
+	err = mString.glPrintf(mWidth - 15 * strlen(VERSION),
296
+								  mHeight-35, 0, VERSION);
297
 	mString.SetString(0, VERSION);
297
 	mString.SetString(0, VERSION);
298
 
298
 
299
 	if (err)
299
 	if (err)
302
 	}
302
 	}
303
 
303
 
304
 	// String 1: Used for FPS in game text output
304
 	// String 1: Used for FPS in game text output
305
-	mString.Scale(0.5);
306
-	err = mString.glPrintf(8, 0, 0, "                ");
305
+	mString.Scale(1.0);
306
+	err = mString.glPrintf(8, mHeight - 35, 0, "                ");
307
+    mString.SetString(1, "                ");
307
 
308
 
308
 	if (err)
309
 	if (err)
309
 	{
310
 	{
311
 	}
312
 	}
312
 
313
 
313
 	// String 2: Used for game console
314
 	// String 2: Used for game console
314
-    mString.Scale(1.00);
315
-	err = mString.glPrintf(8, 20, 0, console);
315
+    mString.Scale(1.0);
316
+	err = mString.glPrintf(8, 25, 0, console);
316
     mString.SetString(2, console);
317
     mString.SetString(2, console);
317
 
318
 
318
 	if (err)
319
 	if (err)
322
 
323
 
323
 	// String 3: Used for one line map select menu
324
 	// String 3: Used for one line map select menu
324
 	mString.Scale(1.75);
325
 	mString.Scale(1.75);
325
-	err = mString.glPrintf(mWidth/2-200, mHeight/2-24, 0, menu);
326
+	err = mString.glPrintf(mWidth/2-235, mHeight/2-24, 0, menu);
326
     mString.SetString(3, menu);
327
     mString.SetString(3, menu);
327
 
328
 
328
 	if (err)
329
 	if (err)
332
 
333
 
333
 	// String 4: Used for one line in game text output
334
 	// String 4: Used for one line in game text output
334
 	mString.Scale(1.0);
335
 	mString.Scale(1.0);
335
-	err = mString.glPrintf(8, 18*2, 0, "                    ");
336
+	err = mString.glPrintf(8, 55, 0, "                    ");
337
+    mString.SetString(4, "                    ");
336
 
338
 
337
 	if (err)
339
 	if (err)
338
 	{
340
 	{

Loading…
Cancel
Save