princessbobsanta
|
adc798c0f0
|
resource gui
|
2016-04-28 04:37:46 -10:00 |
|
daniellepul
|
5ad07ee93a
|
latest and greatest
two errors to solve
|
2016-04-28 02:11:47 -10:00 |
|
daniellepul
|
b3214cefda
|
Most recent resource sharing
|
2016-04-28 00:54:03 -10:00 |
|
Chris N
|
6a539c94cd
|
Can set backgrounds now, few touch ups
|
2016-04-27 21:24:54 -10:00 |
|
Chris N
|
9e0baf133c
|
Revert "Fixing the other half of the GitPocalype"
This reverts commit 8374c16dd6c31ed9b16f552276dc5f8b0e8f08d5.
|
2016-04-27 19:47:43 -10:00 |
|
Chris N
|
8374c16dd6
|
Fixing the other half of the GitPocalype
|
2016-04-27 18:54:41 -10:00 |
|
Chris N
|
b566ea98c0
|
Allow for setting draw depth in Room Editor, dictionaries get upated upon movement
|
2016-04-27 17:46:46 -10:00 |
|
Chris N
|
2552000701
|
Fix conflict
|
2016-04-27 16:30:47 -10:00 |
|
Chris N
|
7c4cbcb000
|
Fix the GitPocalypse, Part 2
|
2016-04-27 16:26:54 -10:00 |
|
daniellepul
|
7d94db072a
|
More Progress on Resource server and client
|
2016-04-27 16:05:07 -10:00 |
|
Chris N
|
bbe7b9b9ad
|
Fix the GitHub merge fiasco
Not today, Murphy!
|
2016-04-27 16:01:53 -10:00 |
|
Chris N
|
7edd68604b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# GameCreatorGroupProject/GameCreatorGroupProject/Form1.cs
|
2016-04-27 15:26:32 -10:00 |
|
Chris N
|
c9cfe43ce8
|
Try again
|
2016-04-27 15:24:58 -10:00 |
|
Chris N
|
cc16201908
|
Click and Drag now works in the Room Preview to move existing objects around.
|
2016-04-27 15:02:05 -10:00 |
|
princessbobsanta
|
4c8e33efc6
|
lots of things
|
2016-04-27 14:53:25 -10:00 |
|
princessbobsanta
|
5eb7096411
|
lots of things
|
2016-04-27 14:52:31 -10:00 |
|
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 |
|