]>
code.bitgloo.com Git - clyne/gamedev2.git/log
Clyne Sullivan [Thu, 26 Sep 2019 14:38:12 +0000 (10:38 -0400)]
made Config static; added fps measure/text
Clyne Sullivan [Wed, 25 Sep 2019 20:50:02 +0000 (16:50 -0400)]
created config class
clyne [Wed, 25 Sep 2019 18:35:10 +0000 (14:35 -0400)]
Merge pull request #2 from tcsullivan/font-support
Font support
Andy Belle-Isle [Wed, 25 Sep 2019 16:57:18 +0000 (12:57 -0400)]
Changed up time-step to see if it fixes desktop stuttering movement issues
Andy Belle-Isle [Tue, 24 Sep 2019 06:29:41 +0000 (02:29 -0400)]
Increased texture size for world, made world a little more detailed, and added bouncing ball
Andy Belle-Isle [Tue, 24 Sep 2019 02:14:13 +0000 (22:14 -0400)]
Fixed text rendering
Andy Belle-Isle [Wed, 18 Sep 2019 18:40:23 +0000 (14:40 -0400)]
Added UI rendering support to render loop, although fonts don't render yet
Andy Belle-Isle [Wed, 18 Sep 2019 17:49:46 +0000 (13:49 -0400)]
Started adding UI rendering to render loop
Clyne Sullivan [Wed, 18 Sep 2019 16:10:25 +0000 (12:10 -0400)]
adjust for world changes
Andy Belle-Isle [Wed, 18 Sep 2019 16:07:48 +0000 (12:07 -0400)]
Added basic UI shaders
Andy Belle-Isle [Tue, 17 Sep 2019 23:09:33 +0000 (19:09 -0400)]
World can now draw properly, and camera follows player
Clyne Sullivan [Tue, 17 Sep 2019 19:36:26 +0000 (15:36 -0400)]
text rendering in-place; but something's missing
Clyne Sullivan [Tue, 17 Sep 2019 19:06:39 +0000 (15:06 -0400)]
made VBO rendering accessible
Clyne Sullivan [Tue, 17 Sep 2019 17:55:22 +0000 (13:55 -0400)]
update with master; using VBOs for fonts
Andy Belle-Isle [Mon, 16 Sep 2019 22:16:43 +0000 (18:16 -0400)]
Render system is now decoupled from the world system
Clyne Sullivan [Mon, 16 Sep 2019 16:46:44 +0000 (12:46 -0400)]
success with font loading
Andy Belle-Isle [Sun, 15 Sep 2019 07:18:26 +0000 (03:18 -0400)]
Added event subsection of code
Andy Belle-Isle [Sun, 15 Sep 2019 03:46:10 +0000 (23:46 -0400)]
Fixed todo script to search all development files including Lua, and GLSL scripts
Andy Belle-Isle [Sat, 14 Sep 2019 07:31:40 +0000 (03:31 -0400)]
World can now draw
Andy Belle-Isle [Sat, 14 Sep 2019 06:51:20 +0000 (02:51 -0400)]
Updated world texture loading in Lua
Andy Belle-Isle [Sat, 14 Sep 2019 06:50:32 +0000 (02:50 -0400)]
Textures can now load from lua tables as well as strings
Andy Belle-Isle [Sat, 14 Sep 2019 06:50:02 +0000 (02:50 -0400)]
Added basic world assets
Andy Belle-Isle [Sat, 14 Sep 2019 05:10:55 +0000 (01:10 -0400)]
World can now generate its own mesh
Andy Belle-Isle [Sat, 14 Sep 2019 05:10:41 +0000 (01:10 -0400)]
Added texture size and offset data
Andy Belle-Isle [Sat, 14 Sep 2019 04:30:05 +0000 (00:30 -0400)]
Lua can now modify world size and world data
Andy Belle-Isle [Fri, 13 Sep 2019 06:05:28 +0000 (02:05 -0400)]
Added SOIL and cereal to libraries list in README
Andy Belle-Isle [Fri, 13 Sep 2019 06:03:09 +0000 (02:03 -0400)]
Readded todo script from gamedev1 that can be used to find all TODOs placed in our code
Andy Belle-Isle [Fri, 13 Sep 2019 05:52:26 +0000 (01:52 -0400)]
Lua can now register materials for worlds during world registration
Andy Belle-Isle [Fri, 13 Sep 2019 05:51:27 +0000 (01:51 -0400)]
Added texture caching to the texture loading process
Andy Belle-Isle [Thu, 12 Sep 2019 22:16:06 +0000 (18:16 -0400)]
Ability to pass world data into Lua
Clyne Sullivan [Thu, 12 Sep 2019 18:24:39 +0000 (14:24 -0400)]
add font name to Text component
Clyne Sullivan [Thu, 12 Sep 2019 18:24:18 +0000 (14:24 -0400)]
switch to pairs
Clyne Sullivan [Wed, 11 Sep 2019 19:32:06 +0000 (15:32 -0400)]
added font loading code, untested
Andy Belle-Isle [Wed, 11 Sep 2019 05:46:14 +0000 (01:46 -0400)]
World system now has a pointer to the current world, and worlds created in Lua are returned to Lua as pointers
Andy Belle-Isle [Wed, 11 Sep 2019 04:24:40 +0000 (00:24 -0400)]
Merge branch 'master' of github.com:tcsullivan/gamedev2
Andy Belle-Isle [Wed, 11 Sep 2019 04:24:32 +0000 (00:24 -0400)]
Made world generation a bit nicer
Andy Belle-Isle [Wed, 11 Sep 2019 03:55:54 +0000 (23:55 -0400)]
Started world system
Clyne Sullivan [Wed, 11 Sep 2019 00:13:52 +0000 (20:13 -0400)]
added Text component and skeleton system
Andy Belle-Isle [Sat, 7 Sep 2019 16:58:39 +0000 (12:58 -0400)]
Added 64-bit compiling to Makefile
Andy Belle-Isle [Sat, 7 Sep 2019 07:15:34 +0000 (03:15 -0400)]
Added camera variable to render code
Andy Belle-Isle [Sat, 7 Sep 2019 07:14:26 +0000 (03:14 -0400)]
Started extremely basic world generation
Andy Belle-Isle [Sat, 7 Sep 2019 05:24:15 +0000 (01:24 -0400)]
Removed EntityX pointers from script system and replaced with references
Andy Belle-Isle [Sat, 7 Sep 2019 05:15:51 +0000 (01:15 -0400)]
Flips the X axis of the normal map instead of the light direction when model is flipped
Andy Belle-Isle [Sat, 7 Sep 2019 05:15:19 +0000 (01:15 -0400)]
Player init script can now allow the player to jump
Andy Belle-Isle [Sat, 7 Sep 2019 05:14:51 +0000 (01:14 -0400)]
Added physics to the script system
Andy Belle-Isle [Sat, 7 Sep 2019 05:14:36 +0000 (01:14 -0400)]
Added jumping support to the player
Andy Belle-Isle [Sat, 7 Sep 2019 05:13:59 +0000 (01:13 -0400)]
Added physics loop function that runs in it's own thread
Andy Belle-Isle [Sat, 7 Sep 2019 05:12:33 +0000 (01:12 -0400)]
Added physics system that updates entity positions and veocity in its own thread
Andy Belle-Isle [Sat, 7 Sep 2019 05:11:57 +0000 (01:11 -0400)]
Added new physics component that allows entities to fall
Andy Belle-Isle [Wed, 4 Sep 2019 07:09:07 +0000 (03:09 -0400)]
Fixed boolean saving in lua table saving
Andy Belle-Isle [Wed, 4 Sep 2019 06:58:07 +0000 (02:58 -0400)]
Values in entity table are now saved in the save file
Clyne Sullivan [Wed, 4 Sep 2019 01:50:09 +0000 (21:50 -0400)]
reduced shader version so intel video works
Andy Belle-Isle [Wed, 4 Sep 2019 00:13:41 +0000 (20:13 -0400)]
Script now flips player when they go left
Clyne Sullivan [Wed, 4 Sep 2019 00:03:41 +0000 (20:03 -0400)]
lua handling movement events? idea
clyne [Tue, 3 Sep 2019 22:17:51 +0000 (18:17 -0400)]
Merge pull request #1 from tcsullivan/save-load
Save load looks good
Clyne Sullivan [Tue, 3 Sep 2019 21:58:04 +0000 (17:58 -0400)]
render: use tab.get for strings
Clyne Sullivan [Tue, 3 Sep 2019 17:58:38 +0000 (13:58 -0400)]
added load message
Clyne Sullivan [Tue, 3 Sep 2019 17:35:13 +0000 (13:35 -0400)]
json save and load, made GameState class
Clyne Sullivan [Tue, 3 Sep 2019 17:06:58 +0000 (13:06 -0400)]
save json to file
Andy Belle-Isle [Tue, 3 Sep 2019 06:22:39 +0000 (02:22 -0400)]
Start working on Lua function serialization
clyne [Mon, 2 Sep 2019 23:01:41 +0000 (19:01 -0400)]
Trying this out
Clyne Sullivan [Mon, 2 Sep 2019 22:53:21 +0000 (18:53 -0400)]
made json names readable
Clyne Sullivan [Mon, 2 Sep 2019 22:23:09 +0000 (18:23 -0400)]
json entity saving: cout
Clyne Sullivan [Mon, 2 Sep 2019 19:41:18 +0000 (15:41 -0400)]
Merge branch 'master' of https://github.com/tcsullivan/gamedev2 into save-load
Andy Belle-Isle [Mon, 2 Sep 2019 19:40:45 +0000 (15:40 -0400)]
Removed frequent Lua updates
Clyne Sullivan [Mon, 2 Sep 2019 19:15:26 +0000 (15:15 -0400)]
Merge branch 'master' of https://github.com/tcsullivan/gamedev2 into save-load
Andy Belle-Isle [Mon, 2 Sep 2019 05:52:56 +0000 (01:52 -0400)]
Fixed flipped texture normals being displayed properly in shaders
Andy Belle-Isle [Mon, 2 Sep 2019 05:42:36 +0000 (01:42 -0400)]
Changed Lua Idle function names
Andy Belle-Isle [Mon, 2 Sep 2019 05:05:57 +0000 (01:05 -0400)]
Added Lua update function that allows certain entities to update every loop
Andy Belle-Isle [Mon, 2 Sep 2019 04:15:35 +0000 (00:15 -0400)]
Made lighting a bit softer
Andy Belle-Isle [Mon, 2 Sep 2019 04:08:38 +0000 (00:08 -0400)]
Added LIGHTING
Andy Belle-Isle [Mon, 2 Sep 2019 04:08:25 +0000 (00:08 -0400)]
Added rock asset+normal and cat normal (kinda broken)
Andy Belle-Isle [Sun, 1 Sep 2019 23:19:06 +0000 (19:19 -0400)]
Scaled up entities and stopped player from flashing
Andy Belle-Isle [Sun, 1 Sep 2019 23:12:32 +0000 (19:12 -0400)]
Added player and rabbit textures
Andy Belle-Isle [Sun, 1 Sep 2019 23:03:00 +0000 (19:03 -0400)]
Merge branch 'master' of https://github.com/tcsullivan/gamedev2
Andy Belle-Isle [Sun, 1 Sep 2019 23:02:49 +0000 (19:02 -0400)]
THE CAT IS BACK
Andy Belle-Isle [Sun, 1 Sep 2019 23:02:29 +0000 (19:02 -0400)]
Added SOIL for OpenGL texture loading
Clyne Sullivan [Sun, 1 Sep 2019 22:22:32 +0000 (18:22 -0400)]
added cereal library
Clyne Sullivan [Sun, 1 Sep 2019 22:18:16 +0000 (18:18 -0400)]
added save/load structure to entityx
Clyne Sullivan [Sun, 1 Sep 2019 21:24:01 +0000 (17:24 -0400)]
fix player keys...
Clyne Sullivan [Sun, 1 Sep 2019 18:47:15 +0000 (14:47 -0400)]
Make allll tabs spaces
Clyne Sullivan [Sun, 1 Sep 2019 18:45:42 +0000 (14:45 -0400)]
made all formatting match
clyne [Sun, 1 Sep 2019 16:58:59 +0000 (12:58 -0400)]
Oops, swap left and right player movement
tcsullivan [Sun, 1 Sep 2019 16:56:49 +0000 (12:56 -0400)]
added player system; player moves left and right
Andy Belle-Isle [Sun, 1 Sep 2019 06:27:33 +0000 (02:27 -0400)]
Spread out the entities a bit on the test triangle screen
Andy Belle-Isle [Sun, 1 Sep 2019 06:24:21 +0000 (02:24 -0400)]
All 3 entities now play with idle functions and rendering a bit SUPER BETA
Andy Belle-Isle [Sun, 1 Sep 2019 06:23:49 +0000 (02:23 -0400)]
Added cat texture for testing later
Andy Belle-Isle [Sun, 1 Sep 2019 05:25:14 +0000 (01:25 -0400)]
Game loop now updates position every tick, and added circular movement to dog
Andy Belle-Isle [Sun, 1 Sep 2019 03:36:23 +0000 (23:36 -0400)]
Makefile updated to support OpenGL and GLEW
Andy Belle-Isle [Sun, 1 Sep 2019 03:36:00 +0000 (23:36 -0400)]
Modified WindowSystem into full render system
This is does because EntityX doesn't guarantee system initialization order
Andy Belle-Isle [Sun, 1 Sep 2019 03:33:25 +0000 (23:33 -0400)]
Added basic shader files
Andy Belle-Isle [Sat, 31 Aug 2019 20:09:41 +0000 (16:09 -0400)]
Merge branch 'master' of https://github.com/tcsullivan/gamedev2
Andy Belle-Isle [Sat, 31 Aug 2019 20:09:39 +0000 (16:09 -0400)]
Forgot to add Velocity component binding to Lua, added
Clyne Sullivan [Sat, 31 Aug 2019 18:31:56 +0000 (14:31 -0400)]
cleaned Makefile output
Andy Belle-Isle [Sat, 31 Aug 2019 07:17:16 +0000 (03:17 -0400)]
Upon spawning, automatically call Entity Init function if it exists
Andy Belle-Isle [Sat, 31 Aug 2019 05:22:14 +0000 (01:22 -0400)]
Added velocity component, and force add component dependencies when they don't exist
Andy Belle-Isle [Sat, 31 Aug 2019 04:40:21 +0000 (00:40 -0400)]
Lua spawned entities have "Idle" function
Every entity spawned from Lua is given the "Scripted" component,
this component holds onto the Entities master table and it's idle
function
Andy [Fri, 30 Aug 2019 15:01:15 +0000 (11:01 -0400)]
Added IdleFunc components to entities, this will be assigned to all entities no matter what, even if the idle func is empty
Andy Belle-Isle [Fri, 30 Aug 2019 04:48:29 +0000 (00:48 -0400)]
Added sol2 to linguist ignored library list
Andy Belle-Isle [Fri, 30 Aug 2019 04:45:36 +0000 (00:45 -0400)]
Forget what I said, I just need to change git attributes to mark for vendor