Skip to content

Improved Collision Viewer#435

Merged
Kenix3 merged 7 commits intoHarbourMasters:developfrom
getbrainerror:develop
Jun 17, 2022
Merged

Improved Collision Viewer#435
Kenix3 merged 7 commits intoHarbourMasters:developfrom
getbrainerror:develop

Conversation

@getbrainerror
Copy link
Contributor

@getbrainerror getbrainerror commented Jun 2, 2022

  • Made all the values of the collision viewer persistent.
  • Switched all color pickers to the EnhancementColor picker.
  • Added a checkbox to enable/disable collision viewer.

@getbrainerror
Add fishing pole as sword in save editor
93de080 
Adds fishing pole as a sword to the save editor under current equipment.
@getbrainerror
Improve Collision Viewer
41712cf 
Made all the values of the collision viewer persistent.
Switched all color pickers to the EnhancementColor picker.
Added a checkbox to enable/disable collision viewer.
@getbrainerror
Merge branch 'HarbourMasters:develop' into develop
9ca2761
@getbrainerror
Update SohImGuiImpl.cpp
edfb795 
Probably fixed linux build error
@getbrainerror
Copy link
Contributor Author

getbrainerror commented Jun 2, 2022

I dont know why it doesnt build for linux. The Windows build just works fine.
I'll try to build it myself later or tomorrow. Unless somebody else knows why :/

@Baoulettes
Copy link
Contributor

Baoulettes commented Jun 2, 2022

I dont know why it doesnt build for linux. The Windows build just works fine. I'll try to build it myself later or tomorrow. Unless somebody else knows why :/

Jenkins is a powerful tool you can see your error there :
Jenkins build error logs
with this you can try to fix it even if you can not build for it :)

@getbrainerror
Update colViewer.cpp
ad89613 
Hopefully fixed it this time. Lets wait for jenkins.
@getbrainerror
Copy link
Contributor Author

getbrainerror commented Jun 2, 2022

I dont know why it doesnt build for linux. The Windows build just works fine. I'll try to build it myself later or tomorrow. Unless somebody else knows why :/

Jenkins is a powerful tool you can see your error there : Jenkins build error logs with this you can try to fix it even if you can not build for it :)

Yeah, but it's not really practical to debug with it.
But yeah the error makes sense (importing c++ code in a c code block), but why was msbuild working?
Sry if this is a newbie question, I'm relatively new to c/c++.

@getbrainerror
Fixed colors
53b9ec0 
Some color values were wrong
@Kenix3 Kenix3 requested review from NEstelami and louist103 June 8, 2022 22:09
louist103
louist103 requested changes Jun 8, 2022
View reviewed changes
@Kenix3 Kenix3 merged commit 3d24f3f into HarbourMasters:develop Jun 17, 2022
th-2021 pushed a commit to th-2021/Shipwright-cmake that referenced this pull request Jun 19, 2022
@getbrainerror @th-2021
Improved Collision Viewer (HarbourMasters#435)
39d00f4 
* Add fishing pole as sword in save editor

Adds fishing pole as a sword to the save editor under current equipment.

* Improve Collision Viewer

Made all the values of the collision viewer persistent.
Switched all color pickers to the EnhancementColor picker.
Added a checkbox to enable/disable collision viewer.

* Update SohImGuiImpl.cpp

Probably fixed linux build error

* Update colViewer.cpp

Hopefully fixed it this time. Lets wait for jenkins.

* Fixed colors

Some color values were wrong

* Update SohImGuiImpl.cpp &  SohImGuiImpl.h
stratomaster64 pushed a commit to stratomaster64/Shipwright that referenced this pull request Jun 20, 2022
@getbrainerror @stratomaster64
Improved Collision Viewer (HarbourMasters#435)
5dbfdc7 
* Add fishing pole as sword in save editor

Adds fishing pole as a sword to the save editor under current equipment.

* Improve Collision Viewer

Made all the values of the collision viewer persistent.
Switched all color pickers to the EnhancementColor picker.
Added a checkbox to enable/disable collision viewer.

* Update SohImGuiImpl.cpp

Probably fixed linux build error

* Update colViewer.cpp

Hopefully fixed it this time. Lets wait for jenkins.

* Fixed colors

Some color values were wrong

* Update SohImGuiImpl.cpp &  SohImGuiImpl.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Kenix3 Kenix3 Kenix3 approved these changes

@louist103 louist103 louist103 approved these changes

@NEstelami NEstelami Awaiting requested review from NEstelami

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@getbrainerror @Baoulettes @Kenix3 @louist103