CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
111 Commits 11 Branches 24 Tags
811ac871a33e87d059374d6e1553e5ccf1ce4962
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
andreja6 811ac871a3 Added delete functionality 2018-04-26 11:57:04 -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
andreja6 a91bc4c5b5 Reverted to old sln 2018-04-19 22:26:57 -07:00
andreja6 45e28f96dc Merge branch 'master' of https://github.com/andreja6/G3D-Fun 2018-04-19 21:57:29 -07:00
andreja6 b521f1c86f Fixed solution 2018-04-19 21:57:26 -07:00
andreja6 1d4082bdd0 Merge pull request #7 from andreja6/guiinstance 
Fixed names
 2018-04-19 21:45:04 -07:00
andreja6 df6cee3e11 Fixed names 2018-04-19 21:44:30 -07:00
andreja6 15e1868fc2 Merge pull request #6 from andreja6/guiinstance 
Merge Guiinstance
 2018-04-19 21:42:11 -07:00
andreja6 113115b6df Changed the way releases compile 2018-04-19 21:41:03 -07:00
andreja6 2445d076a1 Reset Solution 2018-04-19 21:36:31 -07:00
andreja6 8fc8549a6c Added deprication notice to debug mode 2018-04-19 20:42:11 -07:00
andreja6 bb3aac25c5 put drawButton in its class, and not in main loop 2018-04-19 20:30:30 -07:00
andreja6 09fa95d4a0 Added dialog 2018-04-19 19:40:15 -07:00
andreja6 acd87e351b Made test work on offset 2018-04-19 18:17:19 -07:00
andreja6 8d53e8ff0f Removed useless debug comments and code 2018-04-19 18:07:48 -07:00
andreja6 b900e918b4 Converted most menu buttons to TextButton, No longer hard coded 
Removed useless values
MUCH faster now!
 2018-04-19 18:03:12 -07:00
andreja6 067a744cda Changed className TextButtonInstance to TextButton to match naming convention 2018-04-19 17:19:02 -07:00
andreja6 3e4c128347 Added bare bones TextButton rendering 
(Yes, it took that many lines of code)
 2018-04-19 17:18:26 -07:00
andreja6 acbe509c05 Fixed errors 
Changed bit depth
 2018-04-19 00:15:16 -07:00
andreja6 1bb0c6eb6f Removed broken image 2018-04-18 23:56:10 -07:00
andreja6 8889494848 Removed unneded font 2018-04-18 23:55:21 -07:00
andreja6 8a780d6f0b Added some images 2018-04-18 23:53:32 -07:00
andreja6 0a2b508290 Added down state 
-Added mouse down state
-Commented out useless function
-Added temporary default value to ovr_id
-Added temporary images go_dn and go_dn_id
-Removed debug spacing increase and decrease key press code (causes crashes by design and was useless)
 2018-04-18 22:50:31 -07:00
andreja6 33e3aeb16e Commented out useless function 2018-04-18 20:42:15 -07:00
andreja6 4526fa68df Added mouseover testing, will be moved to instances 2018-04-18 20:39:36 -07:00
andreja6 acfd499cfb GO BUTTON TEXTURE! 
YES!
 2018-04-18 19:56:48 -07:00
andreja6 b12c753179 Added visible and float booleans 2018-04-13 20:09:20 -07:00
andreja6 7d623bb99d Added Over and Out options on text buttons 2018-04-13 14:14:35 -07:00
andreja6 21684a6ea3 Added properties to TextButtonInstance 
Why wont the go button become textured aaaaaaaaaaaaaaaa
 2018-04-12 22:44:51 -07:00
andreja6 5306ec6809 Fixed include issues 2018-04-12 19:25:17 -07:00
andreja6 fe2f8cf160 Added GUI instances 
Added toolbox dialog
TODO: Port GUI buttons to instances
 2018-04-12 18:25:17 -07:00
andreja6 f4d01e48fa Merge pull request #5 from andreja6/ui 
Merged to wrong branch
 2018-04-12 11:04:02 -07:00
andreja6 0816390509 Merge pull request #3 from DarkKnight64/master 
delete most of the fonts we don't need
 2018-04-12 11:00:27 -07:00
andreja6 9ce3a1a26c Merge pull request #4 from andreja6/ui 
Merge UI
 2018-04-12 11:00:00 -07:00
andreja6 ce7b221a11 im not sure what changed but ok 2018-04-11 14:43:15 -07:00
andreja6 2776546ab7 Added about screen template 2018-04-11 14:03:33 -07:00
andreja6 49013a7da8 Removed test dialog 2018-04-11 11:50:13 -07:00
andreja6 ede16aa880 Created dialogs resource 2018-04-11 11:49:48 -07:00
andreja6 7fad41ff53 Removed CLR due to crashing 2018-04-11 11:16:41 -07:00
andreja6 57e1eb54b7 Made camera faster on shift 2018-04-11 10:41:08 -07:00
andreja6 368aa03838 Merge pull request #2 from andreja6/instances 
Merge instances with master
 2018-04-11 10:19:28 -07:00
andreja6 4769e4f331 Converted to CLR to allow for forms 2018-04-11 10:17:26 -07:00
andreja6 e348ee5ea2 Added test object 2018-04-11 09:43:42 -07:00
andreja6 2a205e2998 Made title of window dynamic 2018-04-11 09:13:48 -07:00
andreja6 58ee5c9889 Added instance rendering 
Added rendering and creation
 2018-04-11 08:56:54 -07:00
andreja6 7d38523166 Changed how instances work 
Made instance vector hold pointers
Made all instances delete on exit
Made error message delete all instances
 2018-04-11 07:20:43 -07:00
andreja6 2b508cd017 Changed the way of getting an instance type 2018-04-11 06:42:11 -07:00
andreja6 59f6652396 Added instance types 
I feel like the way it works now isn't the best
 2018-04-10 21:59:55 -07:00
andreja6 0908d93f29 Added instance vector 
Added instance header to main
 2018-04-10 18:41:38 -07:00
andreja6 d899c4fa4e Added base instance classes 2018-04-10 18:02:19 -07:00
andreja6 f8f309f98e Removed unneded space 2018-04-10 17:35:00 -07:00
andreja6 3087ad0cc8 Cleaned up error message 2018-04-10 15:59:15 -07:00
andreja6 aa57683aad Test of webhook 2018-04-10 14:27:52 -07:00
andreja6 9d2b4a5f95 Removed unneded font 2018-04-10 14:24:49 -07:00
andreja6 b4c60ec624 Added file checking 
Check to make sure if file exists before continuing
 2018-04-10 14:10:41 -07:00
andreja6 e0bad6e42b Made requred G3D version 6.10 for safety reasons 2018-04-10 12:40:51 -07:00