fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1511 Commits
1 Branch
0 Tags
227 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '31bb289723'
${ noResults }
Commit Graph

294 Commits (31bb2897237f1250985bd49aad88308fb07d7cfc)

Author SHA1 Message Date
fjc40 070654a95c Javadoc fix.
8 years ago
fjc40 2ad947b57d The start time of the race is no longer scaled by the race speed scalar.
8 years ago
fjc40 ab96884dc6 Javadoc.
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
fjc40 9fa1b9ee67 Re-enabled source id allocator check.
8 years ago
fjc40 3fa6b9200d Finished MarkRoundingSequence class. Added MarkRoundingData class.
8 years ago
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196]
8 years ago
Connor Taylor-Brown bae428fb3f Recovered a private method used in a test
8 years ago
Connor Taylor-Brown c94e0af69c Removed remaining println statements
8 years ago
Connor Taylor-Brown 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
Jessica Syder b808056567 Host boat isnt disappearing anymore (I think).
8 years ago
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-)
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Connor Taylor-Brown b902b05e5e Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)
8 years ago
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 108643b59d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Fan-Wu Yang d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188]
8 years ago
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu c97706d86e Merge branch 'master' into story70
8 years ago
fjc40 346aa148ef Added some debug statements, and WIP MarkRoundingSequence class.
8 years ago
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
cbt24 70f4a00d12 Scaled down marks and boats to make 3rd person view more realistic
8 years ago
hba56 e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76
8 years ago
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
hba56 5e516b0508 re added the standard race
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
hba56 4c2ab9cc9a Merge branch 'master' into story77
8 years ago
Joseph Gardner 2868f921e2 Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]
8 years ago
Joseph Gardner df624a8437 Angular movement when auto vmg is pressed is smoothed. #story[1196]
8 years ago
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193]
8 years ago
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
cbt24 8c7345a30d Documented command classes
8 years ago
cbt24 a6db06a82c Boats now reverse smoothly when colliding
8 years ago
cbt24 9cba3934ea Sails command now applies acceleration to boat
8 years ago
cbt24 eba70ab2d4 Sails command now listens to race to check if goal velocity is met
8 years ago
cbt24 b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
cbt24 844b48a81a Resolved issue #42 - "putting sails out changes boat bearing to face target gate"
8 years ago
hba56 dfd3cb96f3 removed System.out.println
8 years ago
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix
8 years ago
hba56 86f495a551 javaDoc
8 years ago
Joseph Gardner 00cedf4d4d TackGybeCommand now smooths the rotation of the boat. #story[1196]
8 years ago
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
8 years ago
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
Fan-Wu Yang 06517b7b47 Tidied up code
8 years ago
Fan-Wu Yang d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182]
8 years ago
David Wu b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
8 years ago
Fan-Wu Yang 7331ad1a20 VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]
8 years ago
David Wu 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]
8 years ago
Fan-Wu Yang 7aaa880f40 VMG now works with some edge cases issues #story[1182]
8 years ago
Joseph f4cb1a3ac4 Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]
8 years ago
Fan-Wu Yang 71dcc8ee6c Added POlar Linear Interpolation #story[1186]
8 years ago
David Wu 8c1eded926 Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195]
8 years ago
fjc40 16bf57e333 javadoc fixes.
8 years ago
fjc40 8c76d6c26e Added boats.xml schema.
8 years ago
fjc40 298fcd03dc Added regatta schema.
8 years ago
fjc40 ec58f0c847 Participants can now join during the warning period as well.
8 years ago
Fan-Wu Yang 34cfe48df0 Got VMG quad detection working, however, the speeds are completley wrong. #story[1186]
8 years ago
hba56 ec5bc9c6aa Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation)
8 years ago
David Wu ea029baf22 Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189]
8 years ago
fjc40 9156bde8af Moved XML message creation to RaceServer instead of ConnectionAcceptor.
8 years ago
fjc40 d0eebcdb2f SourceIdAllocator now allocates from the BoatDataSource and RaceDataSource exposed by MockRace, instead of having its own source IDs. Can only allocate ids during PRESTART period.
8 years ago
fjc40 3176e76c8c MockRace:
8 years ago
zwu18 c7af4f2eb7 Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189]
8 years ago
Fan-Wu Yang 9a5d20bdf2 Added new polar function, currently it does not distinguish between up wind and downwind and doesn't find it in the correct quadrant #story[1186]
8 years ago
hba56 9161f69547 updating match table to store ip and port of clients and hosts
8 years ago
Joseph 0de7780020 Changed wind speed to be non-linear. #story[1187]
8 years ago
hba56 83f756d7d8 packets can now be sent from client to match server
8 years ago
David Wu 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]
8 years ago
Joseph Gardner b0f7c5e734 Wind speed changes depending on where the wind direction is. #story[1187]
8 years ago
Joseph Gardner d0ba7b93e0 Wind oscillates, replaces random wind with shifting wind. #story[1187]
8 years ago
Joseph Gardner 0be5b731c3 Merge branch 'master' into wind_(story53)
8 years ago
Joseph Gardner 12e2ae9c01 Started implementing wind oscillation. #story[1187]
8 years ago
Joseph Gardner 64e96a1b8b Class for shifting wind. #story[1187]
8 years ago
fjc40 a9fde95b39 Updated maven version to 2.0.
8 years ago
fjc40 666c7b029f Disabled map rotation - temp fix for the demo.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
Joseph Gardner 5ba6f52669 fixed autovmg.
8 years ago
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19
8 years ago
Joseph Gardner dcd1df2999 Merged master.
8 years ago
Joseph Gardner 014b78f166 Merge branch 'master' into story_64_sails
8 years ago
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven
8 years ago
Joseph Gardner d41e52766b Merge branch 'master' into story_64_sails
8 years ago
David Wu 09eaf6d968 Merged master.
8 years ago
Joseph Gardner 37fe7389ff Rounding marks works.
8 years ago
David Wu 5a188f0582 Merge branch 'master' into new_issue#19
8 years ago
David Wu c08bafa566 Fixed most of issue #19 with new master?
8 years ago
Fan-Wu Yang 2e9c6fe593 Merged most recent master in, #story[1092]
8 years ago
Fan-Wu Yang 7546c65893 Merge branch 'master' into MapWindRotation
8 years ago
Joseph Gardner 20c9870fea Merge branch 'master' into story_64_sails
8 years ago
David Wu 6bc81f566e Issue 19 changes.
8 years ago
Joseph Gardner a3fe57ed5a Removed print statement. #story[1092]
8 years ago
Joseph Gardner 4cf8846cda Map wind rotation works with multiplayer xml. #story[1092]
8 years ago
hwball 86d94ef27e javadoc fix
8 years ago
Connor Taylor-Brown 4b3cc8e126 Created ack number generator for use by multiple services
8 years ago
Joseph Gardner 1e7ba8cd51 Merge branch 'master' into MapWindRotation
8 years ago