This website requires JavaScript.
adc798c0f0
resource gui
2016-04-28 04:37:46 -10:00
5ad07ee93a
latest and greatest
2016-04-28 02:11:47 -10:00
b3214cefda
Most recent resource sharing
2016-04-28 00:54:03 -10:00
6a539c94cd
Can set backgrounds now, few touch ups
2016-04-27 21:24:54 -10:00
9e0baf133c
Revert "Fixing the other half of the GitPocalype"
2016-04-27 19:47:43 -10:00
8374c16dd6
Fixing the other half of the GitPocalype
2016-04-27 18:54:41 -10:00
b566ea98c0
Allow for setting draw depth in Room Editor, dictionaries get upated upon movement
2016-04-27 17:46:46 -10:00
2552000701
Fix conflict
2016-04-27 16:30:47 -10:00
7c4cbcb000
Fix the GitPocalypse, Part 2
2016-04-27 16:26:54 -10:00
7d94db072a
More Progress on Resource server and client
2016-04-27 16:05:07 -10:00
bbe7b9b9ad
Fix the GitHub merge fiasco
2016-04-27 16:01:53 -10:00
7edd68604b
Merge remote-tracking branch 'origin/master'
2016-04-27 15:26:32 -10:00
c9cfe43ce8
Try again
2016-04-27 15:24:58 -10:00
cc16201908
Click and Drag now works in the Room Preview to move existing objects around.
2016-04-27 15:02:05 -10:00
4c8e33efc6
lots of things
2016-04-27 14:53:25 -10:00
5eb7096411
lots of things
2016-04-27 14:52:31 -10:00
51140f1a15
Remove huge zip folder
2016-04-27 12:42:26 -10:00
e02fe4ab94
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project.git
2016-04-27 12:35:31 -10:00
41a3b38b98
Highlight objects selected in room preview and display their properties
2016-04-27 12:33:53 -10:00
ad6cb77d35
my interface thing
2016-04-27 10:41:49 -10:00
3204c2d029
Fix exception when putting duplicates in room, corrected scaling
2016-04-27 09:55:07 -10:00
342368a47f
Fix missing files that were causing crashes
2016-04-27 09:18:26 -10:00
a8dbd198ff
Removed object and binary files
2016-04-27 01:22:08 -10:00
5f3eb76cc6
Even more merging conflicts
2016-04-27 01:19:43 -10:00
2a00047921
More merging issues
2016-04-27 01:14:06 -10:00
dade1de9a5
sleep in console app
2016-04-27 01:02:06 -10:00
a7468b9c80
Fixed merging issues
2016-04-27 00:57:27 -10:00
2eb3a1bd04
Fixed busy waits
2016-04-27 00:56:39 -10:00
91997b15b8
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
2016-04-27 00:53:00 -10:00
93ddc5c67b
sleeps anf fixes
2016-04-27 00:52:35 -10:00
e23f4b2846
Added AssemblyInfo.cs
2016-04-27 00:23:49 -10:00
99fac629ca
Added App.config
2016-04-27 00:21:10 -10:00
b49494d3b9
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
2016-04-27 00:16:58 -10:00
c17a6b4e4c
Added console version of server application
2016-04-27 00:15:09 -10:00
ec6667536d
stuff
2016-04-26 23:56:26 -10:00
bc9cb8be84
stuff
2016-04-26 23:55:53 -10:00
b1f9e66010
Fixed remnants of merge
2016-04-26 23:43:38 -10:00
f63effe597
Attempting merge of branches
2016-04-26 23:27:19 -10:00
7092c81cc1
Adding Resource Client and Server
2016-04-25 21:59:51 -10:00
ea711a0714
Better drag and drop, room previewer renders now
2016-04-25 15:25:16 -10:00
22426b89d3
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project.git
2016-04-24 17:03:41 -10:00
3214ca837b
More room preview rendering, buggy drag-drop start
2016-04-24 17:03:36 -10:00
f521fc1a91
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project.git
2016-04-24 14:19:24 -10:00
7b20606774
changes for ontimer function, virtual function in object, and override on button press in form.
2016-04-24 14:18:57 -10:00
eb9e54ed70
Change absurdly long variable name to a logical one
2016-04-24 13:47:36 -10:00
ca32713cbe
on input updated
2016-04-24 12:37:55 -10:00
9defa00822
Fixed and tested GUI and backend socket code
2016-04-24 00:06:05 -10:00
2fa6f10179
server message flush
2016-04-23 20:19:11 -10:00
4afc9cc80c
fix conflict
2016-04-23 19:57:21 -10:00
7647374cc8
stuff
2016-04-23 19:52:47 -10:00
5b3a6e672a
stuff
2016-04-23 19:52:06 -10:00
a81b3e5057
Merge branch
2016-04-23 18:27:57 -10:00
4a1c62c302
More code for room preview
2016-04-23 16:25:39 -10:00
3d978cb5a2
added exception catching for dataavailable
2016-04-23 15:13:51 -10:00
917d49dce9
added exception catching for dataavailable
2016-04-23 15:13:11 -10:00
1d331fe895
updated the placeholder names.
2016-04-23 13:00:40 -10:00
36f77eff9e
Fix GLControl rendering transparent, start drag'n'drop support
2016-04-22 17:28:49 -10:00
bf5327a615
not completed, but on create, on destruct, collision and on step are set up. needs more work, not sure how to grab the text from the txtObjectname for insertion into txtObjectCode.
2016-04-21 19:30:05 -10:00
a87723419a
perlim changes
2016-04-21 19:05:07 -10:00
3895565041
preliminary changes for the txtObjectCode section.
2016-04-21 19:00:55 -10:00
75d605b5c7
some bug fixes
2016-04-21 18:45:10 -10:00
ebc01009d8
should properly save created game object files as resources now
2016-04-21 18:19:53 -10:00
e62a62d510
finishing touches, ability to delete resources
2016-04-21 02:36:51 -10:00
10cddc08e8
Structure, no crash dialogs, etc
2016-04-21 01:19:49 -10:00
97d1f1b36e
got rid of conflicting error message so it doesnt happen again
2016-04-20 23:02:30 -10:00
a520da421b
error checking, and other
2016-04-20 22:54:11 -10:00
72dde5ac4b
error checking, and other
2016-04-20 22:53:50 -10:00
b11f2c711b
added my section on btnSave section jared was working on. for creating the goc file.
2016-04-20 19:38:45 -10:00
5ddac9a858
merge
2016-04-20 19:37:06 -10:00
fdfcba61c3
added .goc file creator section.
2016-04-20 19:34:25 -10:00
208b8c4d15
Add Resource Importer file extention checking
2016-04-20 16:52:52 -10:00
4c983644d9
merge stuff
2016-04-20 16:11:55 -10:00
a7ed0e746f
more stuff
2016-04-20 16:11:19 -10:00
15d800e493
Add scrollbars to panels in Object Creator
2016-04-20 14:53:28 -10:00
1ca87c34b8
Load resource names into Object Designer
2016-04-20 14:31:10 -10:00
c03a998c76
Fix a couple Exception errors, change project dialog
2016-04-20 13:31:38 -10:00
622ea71c70
Adding ChatWindow designer
2016-04-19 20:21:58 -10:00
609231faf6
Added ChatWindow functionality to send and receive messages
2016-04-19 20:20:33 -10:00
73b5b99058
fixed bug on saving empty collision design (now only accepts objects with more than 3 points), and added more file stuff including adding objects to object list pane
2016-04-19 19:05:51 -10:00
d4be60d8ed
.gob file writing/parsing and file dialog filtering
2016-04-19 00:41:37 -10:00
0fa8755249
Added code to pass chatserver object to ChatWindow form
2016-04-18 22:31:09 -10:00
b4b25342c9
Rnamed Form3 to ChatWindow
2016-04-18 21:06:06 -10:00
481cccffca
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
2016-04-18 18:45:37 -10:00
955036b63a
Created new form to act as the chat window
2016-04-18 18:43:31 -10:00
e12de72772
gui control and things
2016-04-17 17:53:39 -10:00
de6e425c1f
gui control and things
2016-04-17 17:52:55 -10:00
f042796ae4
Incorporate Room.cs, start refactoring for final layout.
2016-04-17 17:03:45 -10:00
a94b1b262f
collision designer
2016-04-17 00:53:30 -10:00
381016ea19
forgot to check for 0 width
2016-04-16 16:17:13 -10:00
a6f649a75c
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
2016-04-16 16:09:58 -10:00
c0ee4124a1
collision functional (enough)
2016-04-16 16:09:35 -10:00
e74fdaebba
Fix background tiles making gaps when scaling window
2016-04-16 14:35:15 -10:00
571db77fb1
checks collisions properly for overlapping segments parallel to dirction of travel
2016-04-15 19:26:47 -10:00
d2fb3715a7
high speed partitioning
2016-04-14 19:58:24 -10:00
6aea17c184
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
2016-04-13 20:44:57 -10:00
08d778ff72
add Room.cs
2016-04-13 20:41:36 -10:00
5c8992fc77
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project.git
2016-04-13 17:40:43 -10:00
ae6c0af73a
Add background image tileset support, some demo
2016-04-13 17:40:35 -10:00
5094ce082a
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
2016-04-13 15:51:26 -10:00
3ffe8b5422
timeouts, security, and priorities
2016-04-13 15:50:56 -10:00
princessbobsanta
daniellepul
Chris N
codyfred
Kyle Cannoles
Kyle Cannoles
justinmatsuo