Chris N
|
51140f1a15
|
Remove huge zip folder
|
2016-04-27 12:42:26 -10:00 |
|
Chris N
|
e02fe4ab94
|
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project.git
|
2016-04-27 12:35:31 -10:00 |
|
Chris N
|
41a3b38b98
|
Highlight objects selected in room preview and display their properties
|
2016-04-27 12:33:53 -10:00 |
|
codyfred
|
ad6cb77d35
|
my interface thing
might not work with kyles part atm
|
2016-04-27 10:41:49 -10:00 |
|
Chris N
|
3204c2d029
|
Fix exception when putting duplicates in room, corrected scaling
|
2016-04-27 09:55:07 -10:00 |
|
Chris N
|
342368a47f
|
Fix missing files that were causing crashes
|
2016-04-27 09:18:26 -10:00 |
|
Kyle Cannoles
|
a8dbd198ff
|
Removed object and binary files
|
2016-04-27 01:22:08 -10:00 |
|
Kyle Cannoles
|
5f3eb76cc6
|
Even more merging conflicts
|
2016-04-27 01:19:43 -10:00 |
|
Kyle Cannoles
|
2a00047921
|
More merging issues
|
2016-04-27 01:14:06 -10:00 |
|
princessbobsanta
|
dade1de9a5
|
sleep in console app
|
2016-04-27 01:02:06 -10:00 |
|
Kyle Cannoles
|
a7468b9c80
|
Fixed merging issues
|
2016-04-27 00:57:27 -10:00 |
|
Kyle Cannoles
|
2eb3a1bd04
|
Fixed busy waits
|
2016-04-27 00:56:39 -10:00 |
|
princessbobsanta
|
91997b15b8
|
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
|
2016-04-27 00:53:00 -10:00 |
|
princessbobsanta
|
93ddc5c67b
|
sleeps anf fixes
|
2016-04-27 00:52:35 -10:00 |
|
Kyle Cannoles
|
e23f4b2846
|
Added AssemblyInfo.cs
|
2016-04-27 00:23:49 -10:00 |
|
Kyle Cannoles
|
99fac629ca
|
Added App.config
|
2016-04-27 00:21:10 -10:00 |
|
Kyle Cannoles
|
b49494d3b9
|
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project
|
2016-04-27 00:16:58 -10:00 |
|
Kyle Cannoles
|
c17a6b4e4c
|
Added console version of server application
|
2016-04-27 00:15:09 -10:00 |
|
princessbobsanta
|
ec6667536d
|
stuff
|
2016-04-26 23:56:26 -10:00 |
|
princessbobsanta
|
bc9cb8be84
|
stuff
|
2016-04-26 23:55:53 -10:00 |
|
Kyle Cannoles
|
b1f9e66010
|
Fixed remnants of merge
|
2016-04-26 23:43:38 -10:00 |
|
Kyle
|
f63effe597
|
Attempting merge of branches
|
2016-04-26 23:27:19 -10:00 |
|
daniellepul
|
7092c81cc1
|
Adding Resource Client and Server
|
2016-04-25 21:59:51 -10:00 |
|
Chris N
|
ea711a0714
|
Better drag and drop, room previewer renders now
|
2016-04-25 15:25:16 -10:00 |
|
Chris N
|
22426b89d3
|
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project.git
|
2016-04-24 17:03:41 -10:00 |
|
Chris N
|
3214ca837b
|
More room preview rendering, buggy drag-drop start
|
2016-04-24 17:03:36 -10:00 |
|
justinmatsuo
|
f521fc1a91
|
Merge branch 'master' of https://github.com/HeroOfTheWinds/CS-350-410-431-Group-Project.git
|
2016-04-24 14:19:24 -10:00 |
|
justinmatsuo
|
7b20606774
|
changes for ontimer function, virtual function in object, and override on button press in form.
|
2016-04-24 14:18:57 -10:00 |
|
Chris N
|
eb9e54ed70
|
Change absurdly long variable name to a logical one
|
2016-04-24 13:47:36 -10:00 |
|
justinmatsuo
|
ca32713cbe
|
on input updated
|
2016-04-24 12:37:55 -10:00 |
|
Kyle
|
9defa00822
|
Fixed and tested GUI and backend socket code
|
2016-04-24 00:06:05 -10:00 |
|
princessbobsanta
|
2fa6f10179
|
server message flush
|
2016-04-23 20:19:11 -10:00 |
|
princessbobsanta
|
4afc9cc80c
|
fix conflict
|
2016-04-23 19:57:21 -10:00 |
|
princessbobsanta
|
7647374cc8
|
stuff
|
2016-04-23 19:52:47 -10:00 |
|
princessbobsanta
|
5b3a6e672a
|
stuff
|
2016-04-23 19:52:06 -10:00 |
|
Chris N
|
a81b3e5057
|
Merge branch
|
2016-04-23 18:27:57 -10:00 |
|
Chris N
|
4a1c62c302
|
More code for room preview
|
2016-04-23 16:25:39 -10:00 |
|
princessbobsanta
|
3d978cb5a2
|
added exception catching for dataavailable
|
2016-04-23 15:13:51 -10:00 |
|
princessbobsanta
|
917d49dce9
|
added exception catching for dataavailable
|
2016-04-23 15:13:11 -10:00 |
|
justinmatsuo
|
1d331fe895
|
updated the placeholder names.
|
2016-04-23 13:00:40 -10:00 |
|
Chris N
|
36f77eff9e
|
Fix GLControl rendering transparent, start drag'n'drop support
|
2016-04-22 17:28:49 -10:00 |
|
justinmatsuo
|
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 |
|
justinmatsuo
|
a87723419a
|
perlim changes
|
2016-04-21 19:05:07 -10:00 |
|
justinmatsuo
|
3895565041
|
preliminary changes for the txtObjectCode section.
|
2016-04-21 19:00:55 -10:00 |
|
princessbobsanta
|
75d605b5c7
|
some bug fixes
|
2016-04-21 18:45:10 -10:00 |
|
princessbobsanta
|
ebc01009d8
|
should properly save created game object files as resources now
|
2016-04-21 18:19:53 -10:00 |
|
princessbobsanta
|
e62a62d510
|
finishing touches, ability to delete resources
|
2016-04-21 02:36:51 -10:00 |
|
princessbobsanta
|
10cddc08e8
|
Structure, no crash dialogs, etc
|
2016-04-21 01:19:49 -10:00 |
|
princessbobsanta
|
97d1f1b36e
|
got rid of conflicting error message so it doesnt happen again
|
2016-04-20 23:02:30 -10:00 |
|
princessbobsanta
|
a520da421b
|
error checking, and other
|
2016-04-20 22:54:11 -10:00 |
|