csrpg.git
5 years agofixed ERR_H redefinition master
matthew [Tue, 6 Nov 2018 19:46:46 +0000 (19:46 +0000)]
fixed ERR_H redefinition

5 years agoMerge branch 'gl-dev' into HEAD
matthew [Tue, 6 Nov 2018 19:08:26 +0000 (19:08 +0000)]
Merge branch 'gl-dev' into HEAD

5 years agokey rebinding
matthew [Tue, 6 Nov 2018 18:48:27 +0000 (18:48 +0000)]
key rebinding

5 years agofake fullscreen by default
matthew [Tue, 6 Nov 2018 18:47:04 +0000 (18:47 +0000)]
fake fullscreen by default

5 years agofixed Translate/Rotate/Scale order for cube
matthew [Tue, 6 Nov 2018 18:31:27 +0000 (18:31 +0000)]
fixed Translate/Rotate/Scale order for cube

5 years agofixed nippy camera bug
matthew [Mon, 5 Nov 2018 21:24:26 +0000 (21:24 +0000)]
fixed nippy camera bug

5 years agoremoved extranious comments
matthew [Sun, 4 Nov 2018 12:27:53 +0000 (12:27 +0000)]
removed extranious comments

5 years agoRestricted input to when the window is focussed
matthew [Sun, 4 Nov 2018 12:26:09 +0000 (12:26 +0000)]
Restricted input to when the window is focussed

5 years agoadded SDL_SetRelativeMouseMode
matthew [Sat, 3 Nov 2018 21:38:17 +0000 (21:38 +0000)]
added SDL_SetRelativeMouseMode

5 years agoremoved crpgCameraRender(), implemented crpgCameraUpdate()
matthew [Sat, 3 Nov 2018 21:36:59 +0000 (21:36 +0000)]
removed crpgCameraRender(), implemented crpgCameraUpdate()

5 years agoremoved extranious function call & speed setting
matthew [Sat, 3 Nov 2018 21:36:07 +0000 (21:36 +0000)]
removed extranious function call & speed setting

5 years agofixed incorrect keybindings
matthew [Sat, 3 Nov 2018 17:51:58 +0000 (17:51 +0000)]
fixed incorrect keybindings

5 years agofixed crpgInputPressed
matthew [Sat, 3 Nov 2018 17:48:59 +0000 (17:48 +0000)]
fixed crpgInputPressed

5 years agoReworked camera
matthew [Sat, 3 Nov 2018 16:21:43 +0000 (16:21 +0000)]
Reworked camera

5 years agoupdated crpgCameraUpdate to take delta time as a param
matthew [Sat, 3 Nov 2018 16:21:02 +0000 (16:21 +0000)]
updated crpgCameraUpdate to take delta time as a param

5 years agoadded mouse input
matthew [Sat, 3 Nov 2018 16:20:06 +0000 (16:20 +0000)]
added mouse input

5 years agoprinting out the status of both cubes
matthew [Sat, 3 Nov 2018 16:19:02 +0000 (16:19 +0000)]
printing out the status of both cubes

5 years agoadded vec2_t
matthew [Sat, 3 Nov 2018 16:18:35 +0000 (16:18 +0000)]
added vec2_t

5 years agoremoved extranious comments
matthew [Sat, 3 Nov 2018 16:12:40 +0000 (16:12 +0000)]
removed extranious comments

5 years agoupdated default keyboard bindings
matthew [Tue, 16 Oct 2018 17:08:01 +0000 (18:08 +0100)]
updated default keyboard bindings

5 years agoChanged to SDL_GetKeyBoardState for input
matthew [Sat, 13 Oct 2018 15:55:58 +0000 (16:55 +0100)]
Changed to SDL_GetKeyBoardState for input

Also moved input to a seperate translation unit, implemented the
InputDevice struct to facilitate multiple input devices in the
future

5 years agoimplemented semi-fixed timestep
matthew [Tue, 9 Oct 2018 18:45:13 +0000 (19:45 +0100)]
implemented semi-fixed timestep

6 years agoimplemented dt for camera
matthew [Mon, 8 Oct 2018 18:52:03 +0000 (19:52 +0100)]
implemented dt for camera

6 years agorefactored camera code to seperate compilation unit
matthew [Tue, 18 Sep 2018 20:05:42 +0000 (21:05 +0100)]
refactored camera code to seperate compilation unit

6 years agotesting second cube
matthew [Tue, 18 Sep 2018 17:51:56 +0000 (18:51 +0100)]
testing second cube

6 years agoupdated crate vertex to utilise transform
matthew [Tue, 18 Sep 2018 17:51:49 +0000 (18:51 +0100)]
updated crate vertex to utilise transform

6 years agofixed missing cube vertex and implemented perspective projection
matthew [Tue, 18 Sep 2018 17:15:30 +0000 (18:15 +0100)]
fixed missing cube vertex and implemented perspective projection

6 years agofinally got cube rendering working
matthew [Mon, 17 Sep 2018 18:48:18 +0000 (19:48 +0100)]
finally got cube rendering working

6 years agoupdate gitignore to ignore apitrace files
matthew [Mon, 17 Sep 2018 18:47:27 +0000 (19:47 +0100)]
update gitignore to ignore apitrace files

6 years agofixed incorrect loading of RGBA formatted images, added blend calls in main to test
matthew [Tue, 21 Aug 2018 20:16:40 +0000 (21:16 +0100)]
fixed incorrect loading of RGBA formatted images, added blend calls in main to test

6 years agoimplemented texture and shader structures
matthew [Tue, 21 Aug 2018 19:53:58 +0000 (20:53 +0100)]
implemented texture and shader structures

6 years agochanged colors so that red is on top of rect, blue is on bottom
matthew [Sat, 18 Aug 2018 21:11:25 +0000 (22:11 +0100)]
changed colors so that red is on top of rect, blue is on bottom

6 years agofixed small syntax errors
matthew [Sat, 18 Aug 2018 21:10:42 +0000 (22:10 +0100)]
fixed small syntax errors

6 years agoimplemented crpgShaderSetX functions
matthew [Sat, 18 Aug 2018 21:06:02 +0000 (22:06 +0100)]
implemented crpgShaderSetX functions

6 years agomoved shader handling to shader.h, removed tri2 shader, altered tri shader to accept...
matthew [Sat, 18 Aug 2018 21:02:08 +0000 (22:02 +0100)]
moved shader handling to shader.h, removed tri2 shader, altered tri shader to accept vertex colors

6 years agoimplemented rect rendering using EBOs, drawing two rectangles with seperate shaders
matthew [Sat, 18 Aug 2018 17:23:53 +0000 (18:23 +0100)]
implemented rect rendering using EBOs, drawing two rectangles with seperate shaders

6 years agoimplemented basic modern opengl rendering. Currently just rendering a tri to the...
matthew [Sat, 18 Aug 2018 16:19:25 +0000 (17:19 +0100)]
implemented basic modern opengl rendering. Currently just rendering a tri to the screen

6 years agoimplemented basic file read func
matthew [Sat, 18 Aug 2018 16:15:11 +0000 (17:15 +0100)]
implemented basic file read func

6 years agocreated a basic gl window, implemented gl/err.c skeleton
matthew [Fri, 17 Aug 2018 18:14:08 +0000 (19:14 +0100)]
created a basic gl window, implemented gl/err.c skeleton

6 years agoMerge branch 'dev' of ssh.gitgud.io:matthew/csrpg into dev dev
matthew [Fri, 17 Aug 2018 12:46:56 +0000 (13:46 +0100)]
Merge branch 'dev' of ssh.gitgud.io:matthew/csrpg into dev

6 years agoimplemented layer info
matthew [Wed, 8 Aug 2018 19:47:41 +0000 (19:47 +0000)]
implemented layer info

6 years agoimplemented initial info window
matthew [Wed, 8 Aug 2018 19:19:35 +0000 (19:19 +0000)]
implemented initial info window

6 years agoremoved extranious draw_borders function
matthew [Wed, 8 Aug 2018 19:12:30 +0000 (19:12 +0000)]
removed extranious draw_borders function

6 years agoprevented board drawing over boarders
matthew [Wed, 8 Aug 2018 18:59:34 +0000 (18:59 +0000)]
prevented board drawing over boarders

6 years agoimplemented map movement
matthew [Wed, 8 Aug 2018 18:35:55 +0000 (18:35 +0000)]
implemented map movement

6 years agoremoved additional 'layer++'
matthew [Tue, 7 Aug 2018 20:00:44 +0000 (20:00 +0000)]
removed additional 'layer++'

6 years agoadded bounds checking on layer traversal
matthew [Tue, 7 Aug 2018 19:50:01 +0000 (19:50 +0000)]
added bounds checking on layer traversal

6 years agoimplemented keybindings, quitting with q and viewing different layers with J,K
matthew [Tue, 7 Aug 2018 19:48:42 +0000 (19:48 +0000)]
implemented keybindings, quitting with q and viewing different layers with J,K

6 years agoimplemented drawing of a single z-level
matthew [Tue, 7 Aug 2018 18:30:58 +0000 (18:30 +0000)]
implemented drawing of a single z-level

6 years agorenamed functions to match nogl/board_renderer.h
matthew [Tue, 7 Aug 2018 17:36:58 +0000 (17:36 +0000)]
renamed functions to match nogl/board_renderer.h

6 years agoremoved extranious comment
matthew [Tue, 7 Aug 2018 17:35:28 +0000 (17:35 +0000)]
removed extranious comment

6 years agomoved tile_repr() to tile_renderer
matthew [Tue, 7 Aug 2018 17:34:17 +0000 (17:34 +0000)]
moved tile_repr() to tile_renderer

6 years agochanged board_renderer function names
matthew [Tue, 7 Aug 2018 17:33:04 +0000 (17:33 +0000)]
changed board_renderer function names

6 years agofixed board failing to render
matthew [Tue, 7 Aug 2018 16:48:57 +0000 (16:48 +0000)]
fixed board failing to render

6 years agoimplemented clear_internal()
matthew [Sun, 5 Aug 2018 18:01:47 +0000 (19:01 +0100)]
implemented clear_internal()

6 years agoMerge branch 'master' of ssh.gitgud.io:matthew/csrpg
matthew [Sun, 5 Aug 2018 15:31:16 +0000 (16:31 +0100)]
Merge branch 'master' of ssh.gitgud.io:matthew/csrpg

6 years agoMerge branch 'dev'
matthew [Sun, 5 Aug 2018 15:30:15 +0000 (16:30 +0100)]
Merge branch 'dev'

implemented error messages

6 years agofixed error output not showing, moved error output to it's own window
matthew [Sun, 5 Aug 2018 15:29:31 +0000 (16:29 +0100)]
fixed error output not showing, moved error output to it's own window

6 years agoimplemented basic error handling, need to create a ncurses window for them it seems
matthew [Sat, 4 Aug 2018 20:03:46 +0000 (21:03 +0100)]
implemented basic error handling, need to create a ncurses window for them it seems

6 years agoMerge branch 'dev' into 'master'
matthew [Sat, 4 Aug 2018 20:02:40 +0000 (13:02 -0700)]
Merge branch 'dev' into 'master'

Dev

See merge request matthew/csrpg!2

6 years agoimplemented board_renderer, creating a bordered ncurses window for the board to be...
matthew [Sat, 4 Aug 2018 20:01:40 +0000 (21:01 +0100)]
implemented board_renderer, creating a bordered ncurses window for the board to be drawn to

6 years agoimplemented clamping for tile's z coord to prevent output errors in nogl build
matthew [Sat, 4 Aug 2018 14:03:26 +0000 (15:03 +0100)]
implemented clamping for tile's z coord to prevent output errors in nogl build

6 years agoremoved why param for board_get_size, changed board size to 4x3
matthew [Sat, 4 Aug 2018 14:02:48 +0000 (15:02 +0100)]
removed why param for board_get_size, changed board size to 4x3

6 years agoremoved why param in board_get_size, changed array access in various functions to...
matthew [Sat, 4 Aug 2018 14:01:57 +0000 (15:01 +0100)]
removed why param in board_get_size, changed array access in various functions to use flatten()

6 years agodrawing grid representations + values to the screen
matthew [Sat, 4 Aug 2018 13:23:54 +0000 (14:23 +0100)]
drawing grid representations + values to the screen

6 years agoMerge branch 'dev' into 'master'
matthew [Sat, 4 Aug 2018 13:03:00 +0000 (06:03 -0700)]
Merge branch 'dev' into 'master'

Dev

See merge request matthew/csrpg!1

6 years agoadded ncurses support and basic functionality
matthew [Sat, 4 Aug 2018 13:00:46 +0000 (14:00 +0100)]
added ncurses support and basic functionality

6 years agofixed incorrect size being malloc'd for tiles
matthew [Sat, 4 Aug 2018 11:55:56 +0000 (12:55 +0100)]
fixed incorrect size being malloc'd  for tiles

6 years agoLinking game-nogl target with correct libs
matthew [Sat, 4 Aug 2018 11:54:59 +0000 (12:54 +0100)]
Linking game-nogl target with correct libs

6 years agoarray headaches
matthew [Tue, 31 Jul 2018 19:27:18 +0000 (20:27 +0100)]
array headaches

6 years agoadded error visualisation
matthew [Mon, 30 Jul 2018 16:31:03 +0000 (17:31 +0100)]
added error visualisation

6 years agooutputting elevation and terrain
matthew [Mon, 30 Jul 2018 16:28:50 +0000 (17:28 +0100)]
outputting elevation and terrain

6 years agofixed board orientation
matthew [Sun, 29 Jul 2018 22:09:41 +0000 (22:09 +0000)]
fixed board orientation

6 years agomoved to a single array solution for board
matthew [Sun, 29 Jul 2018 19:59:51 +0000 (19:59 +0000)]
moved to a single array solution for board

6 years agocreated and drawing board - axis are incorrect though
matthew [Sun, 29 Jul 2018 19:50:45 +0000 (19:50 +0000)]
created and drawing board - axis are incorrect though

6 years agofixed null return from board_init()
matthew [Sun, 29 Jul 2018 19:15:09 +0000 (19:15 +0000)]
fixed null return from board_init()

6 years agoadded \n
matthew [Sun, 29 Jul 2018 19:14:39 +0000 (19:14 +0000)]
added \n

6 years agofixed incorrect casts
matthew [Sun, 29 Jul 2018 19:14:09 +0000 (19:14 +0000)]
fixed incorrect casts

6 years agofixed incorrect function names
matthew [Sun, 29 Jul 2018 19:13:44 +0000 (19:13 +0000)]
fixed incorrect function names

6 years agofixed error in Makefile
matthew [Sun, 29 Jul 2018 19:13:21 +0000 (19:13 +0000)]
fixed error in Makefile

6 years agoimplemented rudimentary board
matthew [Sun, 29 Jul 2018 16:10:05 +0000 (16:10 +0000)]
implemented rudimentary board

6 years agofixed syntax errors
matthew [Sat, 28 Jul 2018 17:44:27 +0000 (17:44 +0000)]
fixed syntax errors

6 years agoadded include guards
matthew [Sat, 28 Jul 2018 17:44:04 +0000 (17:44 +0000)]
added include guards

6 years agoinitial commit
matthew [Sat, 28 Jul 2018 17:05:36 +0000 (17:05 +0000)]
initial commit