CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
187 Commits 11 Branches 24 Tags
b66d6762542de4b41f9475269cf62118a0ee2762
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
andreja6 be7e532ead Merge pull request #19 from andreja6/dialogs 
Literally did nothing even close to dialogs
 2018-05-30 22:04:05 -07:00
andreja6 2607fc8551 Exit on alt+f4 rather than ESC 2018-05-03 12:13:14 -07:00
andreja6 1de2fb6811 Set controls to UHJK 2018-05-03 11:41:08 -07:00
andreja6 c84a2173c8 Removed repeat function 2018-05-03 11:09:45 -07:00
andreja6 c38ede1bd1 Added message functions to DataModel 2018-05-02 19:59:49 -07:00
andreja6 0f609662bb Literally nothing changed 2018-05-02 19:12:41 -07:00
andreja6 512655b448 Changed spacing 2018-05-02 17:10:29 -07:00
andreja6 4fea98467d Added versioning 2018-05-02 17:09:18 -07:00
andreja6 29dad6bd8d Cleaned up useless code and comments 2018-05-02 17:04:36 -07:00
andreja6 e04f53c071 Changed how buttons render 2018-05-02 16:47:14 -07:00
andreja6 5232d5e97f No longer exit on audio failure 2018-05-01 23:56:32 -07:00
andreja6 011d817321 Merge pull request #18 from andreja6/datamodel-V1 
Finished Datamodel v1
 2018-05-01 21:44:04 -07:00
andreja6 60c7a386f0 Changed how selection boxes work 2018-05-01 21:43:18 -07:00
andreja6 3ee06b6c62 Made guiroot a child of datamodel 2018-05-01 21:00:46 -07:00
andreja6 57b407c894 Made timer and score a part of Workspace 2018-05-01 20:10:52 -07:00
andreja6 9999eb62e4 Changed how render works 2018-05-01 19:58:58 -07:00
andreja6 930aee06dc Finished new datamodel 
Not very efficient, but its somewhere
 2018-05-01 15:02:04 -07:00
andreja6 e6ca1cd502 changed AudioPlayer::PlaySound() to AudioPlayer::playSound() 2018-05-01 12:14:54 -07:00
andreja6 c875454b40 Created bare workspace and datamodel classes 2018-05-01 11:47:23 -07:00
andreja6 388962a5e7 Finished base for new datamodel 2018-05-01 11:33:24 -07:00
andreja6 9986f2ee5f Made class name getter, can not be set outside of class 2018-04-30 21:43:02 -07:00
andreja6 529821ab9f Made size getters and setters 2018-04-30 18:05:14 -07:00
andreja6 d72d09f95d Merge pull request #17 from Zmxhawrhbg/master 
add a build instructions page
 2018-04-30 11:31:01 -07:00
andreja6 8dff73d5f5 added test squares to resize and arrows 2018-04-30 01:07:23 -07:00
andreja6 4bdb1d6939 Changed how panning works 2018-04-29 23:55:53 -07:00
andreja6 f0f16a3a69 Tried changing how window starts 2018-04-29 20:00:00 -07:00
andreja6 09c6a73e80 Made rotation closer to real 2018-04-29 18:58:22 -07:00
andreja6 3108021007 Made part selection better 2018-04-29 18:33:13 -07:00
andreja6 fa3a0f9aa4 Merge branch 'master' of https://github.com/andreja6/G3D-Fun 2018-04-29 16:31:14 -07:00
andreja6 739f116895 Added rotate sound 
Next required thing: Collision check
 2018-04-29 12:00:30 -07:00
andreja6 f281103ca1 Rotation and Selection 2018-04-29 11:40:35 -07:00
andreja6 b7d14dcf2a Added part selection 2018-04-29 01:54:02 -07:00
andreja6 5659a1e13c Changed README.md 2018-04-28 23:26:17 -07:00
andreja6 fb48c4d85d Changed how camera pan works 2018-04-28 23:22:54 -07:00
andreja6 ce3ca419e8 Merge pull request #16 from andreja6/duplicate-button 
Duplicate button
 2018-04-28 20:18:05 -07:00
andreja6 c3b9e1f6c8 Removed unnecessary code 2018-04-28 20:16:48 -07:00
andreja6 9ba0db1ab9 semi-working pan right 2018-04-28 20:09:51 -07:00
andreja6 70d9aded42 Attempted pan left, what 
Camera makes no sence
 2018-04-28 19:57:51 -07:00
andreja6 a99f58b62f "Delete" key also deletes 2018-04-27 15:27:02 -07:00
andreja6 fcb1ad05fd Changed how boxes are rendered 
PhysicalInstance now has a getBox() method that returns a Box the same way it would have been rendered, also added is a getCFrameRenderBased() which returns the CFrame that would have been used in the render pass
 2018-04-27 15:05:51 -07:00
andreja6 4094631f30 Made most fake buttons actual buttons 2018-04-27 12:19:49 -07:00
andreja6 1cae1135b9 Merge pull request #15 from andreja6/sound 
Added sound and sound effects
 2018-04-27 09:19:54 -07:00
andreja6 f78ca49ec0 Added try/catch 2018-04-27 09:18:48 -07:00
andreja6 e9c7607a4b Added init check 2018-04-27 00:04:04 -07:00
andreja6 6d49e266dd Made AudioPlayer's play and init method static 2018-04-26 21:41:07 -07:00
andreja6 78cdb01ef1 changed how bitrate is set 2018-04-26 21:28:22 -07:00
andreja6 1ed434c858 removed useless arial fonts 2018-04-26 20:11:36 -07:00
andreja6 f4acbaacdc Added camera click 2018-04-26 20:07:19 -07:00
andreja6 e777f3ccc4 Added sound system 
Added delete sound
 2018-04-26 20:01:37 -07:00
andreja6 9e61c9e4d2 Fixed bad operator 2018-04-26 13:36:57 -07:00
andreja6 3fb730ceba Merge pull request #14 from andreja6/raycasting-part-selection 
Added delete functionality
 2018-04-26 13:35:15 -07:00
andreja6 811ac871a3 Added delete functionality 2018-04-26 11:57:04 -07:00
andreja6 54ed0299c0 Merge pull request #13 from andreja6/bevels 
Bevels
 2018-04-26 11:18:28 -07:00
andreja6 09fcd72e43 Changed shade mode 2018-04-26 11:17:54 -07:00
andreja6 0371836dc8 Attempted to make bevel code 2018-04-26 11:15:41 -07:00
andreja6 74e423e9f8 Added code to unlock mouse on message box 2018-04-25 21:32:28 -07:00
andreja6 9868937c08 Merge branch 'master' of https://github.com/andreja6/G3D-Fun 2018-04-25 14:39:04 -07:00
andreja6 5c500859a3 Removed dialog test on 'U' 2018-04-25 14:38:55 -07:00
andreja6 1274a8deca Merge pull request #12 from andreja6/buttons 
Added button listeners, added some buttons, Made window use HWND rather than SDL
 2018-04-25 14:36:03 -07:00
andreja6 4bbd82b715 Merge pull request #11 from andreja6/window 
Now uses HWND rather than an SDL Window
 2018-04-25 14:35:21 -07:00
andreja6 827e610b8c Added selected in button class 
Basically active, it will probably be renamed
 2018-04-25 14:34:27 -07:00
andreja6 10f3a25c54 Changed how selection boxes are rendered 2018-04-25 14:17:33 -07:00
andreja6 e650d4afbc Removed useless images 2018-04-25 05:58:33 -07:00
andreja6 d738a804e6 Changed some images, Added camera button listeners 2018-04-24 22:00:46 -07:00
andreja6 1f7c5b28f8 Test of forward button 2018-04-24 20:24:34 -07:00
andreja6 a9d533e447 YAY 2018-04-24 19:35:53 -07:00
andreja6 a9f91c8a9e Changed how window works 
Controls now work
 2018-04-24 19:17:49 -07:00
andreja6 04f1ac813e Controller still broken but window size works 2018-04-24 19:02:48 -07:00
andreja6 2b2672b9fd Now resizes with hwnd 
but controls are dead asgassdsad
 2018-04-24 18:23:07 -07:00
andreja6 d0bba08f3a Controlls dont work 2018-04-24 18:11:29 -07:00
andreja6 3f222b75d8 Tried adding dialog and main window 2018-04-24 18:01:26 -07:00
andreja6 560245e005 Im not sure what changed 2018-04-24 17:20:04 -07:00
andreja6 cbd680a6ac Changed the way blocks are rendered 2018-04-24 17:13:04 -07:00
andreja6 f6b301a836 Added click listener to TextButton 2018-04-24 12:44:24 -07:00
andreja6 d1a1ebd016 Added mouse click functions to image button 
Added destructor for images
Deleting listener now on exit
 2018-04-24 12:39:53 -07:00
andreja6 9ffe37c21a Fixed issue with disabled images 2018-04-24 00:59:03 -07:00
andreja6 30aa99ff0b Changed how the scale disabled icon looks 2018-04-24 00:35:57 -07:00
andreja6 3ee0075f1d Added scale tool image 2018-04-24 00:34:34 -07:00
andreja6 05da8e2270 Added "disabled" bool to button 
Changed null check
 2018-04-23 23:40:58 -07:00
andreja6 68ac692314 Added final GUI components 2018-04-23 23:25:06 -07:00
andreja6 a4176510b9 Changed class organization 2018-04-23 22:05:41 -07:00
andreja6 55e890bdc1 Made BaseButton class 
Buttons now children of BaseButton
Buttons now render over and down modes
Text buttons now exist
Buttons render differently
 2018-04-23 22:02:12 -07:00
andreja6 98d3358fd5 Added resize, cursor, and arrows mode 
Added selection box rendering
Added arrow rendering
added resize rendering
 2018-04-23 20:09:01 -07:00
andreja6 68edb442d3 Mouse now stays where you left it 2018-04-23 17:53:41 -07:00
andreja6 20e8c63d5c Changed how the camera works 
Added arrow key controlled camera
Removed WASD camera movement
FPS is now locked to 30 Frames P/S
Mouse wheel now moves the camera
 2018-04-23 17:51:03 -07:00
andreja6 5d8e4bc040 Merge pull request #10 from andreja6/HWND 
Hwnd
 2018-04-23 14:09:23 -07:00
andreja6 71cf1e39f3 Delete stdafx.h 2018-04-23 21:09:05 +00:00
andreja6 21be7a4c73 Delete Work.cpp 2018-04-23 21:08:08 +00:00
andreja6 e7df4b26f0 Merge pull request #8 from andreja6/dialogui 
Added test dialog
 2018-04-23 14:04:41 -07:00
andreja6 11788fa37c Changed the way controllerflags are rendered, they work now 2018-04-23 11:35:02 -07:00
andreja6 e29ad28a06 Test of hover text 2018-04-22 23:32:36 -07:00
andreja6 9d30c2aed7 Tried doing stuff with fonts 2018-04-22 22:52:50 -07:00
andreja6 c62df67db2 Changed default DataModel name to "undefined" 2018-04-22 21:09:43 -07:00
andreja6 c9e997c794 Added mouse cursors 2018-04-22 20:44:29 -07:00
andreja6 8a6d7d0d8d added new line 2018-04-22 19:57:12 -07:00
andreja6 6cea4397f2 Changed window to SDL, can now access bare HWND component 2018-04-22 19:51:14 -07:00
andreja6 f0fffa71d4 Tried something 2018-04-22 15:05:45 -07:00
andreja6 49c117d5d7 Removed MFC 2018-04-22 12:32:37 -07:00
andreja6 19913cb665 Added base class for button listening 
Fixed a few memory leaks
 2018-04-20 18:55:55 -07:00
andreja6 810488e20c Added test dialog 2018-04-20 06:59:37 -07:00