Commit Graph

169 Commits

Author SHA1 Message Date
c1b5e72d7d Added a proper cursor, game pause menu now has a transparent background (Game is drawn behind menu) 2020-01-28 23:17:25 -06:00
46cffa293e Added more menus; stub for settings, basic pause menu, fixes for multiple Game inits 2020-01-28 19:59:42 -06:00
c25df59819 Use new @include preprocessor added to CyberarmEngin::Shader 2020-01-28 10:48:47 -06:00
e7b84bd123 Removed redundant glError? from Map class and renamed CommonMethods#glError? to #gl_error?, added debug settings for disabling shaders and whether to exit on opengl error 2020-01-27 22:19:07 -06:00
75f94963b2 DISABLED collision detection and physics 2019-12-09 16:37:50 -06:00
e4333a82b8 Fixed immediate mode lighting, improved-ish modern gl lighting 2019-12-09 11:48:54 -06:00
ff1d34deec Initital shader lighting support 2019-12-08 20:05:48 -06:00
af19166af2 Modern 'GL now renders properly, camera works as expected, added fallback to immediate mode if shader fails to compile. 2019-12-08 17:50:20 -06:00
e076ce8612 Stubbed out VBOs for model 2019-12-05 20:43:54 -06:00
6aeee41a71 Progress towards modern gl made 2019-12-05 17:23:02 -06:00
18595bdf7f Supplanted biped with character 2019-11-05 11:23:14 -06:00
2ae97aa993 Fixed progressbar jumping back due to needing to load additional assets detected in manifests 2019-09-30 09:14:35 -05:00
40d1105fb8 Moved collision/physics information into manifest, made real mouse cursor always invisible and use 'virtual' cursor when needed. 2019-09-28 13:29:21 -05:00
e038dcbe24 Extracted Crosshair and Demo from Game 2019-09-27 22:46:32 -05:00
4af7f21a51 Make PhysicsManager use Map#gravity, defined EARTH and MOON gravity's 2019-09-27 14:41:50 -05:00
f3d3ceebb8 Fixed crash when jumping 2019-09-27 14:33:35 -05:00
b091a489af Removed entity management from Game, refactored Map to MapLoader and added Map to manage world 2019-09-27 14:30:23 -05:00
1bfc6e6929 Initial work on Scripting sandbox, no longer Entity's responsibility. 2019-09-27 12:37:16 -05:00
0b40e042bf Make wavefront material parser use relative path for textures 2019-09-27 10:08:57 -05:00
8df05eda13 Added event handler for :entity_moved, added door script, various tweaks 2019-09-26 16:19:01 -05:00
f7936b38bc Ripped IMICFPS::Wavefront::Model to IMICFPS::Model, more refactoring needed. 2019-09-26 14:29:42 -05:00
b6d7a6ebdb Implemented event system, Implemented initial bit of scripting system, Stubbed component system. Entities can now use the scripting system to place their 'decorations' 2019-09-26 12:13:08 -05:00
e41a2b6524 Cleanup i-mic-fps.rb a bit 2019-09-26 08:24:32 -05:00
eb7a7fc6d6 Added protype scripts for Alternate Tank and Power Plant, changed naming convention of assets to: package -> name instead of: package -> model 2019-09-25 22:01:03 -05:00
19f5a0cd9c Added Alternate Tank, go back to using glScalef for scaling models until shader based rendering is implemented, improved Map handling of scaling. 2019-09-25 20:59:19 -05:00
ecee086590 Exported door model, added CollisionManager#on_ground?(entity), made gravity work in PhyisicsManager if Entity has physics enabled, updated test map 2019-09-25 18:17:18 -05:00
954c6899be Made model/entity manifest a first class object 2019-09-25 11:52:19 -05:00
f41078b14b Fixed player unable to rotate 2019-09-25 10:57:37 -05:00
a2089c0ae1 Fixed demo feature crashing game 2019-09-25 10:50:50 -05:00
93522703f9 Fixed terrain and skydome not loading in LoadingState 2019-09-25 10:18:16 -05:00
ee844f256f Renamed objects/ to game_objects/ removed redundant entities, added Map loader and test map, made LoadingState use Map for entity asset loading. 2019-09-25 10:09:05 -05:00
42191729ae Added models for: Power Plant, Information Panel, Purchase Terminal, and Door. Updated War Factory model. added .svg files. misc. 2019-09-24 15:34:09 -05:00
da9b0212c2 Disable MESA opengl/glsl override enviroment vars for now, disable vbo/vao for now 2019-08-13 10:26:37 -05:00
6669687278 Simplified InputMapper#action 2019-08-13 10:23:08 -05:00
7ebf65f535 Player entity no longer directly handles raw button input (turn 180 and fpv toggle need more work), fixed Console printing empty lines for tab completion when available commands list is empty. 2019-08-13 10:18:30 -05:00
016e8109de Gravity constant moved into constants.rb, camera can now report what it is looking at, entity has knowledge of camera now, AABB tree search can now use either BoundingBox or Ray colliders 2019-08-13 09:47:23 -05:00
771b6a4247 Switched back to old model renderer while fixing vbo based renderer, set stats text shadow color to black, fixed tab completion showing empty list of available options when tab completion triggered 2019-08-12 21:27:04 -05:00
d07130b03b 'fixed' glGetAttribLocation crashes (shader compiler likes to agressively optimize) 2019-08-11 21:46:18 -05:00
f11b091fe0 Renamed lighting shader to default, shoehorned in glsl 3.30 support for Intel on Linux, removed duplicate handleGlError methods, added OpenGL and GLU to Object namespace, removed redundant includes for OpenGL and GLU, VBO and VAO now render (all be it incorrectly) 2019-08-11 14:53:15 -05:00
73478b7e37 Added connect and disconnect stub commands, added autocomplete to help command. 2019-08-11 10:20:05 -05:00
388c43343c Fixed some warnings, moved Subcommand into its own file, added support for subcommand and subcommand options autocomplete in Console, added texture ids to Model vertex buffer object 2019-08-11 09:35:05 -05:00
ce7d132864 Fixed some warnings, moved Subcommand into its own file, added support for subcommand and subcommand options autocomplete in Console, added texture ids to Model vertex buffer object 2019-08-11 09:34:25 -05:00
185d760a83 Model is now able to push data into VBO 2019-08-10 13:36:37 -05:00
80a6389af4 Fix rendering error 2019-08-10 10:15:22 -05:00
a22a3f3f3c Moved constants into their own file, LoadingState now loads shaders and now shows 'Loading [model|shader] name...', tweaked player running speed, Player model is no longer rendered when in first person view, removed redundant ShaderManager 2019-08-10 09:40:31 -05:00
bc89fb6911 Tweaked player drag, speed, and turn speed 2019-08-09 19:20:19 -05:00
f84b680de5 PhysicsManager now has a job, CollisionManager enabled, using Player velocity instead of position for movement controls, added Entity drag, added spaces 2019-08-09 08:27:34 -05:00
3b662090fc Fixed Console erasing input when pressing down arrow key 2019-08-08 20:34:18 -05:00
9ab019f1bc Fixed console command history incorrect index for going down through history 2019-08-08 20:28:35 -05:00
a82e71cea7 Added support for Console auto-complete 2019-08-08 20:23:48 -05:00