635 Commits

Author SHA1 Message Date
CaptainSegis
dc736b66eb Fixed Kanto badges not showing in trainer card 2017-03-25 23:38:01 -05:00
jianmingyong
7a3767bc09 Remove the stupid old GJ point bar. 2017-03-26 01:36:39 +08:00
CaptainSegis
e5e20eab90 Implemented NewTrainerScreen, part 1. Fixed misc stuff. 2017-03-25 11:57:02 -05:00
jianmingyong
e5f2db323e Fix global level 2017-03-25 02:00:13 +08:00
jianmingyong
5fbbf804f6 Merge remote-tracking branch 'remotes/origin/master' into Cool_menus_experiment 2017-03-25 01:51:14 +08:00
jianmingyong
b2bf44381c Merge branch 'Cool_menus_experiment' of https://github.com/P3D-Legacy/P3D-Legacy into Cool_menus_experiment 2017-03-25 01:49:43 +08:00
CaptainSegis
d23b213b5d Fixed crash related to having no items in NewInventoryScreen 2017-03-24 12:41:58 -05:00
jianmingyong
3c6fbf0b83 Added MG 3.6 support 2017-03-25 01:39:29 +08:00
jianmingyong
b6ab2f2304 Merge remote-tracking branch 'remotes/origin/master' into Cool_menus_experiment
# Conflicts:
#	2.5DHero/2.5DHero/Screens/Screen.vb
#	2.5DHero/2.5DHero/Security/FileValidation.vb
2017-03-24 01:19:03 +08:00
CaptainSegis
327d7ad292 Implemented NewMenuScreen. Added support for GaussuanBlur effect for future use. 2017-03-23 01:58:56 -05:00
CaptainSegis
0f839cce23 Fixed previewer interaction with boxes for SummaryScreen 2017-03-23 00:00:50 -05:00
jianmingyong
2b2534eb22 New build config that uses multithread MGCB tool. 2017-03-23 12:59:48 +08:00
jianmingyong
0910fdadf6 Merge branch 'Offset_Map_Fix' 2017-03-23 01:25:55 +08:00
jianmingyong
7dd6443ec8 MonoGame 3.5.1 2017-03-23 01:25:37 +08:00
jianmingyong
a004076ecf Revert MusicManager.vb 2017-03-23 01:15:19 +08:00
jianmingyong
1475a14593 Revert "First part of MonoGame 3.6 port"
This reverts commit 2782470b5c0b11c34d083c0ba84fe1455120b6f0.

# Conflicts:
#	2.5DHero/2.5DHero/2.5DHero.vbproj
2017-03-23 01:11:12 +08:00
CaptainSegis
d39eb53bbd Index now can´t return to 0 when it goes beyond the pokemon list count in SummaryScreen 2017-03-22 11:42:16 -05:00
CaptainSegis
7120aff8e4 Replaced all remaining references to PokemonStatusScreen with SummaryScreen 2017-03-15 11:30:33 -05:00
CaptainSegis
a46b8361a4 Removed reference to BattlePokemonInfoScreen 2017-03-15 09:37:40 -05:00
CaptainSegis
db6057254e Fixed minor index issue related to BattleMenu and PartyScreen interactions 2017-03-15 02:07:40 -05:00
CaptainSegis
08b0d944da Replaced all useful references to ChoosePokemonScreen with references to PartyScreen. 2017-03-14 19:13:16 -05:00
jianmingyong
f210f9ee7b Animations are removed from models. 2017-03-08 23:22:34 +08:00
jianmingyong
7f91a95413 Cleanup + CatchTrainerName non case sensitive checks 2017-03-08 13:01:28 +08:00
jianmingyong
7b802d9710 Better backup save with some error prompts 2017-03-08 13:01:28 +08:00
Aragas
2782470b5c First part of MonoGame 3.6 port 2017-03-08 00:37:20 +03:00
CaptainSegis
410ed4a91c Experimental work about PartyScreen replacing ChoosePokemonScreen. 2017-03-06 15:21:42 -05:00
jianmingyong
abfd94f0b0 Better ObjectDump == Better Crash Logs information 2017-03-03 02:55:06 +08:00
OmegaRuan
45ce4d79ef 4 new spritesheets (shiny)
Lazy to list...
2017-02-27 06:44:50 -03:00
OmegaRuan
218fd2533c 3 new spritesheets (normal)
Lazy to list...
2017-02-27 06:43:53 -03:00
OmegaRuan
72cc016078 11 new/edited big sprites
I won't list all those.
2017-02-27 06:41:40 -03:00
Conner Joseph Brewster
23c08f7b14 Match battle map with standard map 2017-02-26 18:34:35 -06:00
Conner Joseph Brewster
bb204bffcf This should be correct (Underwater floor)
This time I wasn't being dumb and decided to properly test before I commit. All ground tiles should now be displayed properly in both Fast and Fancy graphics options.
2017-02-26 16:59:07 -06:00
Conner Joseph Brewster
21ac6ac14f Further texture fixes
This should cover all of the affected texture regions. Also changed the entity type of unreachable tiles.
2017-02-26 16:32:37 -06:00
Conner Joseph Brewster
7b2ae62561 Fixed Fast Graphics Seafloor
Revised the arguments for the Open Sea's underwater map so that the seafloor no longer pulls Routes map data in Fast graphics mode.
2017-02-26 16:03:08 -06:00
jianmingyong
eda23f5f65 Offset map fix. 2017-02-26 22:52:11 +08:00
CaptainSegis
e9619b4ffd Replaced all references to InventoryScreen by references to NewInventoryScreen. Still need to polish minor details. 2017-02-22 17:10:40 -05:00
FantaX1911
31af589e14 Set theme jekyll-theme-cayman 2017-02-22 18:00:44 +02:00
FantaX1911
5c22f847bb Set theme jekyll-theme-cayman 2017-02-22 17:59:47 +02:00
CaptainSegis
b15749cc82 Just added some comments and Logger.Debug messages. Nothing magic. 2017-02-18 23:26:59 -05:00
CaptainSegis
12fbd4c6f8 Slight changes 2017-02-16 20:13:13 -05:00
CaptainSegis
88c4e8de53 Minor changes 2017-02-16 14:54:22 -05:00
CaptainSegis
d408c9d196 Merge remote-tracking branch 'refs/remotes/origin/master' into Cool_menus_experiment 2017-02-16 14:42:23 -05:00
CaptainSegis
f373bd6f81 Merge from master 2017-02-16 14:36:21 -05:00
CaptainSegis
9c6e11a1fa Fixed OpenTK issues in NewInventoryScreen. 2017-02-16 14:25:45 -05:00
jianmingyong
32a7c1916c Sorry this is the real final one... 0.54.1 2017-02-17 01:52:34 +08:00
jianmingyong
f0ee07c20f Final commit on fixing the Updater behaviour. 2017-02-17 01:45:21 +08:00
jianmingyong
b99ff2d2d5 Revert "Update Updater.exe, remove CurrentVersion.dat and add missing files into the Content.mgcb"
This reverts commit 81c879cd3df0469b56b13651f53e9e3a76cf1560.
2017-02-17 00:21:47 +08:00
jianmingyong
81c879cd3d Update Updater.exe, remove CurrentVersion.dat and add missing files into the Content.mgcb 2017-02-16 23:47:30 +08:00
Aragas
17c9a37a4d Update will have it's own timeout check for safety reasons 2017-02-16 18:05:54 +03:00
Aragas
5c03804407 Added new configs 2017-02-16 17:22:16 +03:00